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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 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
…		…
320	sub set_visibility {	324	sub set_visibility {
321	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
322		326
323	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
324		328
325	$visible ? $self->hide	329	$visible ? $self->show
326	: $self->show;	330	: $self->hide;
327	}	331	}
328		332
329	sub toggle_visibility {	333	sub toggle_visibility {
330	my ($self) = @_;	334	my ($self) = @_;
331		335
…		…
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
…		…
1033		1009
1034	#############################################################################	1010	#############################################################################
1035		1011
1036	package CFPlus::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
1037		1013
1038	our @ISA = CFPlus::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
1039		1015
1040	sub new {	1016	sub new {
1041	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
1042		1018
1043	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1044		1020
1045	my $self;	1021	my $self;
1046		1022
1047	my $slider = new CFPlus::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
		1026	vertical => 0,
		1027	range => [0, 0, 1, 0.01], # HACK fix
		1028	on_changed => sub {
		1029	$self->{hpos} = $_[1];
		1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1031	},
		1032	;
		1033
		1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1048	vertical => 1,	1037	vertical => 1,
1049	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1039	on_changed => sub {
1051	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052	},	1042	},
1053	;	1043	;
1054		1044
1055	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
1056	vp => (new CFPlus::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
1057	can_events => 1,	1048	can_events => 1,
1058	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
1059	%arg,	1053	%arg,
1060	);	1054	);
1061		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
1062	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
1063	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1064		1080
1065	$self	1081	$self
1066	}	1082	}
1067
1068	#TODO# update range on size_allocate depending on child
1069		1083
1070	sub add {	1084	sub add {
1071	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1072		1086
1073	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1074	}	1088	}
1075		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
1076	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1077	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1078		1144
1079	return 0 unless $ev->{dy}; # only vertical movements
1080
1081	$self->{slider}->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};
1082		1147
1083	1	1148	1
1084	}	1149	}
1085		1150
1086	sub update_slider {	1151	sub invoke_button_down {
1087	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1088		1153
1089	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1090	}	1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1091		1158
1092	sub update {	1159	0
1093	my ($self) = @_;	1160	}
1094		1161
1095	$self->SUPER::update;	1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
1096		1164
1097	$self->update_slider;	1165	if (delete $self->{motion}) {
		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
1098	}	1181	}
1099		1182
1100	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1101	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1102		1185
1103	$self->update_slider;	1186	$self->update_slider;
1104
1105	$self->SUPER::invoke_size_allocate ($w, $h)	1187	$self->SUPER::invoke_size_allocate ($w, $h)
1106	}	1188	}
1107		1189
1108	#############################################################################	1190	#############################################################################
1109		1191
…		…
1129	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1130		1212
1131	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1132	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1133	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1134
1135	glBegin GL_QUADS;
1136	glVertex 0 , 0;
1137	glVertex 0 , $h;
1138	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1139	glVertex $w, 0;
1140	glEnd;
1141
1142	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1143	}	1218	}
1144		1219
1145	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1146	}	1221	}
…		…
1259		1334
1260	my @border =	1335	my @border =
1261	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262	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);
1263		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
1264	sub new {	1343	sub new {
1265	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1266		1345
1267	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1268	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
…		…
1436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437		1516
1438	my $border = $self->border;	1517	my $border = $self->border;
1439		1518
1440	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1441	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444	$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);
1445		1538
1446	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1448		1541
1449	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1470		1563
1471	#############################################################################	1564	#############################################################################
1472		1565
1473	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1474		1567
1475	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1476		1569
1477	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1478		1571
1479	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1480		1573
1481	sub new {	1574	sub new {
1482	my $class = shift;	1575	my $class = shift;
1483		1576
1484	$class->SUPER::new (	1577	$class->SUPER::new (
1485	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1486	@_,	1580	@_,
1487	)	1581	)
1488	}	1582	}
1489		1583
1490	sub children {
1491	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492	}
1493
1494	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 {
1495	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1496		1599
1497	while (@_) {	1600	while (@_) {
1498	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1499	$child->set_parent ($self);
1500	$self->{children}[$y][$x] = $child;
1501	}
1502		1602
1503	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1504	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1505	$self->realloc;
1506	}
1507		1605
1508	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1509	my ($self, $child) = @_;	1613	my ($self) = @_;
1510		1614
1511	# TODO: not yet implemented	1615	my (@w, @h);
1512	}
1513
1514	# TODO: move to container class maybe? send children a signal on removal?
1515	sub clear {
1516	my ($self) = @_;
1517		1616
1518	my @children = $self->children;	1617	my @children = $self->children;
1519	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	}
1520		1628	}
1521	for (@children) {
1522	delete $_->{parent};
1523	$_->hide;
1524	}
1525		1629
1526	$self->realloc;	1630	# second pass, rows
1527	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1528
1529	sub get_wh {
1530	my ($self) = @_;
1531
1532	my (@w, @h);
1533
1534	for my $y (0 .. $#{$self->{children}}) {
1535	my $row = $self->{children}[$y]
1536	or next;
1537
1538	for my $x (0 .. $#$row) {
1539	my $widget = $row->[$x]
1540	or next;
1541	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1542		1633
1543	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1544	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1545	}	1638	}
1546	}	1639	}
1547		1640
1548	(\@w, \@h)	1641	(\@w, \@h)
1549	}	1642	}
…		…
1565	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1566		1659
1567	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1568	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1569		1662
1570	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1571	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1572	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1573	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1574		1667
1575	# linearly scale sizes
1576	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578		1669
1579	CFPlus::UI::harmonize $ws;	1670	CFPlus::UI::harmonize $ws;
		1671
		1672	my @row_expand = @{$self->{row_expand}};
		1673	@row_expand = (1) x @$ws unless @row_expand;
		1674	my $row_expand = (sum @row_expand) || 1;
		1675
		1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1677
1580	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1581		1679
1582	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1583		1682
1584	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1585	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)};
1586	or next;
1587		1685
1588	my $x = 0;	1686	$widget->configure (
1589	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1590		1689	);
1591	for my $c (0 .. $#$row) {	1690	}
1592	my $col_w = $ws->[$c];
1593		1691
1594	if (my $widget = $row->[$c]) {	1692	1
1595	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1596	}
1597		1694
1598	$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};
1599	}	1722	}
		1723	}
1600		1724
1601	$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});
1602	}	1756	}
1603		1757
1604	1	1758	1
1605	}	1759	}
1606		1760
1607	sub find_widget {
1608	my ($self, $x, $y) = @_;
1609
1610	$x -= $self->{x};
1611	$y -= $self->{y};
1612
1613	my $res;
1614
1615	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1616	$res = $_->find_widget ($x, $y)
1617	and return $res;
1618	}
1619
1620	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1621	}
1622
1623	sub _draw {
1624	my ($self) = @_;
1625
1626	for (grep $_, @{$self->{children}}) {
1627	$_->draw for grep $_, @$_;
1628	}
1629	}
1630
1631	#############################################################################	1761	#############################################################################
1632		1762
1633	package CFPlus::UI::Box;	1763	package CFPlus::UI::Box;
1634		1764
1635	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1636		1766
1637	sub size_request {	1767	sub size_request {
1638	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1639		1771
1640	$self->{vertical}	1772	$self->{vertical}
1641	? (	1773	? (
1642	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1643	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1644	)	1776	)
1645	: (	1777	: (
1646	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1647	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1648	)	1780	)
1649	}	1781	}
1650		1782
1651	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1652	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1776		1908
1777	delete $self->{ox};	1909	delete $self->{ox};
1778	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1779	}	1911	}
1780		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1781	sub set_text {	1919	sub set_text {
1782	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1783		1921
1784	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1785	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
1891	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1892		2030
1893	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1894	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1895	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1896	};	2036	};
1897		2037
1898	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1899	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1900		2040	# CFPlus::OpenGL::glNewList $self->{list};
1901	$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;
1902	}	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	#}
1903		2057
1904	#############################################################################	2058	#############################################################################
1905		2059
1906	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1907		2061
…		…
1913	my $class = shift;	2067	my $class = shift;
1914		2068
1915	$class->SUPER::new (	2069	$class->SUPER::new (
1916	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1917	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1918	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1919	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1920	can_hover => 1,	2076	can_hover => 1,
1921	can_focus => 1,	2077	can_focus => 1,
1922	valign => 0,	2078	valign => 0,
1923	can_events => 1,	2079	can_events => 1,
1924	ellipsise => 0,	2080	ellipsise => 0,
…		…
2064	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2065	}	2221	}
2066		2222
2067	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2068	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069	glBegin GL_QUADS;
2070	glVertex 0 , 0;
2071	glVertex 0 , $self->{h};
2072	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2073	glVertex $self->{w}, 0;
2074	glEnd;
2075	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2076		2227
2077	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2078		2229
2079	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2081		2232
2082	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2083	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2084	utf8::encode $text;	2235	utf8::encode $text;
2085		2236
2086	@$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);
2087	}	2238	}
2088		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2089	glBegin GL_LINES;	2241	glBegin GL_LINES;
2090	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};
2091	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;
2092	glEnd;	2259	glEnd;
2093	}	2260	}
2094	}	2261	}
2095		2262
2096	#############################################################################	2263	#############################################################################
…		…
2183	1	2350	1
2184	}	2351	}
2185		2352
2186	#############################################################################	2353	#############################################################################
2187		2354
2188	package CFPlus::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2189		2356
2190	our @ISA = CFPlus::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2191		2358
2192	use CFPlus::OpenGL;	2359	use CFPlus::OpenGL;
2193		2360
2194	my @tex =	2361	my @tex =
2195	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2196	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2197		2364
2198	sub new {	2365	sub new {
2199	my $class = shift;	2366	my $class = shift;
2200		2367
2201	$class->SUPER::new (	2368	$class->SUPER::new (
2202	padding_x => 4,
2203	padding_y => 4,
2204	fg => [1, 1, 1],
2205	active_fg => [0, 0, 1],
2206	can_hover => 1,	2369	can_hover => 1,
2207	align => 0,	2370	align => 0,
2208	valign => 0,	2371	valign => 0,
2209	can_events => 1,	2372	can_events => 1,
2210	@_	2373	@_
…		…
2222	}	2385	}
2223		2386
2224	sub _draw {	2387	sub _draw {
2225	my ($self) = @_;	2388	my ($self) = @_;
2226		2389
2227	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2228
2229	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2230	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2232		2393
		2394	my $tex = $tex[$GRAB == $self];
2233	$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});
2234		2451
2235	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2236		2453
2237	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2238	}	2455	}
…		…
2325	sub new {	2542	sub new {
2326	my $class = shift;	2543	my $class = shift;
2327		2544
2328	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2329	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2330	@_,	2548	@_,
2331	);	2549	);
2332		2550
2333	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2334	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2359	}	2577	}
2360		2578
2361	sub size_request {	2579	sub size_request {
2362	my ($self) = @_;	2580	my ($self) = @_;
2363		2581
2364	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2365	}	2583	}
2366		2584
2367	sub _draw {	2585	sub _draw {
2368	my ($self) = @_;	2586	my ($self) = @_;
2369		2587
…		…
2379	}	2597	}
2380		2598
2381	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2382	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2383		2601
2384	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2385		2603
2386	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2387	}	2605	}
2388		2606
2389	#############################################################################	2607	#############################################################################
…		…
2408	align => 0,	2626	align => 0,
2409	valign => 0,	2627	valign => 0,
2410	can_events => 1,	2628	can_events => 1,
2411	@_	2629	@_
2412	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2413	}	2637	}
2414		2638
2415	sub invoke_button_up {	2639	sub invoke_button_up {
2416	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2417		2641
…		…
2557	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2558	}	2782	}
2559		2783
2560	#############################################################################	2784	#############################################################################
2561		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	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2562	package CFPlus::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2563		2911
2564	our @ISA = CFPlus::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2565		2913
2566	sub new {	2914	sub new {
…		…
2691		3039
2692	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2693		3041
2694	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695		3043
2696	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2697	}	3047	}
2698		3048
2699	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2700	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2701		3051
…		…
2721		3071
2722	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723		3073
2724	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725		3075
2726	! ! $delta	3076	1
2727	}	3077	}
2728		3078
2729	sub update {	3079	sub update {
2730	my ($self) = @_;	3080	my ($self) = @_;
2731		3081
…		…
2862	}	3212	}
2863		3213
2864	sub size_request {	3214	sub size_request {
2865	my ($self) = @_;	3215	my ($self) = @_;
2866		3216
2867	my ($empty, $slider) = @{ $self->{children} };	3217	my ($empty, $slider) = $self->visible_children;
2868		3218
2869	local $self->{children} = [$empty, $slider];	3219	local $self->{children} = [$empty, $slider];
2870	$self->SUPER::size_request	3220	$self->SUPER::size_request
2871	}	3221	}
2872		3222
…		…
3061		3411
3062	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
3063	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
3064		3414
3065	$layout->render ($para->{indent}, $y - $y0);	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
3066		3417
3067	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
3068	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
3069		3420
3070	for (@w) {	3421	for (@w) {
…		…
3261	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
3262		3613
3263	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
3264		3615
3265	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
3266	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
3267	glVertex 0 , 0;
3268	glVertex 0 , $h;
3269	glVertex $w, $h;
3270	glVertex $w, 0;
3271	glEnd;
3272		3618
3273	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
3274	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
3275	glVertex 0 , 0;
3276	glVertex 0 , $h;
3277	glVertex $w, $h;
3278	glVertex $w, 0;
3279	glEnd;
3280		3621
3281	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
3282		3623
3283	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
3284	}	3625	}
…		…
3293		3634
3294	sub new {	3635	sub new {
3295	my $class = shift;	3636	my $class = shift;
3296		3637
3297	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
3298	aspect => 1,	3641	aspect => 1,
3299	can_events => 0,	3642	can_events => 0,
3300	@_,	3643	@_,
3301	);	3644	);
3302		3645
3303	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
3304	CFPlus::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
3305		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3306	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
3307	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308	hard => 1,	3652	parked => 1,
3309	interval => $self->{animspeed},
3310	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
3311	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
3312	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
3313	},	3665	},
3314	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
3315	}	3670	}
3316		3671
3317	$self	3672	$self
3318	}	3673	}
3319		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
3320	sub size_request {	3711	sub size_request {
3321	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
3322	}	3729	}
3323		3730
3324	sub update {	3731	sub update {
3325	my ($self) = @_;	3732	my ($self) = @_;
3326		3733
3327	return unless $self->{visible};	3734	return unless $self->{visible};
3328		3735
3329	$self->SUPER::update;	3736	$self->SUPER::update;
3330	}	3737	}
3331		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
3332	sub _draw {	3747	sub _draw {
3333	my ($self) = @_;	3748	my ($self) = @_;
3334		3749
3335	return unless $::CONN;
3336
3337	$self->SUPER::_draw;	3750	$self->SUPER::_draw;
3338		3751
3339	my $face;	3752	if (my $tex = $self->{tex}) {
3340
3341	if ($self->{frame}) {
3342	my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344	$face = $anim->[ $self->{frame} % @$anim ]
3345	if $anim && @$anim;
3346	}
3347
3348	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3349
3350	if ($tex) {
3351	glEnable GL_TEXTURE_2D;	3753	glEnable GL_TEXTURE_2D;
3352	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3354	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3355	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3357	}	3759	}
3358		3760
3359	sub destroy {	3761	sub destroy {
3360	my ($self) = @_;	3762	my ($self) = @_;
3361		3763
3362	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
3363	if $self->{timer};	3765	if $self->{timer};
3364		3766
3365	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
3366	}	3768	}
3367		3769
…		…
3407	children => [	3809	children => [
3408	(new CFPlus::UI::Label markup => $left, expand => 1),	3810	(new CFPlus::UI::Label markup => $left, expand => 1),
3409	(new CFPlus::UI::Label markup => $right, align => +1),	3811	(new CFPlus::UI::Label markup => $right, align => +1),
3410	],	3812	],
3411	;	3813	;
3412		3814
3413	} else {	3815	} else {
3414	$widget = new CFPlus::UI::Label	3816	$widget = new CFPlus::UI::Label
3415	can_hover => 1,	3817	can_hover => 1,
3416	can_events => 1,	3818	can_events => 1,
3417	markup => $widget,	3819	markup => $widget,
…		…
3542		3944
3543	#############################################################################	3945	#############################################################################
3544		3946
3545	package CFPlus::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3546		3948
		3949	use CFPlus::OpenGL;
		3950
3547	our @ISA = CFPlus::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3548		3952
3549	sub new {	3953	sub new {
3550	my $class = shift;	3954	my $class = shift;
3551		3955
3552	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3553	buttonbar => (new CFPlus::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3554	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3555	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3556	@_,	3961	@_,
3557	);	3962	);
3558		3963
3559	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3560	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3561		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3562	$self	4001	$self
3563	}	4002	}
3564		4003
3565	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3566	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3567		4023
3568	CFPlus::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3569		4026
3570	$self->{buttonbar}->add (new CFPlus::UI::Button
3571	markup => $title,
3572	tooltip => $tooltip,
3573	on_activate => sub { $self->set_current_page ($widget) },
3574	);
3575
3576	$self->{multiplexer}->add ($widget);	4027	$self->add ($widget);
3577	}	4028	}
3578		4029
3579	sub get_current_page {	4030	sub get_current_page {
3580	my ($self) = @_;	4031	my ($self) = @_;
3581		4032
…		…
3585	sub set_current_page {	4036	sub set_current_page {
3586	my ($self, $page) = @_;	4037	my ($self, $page) = @_;
3587		4038
3588	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3589	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
		4041	}
		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
3590	}	4057	}
3591		4058
3592	#############################################################################	4059	#############################################################################
3593		4060
3594	package CFPlus::UI::Selector;	4061	package CFPlus::UI::Selector;
…		…
3864	}	4331	}
3865		4332
3866	sub update {	4333	sub update {
3867	my ($self) = @_;	4334	my ($self) = @_;
3868		4335
3869	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3870	}	4337	}
3871		4338
3872	sub add {	4339	sub add {
3873	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3874		4341
…		…
3911	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3912	$_->()	4379	$_->()
3913	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3914	}	4381	}
3915		4382
3916	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3917	my %queue;	4384	my %queue;
3918	my @queue;	4385	my @queue;
3919	my $widget;	4386	my $widget;
3920		4387
3921	outer:	4388	outer:
…		…
3968	}	4435	}
3969	}	4436	}
3970		4437
3971	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3972	}	4439	}
3973	}
3974		4440
3975	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3976	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3977	values %$size_alloc;	4443	values %$size_alloc;
3978		4444
3979	while () {	4445	while () {
3980	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3981		4447
3982	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3983		4449
3984	$w = 0 if $w < 0;
3985	$h = 0 if $h < 0;
3986
3987	$w = max $widget->{min_w}, $w;	4450	$w = max $widget->{min_w}, $w;
3988	$h = max $widget->{min_h}, $h;	4451	$h = max $widget->{min_h}, $h;
3989		4452
3990	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992		4455
3993	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995		4458
3996	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
3997	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
3998		4461
3999	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4000	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
4001	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
4002		4465
4003	$widget->{w} = $w;	4466	$widget->{w} = $w;
4004	$widget->{h} = $h;	4467	$widget->{h} = $h;
4005		4468
4006	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
4007	}	4471	}
4008	}	4472	}
4009	}	4473	}
4010		4474
4011	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
4012	$_->()	4476	$_->()
4013	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
4014	}	4478	}
4015
4016		4479
4017	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
4020		4483

Diff Legend

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