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.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.430 by root, Tue Aug 21 02:39:17 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 ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});	1154	if ($ev->{button} == 2) {
1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1155	$self->start_dragging ($ev);
1107	#$self->{hslider}->set_visibility ($w1 != $w2);	1156	return 1;
		1157	}
1108		1158
1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});	1159	0
1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1112	}	1160	}
1113		1161
1114	sub update {	1162	sub invoke_button_up {
1115	my ($self) = @_;	1163	my ($self, $ev, $x, $y) = @_;
1116		1164
1117	$self->SUPER::update;	1165	if (delete $self->{motion}) {
1118	$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
1119	}	1181	}
1120		1182
1121	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1122	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1123		1185
…		…
1149	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1150		1212
1151	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1152	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1153	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1154
1155	glBegin GL_QUADS;
1156	glVertex 0 , 0;
1157	glVertex 0 , $h;
1158	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1159	glVertex $w, 0;
1160	glEnd;
1161
1162	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1163	}	1218	}
1164		1219
1165	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1166	}	1221	}
…		…
1279		1334
1280	my @border =	1335	my @border =
1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1283		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
1284	sub new {	1343	sub new {
1285	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1286		1345
1287	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1288	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
…		…
1456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457		1516
1458	my $border = $self->border;	1517	my $border = $self->border;
1459		1518
1460	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1461	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464	$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);
1465		1538
1466	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1467	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1468		1541
1469	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1490		1563
1491	#############################################################################	1564	#############################################################################
1492		1565
1493	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1494		1567
1495	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1496		1569
1497	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1498		1571
1499	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1500		1573
…		…
1506	row_expand => [],	1579	row_expand => [],
1507	@_,	1580	@_,
1508	)	1581	)
1509	}	1582	}
1510		1583
1511	sub children {
1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513	}
1514
1515	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 {
1516	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1517		1599
1518	while (@_) {	1600	while (@_) {
1519	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1520	$child->set_parent ($self);
1521	$self->{children}[$y][$x] = $child;
1522	}
1523		1602
1524	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1525	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1526	$self->realloc;
1527	}
1528		1605
1529	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1530	my ($self, $child) = @_;	1613	my ($self) = @_;
1531		1614
1532	# TODO: not yet implemented	1615	my (@w, @h);
1533	}
1534
1535	# TODO: move to container class maybe? send children a signal on removal?
1536	sub clear {
1537	my ($self) = @_;
1538		1616
1539	my @children = $self->children;	1617	my @children = $self->children;
1540	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	}
1541		1628	}
1542	for (@children) {
1543	delete $_->{parent};
1544	$_->hide;
1545	}
1546		1629
1547	$self->realloc;	1630	# second pass, rows
1548	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1549
1550	sub get_wh {
1551	my ($self) = @_;
1552
1553	my (@w, @h);
1554
1555	for my $y (0 .. $#{$self->{children}}) {
1556	my $row = $self->{children}[$y]
1557	or next;
1558
1559	for my $x (0 .. $#$row) {
1560	my $widget = $row->[$x]
1561	or next;
1562	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1563		1633
1564	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1565	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1566	}	1638	}
1567	}	1639	}
1568		1640
1569	(\@w, \@h)	1641	(\@w, \@h)
1570	}	1642	}
…		…
1586	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1587		1659
1588	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1589	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1590		1662
1591	# TODO: nicer code	1663	# now linearly scale the rows/columns to the allocated size
1592	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1593	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1594	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1595		1667
1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1603		1675
1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605		1677
1606	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1607		1679
1608	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1609		1682
1610	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1611	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)};
1612	or next;
1613		1685
1614	my $x = 0;	1686	$widget->configure (
1615	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1616		1689	);
1617	for my $c (0 .. $#$row) {	1690	}
1618	my $col_w = $ws->[$c];
1619		1691
1620	if (my $widget = $row->[$c]) {	1692	1
1621	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1622	}
1623		1694
1624	$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};
1625	}	1722	}
		1723	}
1626		1724
1627	$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});
1628	}	1756	}
1629		1757
1630	1	1758	1
1631	}	1759	}
1632		1760
1633	sub find_widget {
1634	my ($self, $x, $y) = @_;
1635
1636	$x -= $self->{x};
1637	$y -= $self->{y};
1638
1639	my $res;
1640
1641	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1642	$res = $_->find_widget ($x, $y)
1643	and return $res;
1644	}
1645
1646	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1647	}
1648
1649	sub _draw {
1650	my ($self) = @_;
1651
1652	for (grep $_, @{$self->{children}}) {
1653	$_->draw for grep $_, @$_;
1654	}
1655	}
1656
1657	#############################################################################	1761	#############################################################################
1658		1762
1659	package CFPlus::UI::Box;	1763	package CFPlus::UI::Box;
1660		1764
1661	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1662		1766
1663	sub size_request {	1767	sub size_request {
1664	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1665		1771
1666	$self->{vertical}	1772	$self->{vertical}
1667	? (	1773	? (
1668	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1669	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1670	)	1776	)
1671	: (	1777	: (
1672	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1673	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1674	)	1780	)
1675	}	1781	}
1676		1782
1677	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1678	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1802		1908
1803	delete $self->{ox};	1909	delete $self->{ox};
1804	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1805	}	1911	}
1806		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1807	sub set_text {	1919	sub set_text {
1808	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1809		1921
1810	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1811	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
1917	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1918		2030
1919	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1920	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1921	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1922	};	2036	};
1923		2037
1924	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1925	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1926		2040	# CFPlus::OpenGL::glNewList $self->{list};
1927	$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;
1928	}	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	#}
1929		2057
1930	#############################################################################	2058	#############################################################################
1931		2059
1932	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1933		2061
…		…
1939	my $class = shift;	2067	my $class = shift;
1940		2068
1941	$class->SUPER::new (	2069	$class->SUPER::new (
1942	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1943	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1944	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1945	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1946	can_hover => 1,	2076	can_hover => 1,
1947	can_focus => 1,	2077	can_focus => 1,
1948	valign => 0,	2078	valign => 0,
1949	can_events => 1,	2079	can_events => 1,
1950	ellipsise => 0,	2080	ellipsise => 0,
…		…
2090	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2091	}	2221	}
2092		2222
2093	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2094	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2095	glBegin GL_QUADS;
2096	glVertex 0 , 0;
2097	glVertex 0 , $self->{h};
2098	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2099	glVertex $self->{w}, 0;
2100	glEnd;
2101	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2102		2227
2103	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2104		2229
2105	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2107		2232
2108	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2109	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2110	utf8::encode $text;	2235	utf8::encode $text;
2111		2236
2112	@$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);
2113	}	2238	}
2114		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2115	glBegin GL_LINES;	2241	glBegin GL_LINES;
2116	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};
2117	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;
2118	glEnd;	2259	glEnd;
2119	}	2260	}
2120	}	2261	}
2121		2262
2122	#############################################################################	2263	#############################################################################
…		…
2209	1	2350	1
2210	}	2351	}
2211		2352
2212	#############################################################################	2353	#############################################################################
2213		2354
2214	package CFPlus::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2215		2356
2216	our @ISA = CFPlus::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2217		2358
2218	use CFPlus::OpenGL;	2359	use CFPlus::OpenGL;
2219		2360
2220	my @tex =	2361	my @tex =
2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2223		2364
2224	sub new {	2365	sub new {
2225	my $class = shift;	2366	my $class = shift;
2226		2367
2227	$class->SUPER::new (	2368	$class->SUPER::new (
2228	padding_x => 4,
2229	padding_y => 4,
2230	fg => [1, 1, 1],
2231	active_fg => [0, 0, 1],
2232	can_hover => 1,	2369	can_hover => 1,
2233	align => 0,	2370	align => 0,
2234	valign => 0,	2371	valign => 0,
2235	can_events => 1,	2372	can_events => 1,
2236	@_	2373	@_
…		…
2248	}	2385	}
2249		2386
2250	sub _draw {	2387	sub _draw {
2251	my ($self) = @_;	2388	my ($self) = @_;
2252		2389
2253	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2254
2255	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2258		2393
		2394	my $tex = $tex[$GRAB == $self];
2259	$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});
2260		2451
2261	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2262		2453
2263	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2264	}	2455	}
…		…
2351	sub new {	2542	sub new {
2352	my $class = shift;	2543	my $class = shift;
2353		2544
2354	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2355	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2356	@_,	2548	@_,
2357	);	2549	);
2358		2550
2359	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2360	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2385	}	2577	}
2386		2578
2387	sub size_request {	2579	sub size_request {
2388	my ($self) = @_;	2580	my ($self) = @_;
2389		2581
2390	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2391	}	2583	}
2392		2584
2393	sub _draw {	2585	sub _draw {
2394	my ($self) = @_;	2586	my ($self) = @_;
2395		2587
…		…
2405	}	2597	}
2406		2598
2407	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409		2601
2410	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2411		2603
2412	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2413	}	2605	}
2414		2606
2415	#############################################################################	2607	#############################################################################
…		…
2434	align => 0,	2626	align => 0,
2435	valign => 0,	2627	valign => 0,
2436	can_events => 1,	2628	can_events => 1,
2437	@_	2629	@_
2438	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2439	}	2637	}
2440		2638
2441	sub invoke_button_up {	2639	sub invoke_button_up {
2442	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2443		2641
…		…
2583	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2584	}	2782	}
2585		2783
2586	#############################################################################	2784	#############################################################################
2587		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	%arg,
		2806	text => "-",
		2807	value => -1,
		2808	);
		2809
		2810	$self->set_value ($arg{value}) if exists $arg{value};
		2811
		2812	$self
		2813	}
		2814
		2815	sub set_value {
		2816	my ($self, $value) = @_;
		2817
		2818	if ($self->{value} != $value) {
		2819	$self->{value} = $value;
		2820	$self->set_text (sprintf "%d%%", $value * 100);
		2821	$self->update;
		2822	}
		2823	}
		2824
		2825	sub _draw {
		2826	my ($self) = @_;
		2827
		2828	glEnable GL_BLEND;
		2829	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2830
		2831	if ($self->{value} >= 0) {
		2832	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2833
		2834	glColor_premultiply @{$self->{bar}};
		2835	glRect 2, 2, $s, $self->{h} - 2;
		2836	glColor_premultiply @{$self->{bg}};
		2837	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2838	}
		2839
		2840	glColor_premultiply @{$self->{outline}};
		2841	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2842
		2843	glDisable GL_BLEND;
		2844
		2845	{
		2846	local $self->{bg}; # do not draw background
		2847	$self->SUPER::_draw;
		2848	}
		2849	}
		2850
		2851	#############################################################################
		2852
		2853	package CFPlus::UI::ExperienceProgress;
		2854
		2855	our @ISA = CFPlus::UI::Progress::;
		2856
		2857	sub new {
		2858	my ($class, %arg) = @_;
		2859
		2860	my $self = $class->SUPER::new (
		2861	%arg
		2862	);
		2863
		2864	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2865	if $::CONN;
		2866
		2867	$self
		2868	}
		2869
		2870	sub DESTROY {
		2871	my ($self) = @_;
		2872
		2873	delete $::CONN->{on_exp_update}{$self+0}
		2874	if $::CONN;
		2875
		2876	$self->SUPER::DESTROY;
		2877	}
		2878
		2879	sub set_value {
		2880	my ($self, $lvl, $exp) = @_;
		2881
		2882	my $v = 0;
		2883
		2884	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2885	my $l0 = $table->[$lvl - 1];
		2886	my $l1 = $table->[$lvl];
		2887
		2888	$v = ($exp - $l0) / ($l1 - $l0);
		2889	}
		2890
		2891	$self->SUPER::set_value ($v);
		2892	}
		2893
		2894	#############################################################################
		2895
2588	package CFPlus::UI::Gauge;	2896	package CFPlus::UI::Gauge;
2589		2897
2590	our @ISA = CFPlus::UI::VBox::;	2898	our @ISA = CFPlus::UI::VBox::;
2591		2899
2592	sub new {	2900	sub new {
…		…
2717		3025
2718	$self->SUPER::invoke_button_down ($ev, $x, $y);	3026	$self->SUPER::invoke_button_down ($ev, $x, $y);
2719		3027
2720	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3028	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2721		3029
2722	$self->invoke_mouse_motion ($ev, $x, $y)	3030	$self->invoke_mouse_motion ($ev, $x, $y);
		3031
		3032	1
2723	}	3033	}
2724		3034
2725	sub invoke_mouse_motion {	3035	sub invoke_mouse_motion {
2726	my ($self, $ev, $x, $y) = @_;	3036	my ($self, $ev, $x, $y) = @_;
2727		3037
…		…
2747		3057
2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3058	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749		3059
2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3060	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751		3061
2752	! ! $delta	3062	1
2753	}	3063	}
2754		3064
2755	sub update {	3065	sub update {
2756	my ($self) = @_;	3066	my ($self) = @_;
2757		3067
…		…
2888	}	3198	}
2889		3199
2890	sub size_request {	3200	sub size_request {
2891	my ($self) = @_;	3201	my ($self) = @_;
2892		3202
2893	my ($empty, $slider) = @{ $self->{children} };	3203	my ($empty, $slider) = $self->visible_children;
2894		3204
2895	local $self->{children} = [$empty, $slider];	3205	local $self->{children} = [$empty, $slider];
2896	$self->SUPER::size_request	3206	$self->SUPER::size_request
2897	}	3207	}
2898		3208
…		…
3087		3397
3088	if ($y0 < $y + $h && $y < $y1) {	3398	if ($y0 < $y + $h && $y < $y1) {
3089	my $layout = $self->get_layout ($para);	3399	my $layout = $self->get_layout ($para);
3090		3400
3091	$layout->render ($para->{indent}, $y - $y0);	3401	$layout->render ($para->{indent}, $y - $y0);
		3402	$layout->draw;
3092		3403
3093	if (my @w = @{ $para->{widget} }) {	3404	if (my @w = @{ $para->{widget} }) {
3094	my @s = $layout->get_shapes;	3405	my @s = $layout->get_shapes;
3095		3406
3096	for (@w) {	3407	for (@w) {
…		…
3287	glTranslate 0.375, 0.375;	3598	glTranslate 0.375, 0.375;
3288		3599
3289	my ($w, $h) = @$self{qw(w h)};	3600	my ($w, $h) = @$self{qw(w h)};
3290		3601
3291	glColor 1, 0.8, 0.4;	3602	glColor 1, 0.8, 0.4;
3292	glBegin GL_QUADS;	3603	glRect 0, 0, $w, $h;
3293	glVertex 0 , 0;
3294	glVertex 0 , $h;
3295	glVertex $w, $h;
3296	glVertex $w, 0;
3297	glEnd;
3298		3604
3299	glColor 0, 0, 0;	3605	glColor 0, 0, 0;
3300	glBegin GL_LINE_LOOP;	3606	glRect_lineloop 0, 0, $w, $h;
3301	glVertex 0 , 0;
3302	glVertex 0 , $h;
3303	glVertex $w, $h;
3304	glVertex $w, 0;
3305	glEnd;
3306		3607
3307	glTranslate 2 - 0.375, 2 - 0.375;	3608	glTranslate 2 - 0.375, 2 - 0.375;
3308		3609
3309	$self->SUPER::_draw;	3610	$self->SUPER::_draw;
3310	}	3611	}
…		…
3319		3620
3320	sub new {	3621	sub new {
3321	my $class = shift;	3622	my $class = shift;
3322		3623
3323	my $self = $class->SUPER::new (	3624	my $self = $class->SUPER::new (
		3625	size_w => 32,
		3626	size_h => 8,
3324	aspect => 1,	3627	aspect => 1,
3325	can_events => 0,	3628	can_events => 0,
3326	@_,	3629	@_,
3327	);	3630	);
3328		3631
3329	if ($self->{anim} && $self->{animspeed}) {	3632	if ($self->{anim} && $self->{animspeed}) {
3330	CFPlus::weaken (my $widget = $self);	3633	CFPlus::weaken (my $widget = $self);
3331		3634
		3635	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3636	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3332	$self->{timer} = Event->timer (	3637	$self->{timer} = Event->timer (
3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334	hard => 1,	3638	parked => 1,
3335	interval => $self->{animspeed},
3336	cb => sub {	3639	cb => sub {
		3640	return unless $::CONN;
		3641
		3642	my $w = $widget
		3643	or return;
		3644
3337	++$widget->{frame};	3645	++$w->{frame};
		3646	$w->update_face;
		3647
		3648	# somehow, $widget can go away
3338	$widget->update;	3649	$w->update;
		3650	$w->update_timer;
3339	},	3651	},
3340	);	3652	);
		3653
		3654	$self->update_face;
		3655	$self->update_timer;
3341	}	3656	}
3342		3657
3343	$self	3658	$self
3344	}	3659	}
3345		3660
		3661	sub update_timer {
		3662	my ($self) = @_;
		3663
		3664	return unless $self->{timer};
		3665
		3666	if ($self->{visible}) {
		3667	$self->{timer}->at (
		3668	$self->{anim_start}
		3669	+ $self->{animspeed}
		3670	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3671	);
		3672	$self->{timer}->start;
		3673	} else {
		3674	$self->{timer}->stop;
		3675	}
		3676	}
		3677
		3678	sub update_face {
		3679	my ($self) = @_;
		3680
		3681	if ($::CONN) {
		3682	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3683	if ($anim && @$anim) {
		3684	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3685	delete $self->{face_change_cb};
		3686
		3687	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3688	unless ($tex->{name} || $tex->{loading}) {
		3689	$tex->upload (sub { $self->reconfigure });
		3690	}
		3691	}
		3692	}
		3693	}
		3694	}
		3695	}
		3696
3346	sub size_request {	3697	sub size_request {
3347	(32, 8)	3698	my ($self) = @_;
		3699
		3700	if ($::CONN) {
		3701	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3702	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3703	if ($tex->{name}) {
		3704	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3705	} elsif (!$tex->{loading}) {
		3706	$tex->upload (sub { $self->reconfigure });
		3707	}
		3708	}
		3709
		3710	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3711	}
		3712	}
		3713
		3714	($self->{size_w} || 8, $self->{size_h} || 8)
3348	}	3715	}
3349		3716
3350	sub update {	3717	sub update {
3351	my ($self) = @_;	3718	my ($self) = @_;
3352		3719
3353	return unless $self->{visible};	3720	return unless $self->{visible};
3354		3721
3355	$self->SUPER::update;	3722	$self->SUPER::update;
3356	}	3723	}
3357		3724
		3725	sub invoke_visibility_change {
		3726	my ($self) = @_;
		3727
		3728	$self->update_timer;
		3729
		3730	0
		3731	}
		3732
3358	sub _draw {	3733	sub _draw {
3359	my ($self) = @_;	3734	my ($self) = @_;
3360		3735
3361	return unless $::CONN;
3362
3363	$self->SUPER::_draw;	3736	$self->SUPER::_draw;
3364		3737
3365	my $face;	3738	if (my $tex = $self->{tex}) {
3366
3367	if ($self->{frame}) {
3368	my $anim = $::CONN->{anim}[$self->{anim}];
3369
3370	$face = $anim->[ $self->{frame} % @$anim ]
3371	if $anim && @$anim;
3372	}
3373
3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3375
3376	if ($tex) {
3377	glEnable GL_TEXTURE_2D;	3739	glEnable GL_TEXTURE_2D;
3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3740	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379	glColor 0, 0, 0, 1;	3741	glColor 0, 0, 0, 1;
3380	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3742	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3381	glDisable GL_TEXTURE_2D;	3743	glDisable GL_TEXTURE_2D;
…		…
3383	}	3745	}
3384		3746
3385	sub destroy {	3747	sub destroy {
3386	my ($self) = @_;	3748	my ($self) = @_;
3387		3749
3388	$self->{timer}->cancel	3750	(delete $self->{timer})->cancel
3389	if $self->{timer};	3751	if $self->{timer};
3390		3752
3391	$self->SUPER::destroy;	3753	$self->SUPER::destroy;
3392	}	3754	}
3393		3755
…		…
3433	children => [	3795	children => [
3434	(new CFPlus::UI::Label markup => $left, expand => 1),	3796	(new CFPlus::UI::Label markup => $left, expand => 1),
3435	(new CFPlus::UI::Label markup => $right, align => +1),	3797	(new CFPlus::UI::Label markup => $right, align => +1),
3436	],	3798	],
3437	;	3799	;
3438		3800
3439	} else {	3801	} else {
3440	$widget = new CFPlus::UI::Label	3802	$widget = new CFPlus::UI::Label
3441	can_hover => 1,	3803	can_hover => 1,
3442	can_events => 1,	3804	can_events => 1,
3443	markup => $widget,	3805	markup => $widget,
…		…
3579	buttonbar => (new CFPlus::UI::Buttonbar),	3941	buttonbar => (new CFPlus::UI::Buttonbar),
3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3942	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3581	# filter => # will be put between multiplexer and $self	3943	# filter => # will be put between multiplexer and $self
3582	@_,	3944	@_,
3583	);	3945	);
3584		3946
3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3947	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3586	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3948	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3587		3949
		3950	{
		3951	Scalar::Util::weaken (my $wself = $self);
		3952
		3953	$self->{multiplexer}->connect (c_add => sub {
		3954	my ($mplex, $widgets) = @_;
		3955
		3956	for my $child (@$widgets) {
		3957	Scalar::Util::weaken $child;
		3958	$child->{c_tab_} ||= do {
		3959	my $tab =
		3960	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3961	? $child->{c_tab}
		3962	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3963
		3964	$tab->connect (activate => sub {
		3965	$wself->set_current_page ($child);
		3966	});
		3967
		3968	$tab
		3969	};
		3970
		3971	$self->{buttonbar}->add ($child->{c_tab_});
		3972	}
		3973	});
		3974
		3975	$self->{multiplexer}->connect (c_remove => sub {
		3976	my ($mplex, $widgets) = @_;
		3977
		3978	for my $child (@$widgets) {
		3979	$wself->{buttonbar}->remove ($child->{c_tab_});
		3980	}
		3981	});
		3982	}
		3983
3588	$self	3984	$self
3589	}	3985	}
3590		3986
3591	sub add {	3987	sub add {
		3988	my ($self, @widgets) = @_;
		3989
		3990	$self->{multiplexer}->add (@widgets)
		3991	}
		3992
		3993	sub remove {
		3994	my ($self, @widgets) = @_;
		3995
		3996	$self->{multiplexer}->remove (@widgets)
		3997	}
		3998
		3999	sub pages {
		4000	my ($self) = @_;
		4001	$self->{multiplexer}->children
		4002	}
		4003
		4004	sub add_tab {
3592	my ($self, $title, $widget, $tooltip) = @_;	4005	my ($self, $title, $widget, $tooltip) = @_;
3593		4006
3594	CFPlus::weaken $self;	4007	$title = [$title, $tooltip] unless ref $title;
		4008	$widget->{c_tab} = $title;
3595		4009
3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3597	markup => $title,
3598	tooltip => $tooltip,
3599	on_activate => sub { $self->set_current_page ($widget) },
3600	);
3601
3602	$self->{multiplexer}->add ($widget);	4010	$self->add ($widget);
3603	}	4011	}
3604		4012
3605	sub get_current_page {	4013	sub get_current_page {
3606	my ($self) = @_;	4014	my ($self) = @_;
3607		4015
…		…
3890	}	4298	}
3891		4299
3892	sub update {	4300	sub update {
3893	my ($self) = @_;	4301	my ($self) = @_;
3894		4302
3895	$::WANT_REFRESH++;	4303	$::WANT_REFRESH->start;
3896	}	4304	}
3897		4305
3898	sub add {	4306	sub add {
3899	my ($self, @children) = @_;	4307	my ($self, @children) = @_;
3900		4308
…		…
3937	while ($self->{refresh_hook}) {	4345	while ($self->{refresh_hook}) {
3938	$_->()	4346	$_->()
3939	for values %{delete $self->{refresh_hook}};	4347	for values %{delete $self->{refresh_hook}};
3940	}	4348	}
3941		4349
3942	if ($self->{realloc}) {	4350	while ($self->{realloc}) {
3943	my %queue;	4351	my %queue;
3944	my @queue;	4352	my @queue;
3945	my $widget;	4353	my $widget;
3946		4354
3947	outer:	4355	outer:
…		…
3994	}	4402	}
3995	}	4403	}
3996		4404
3997	delete $self->{realloc}{$widget+0};	4405	delete $self->{realloc}{$widget+0};
3998	}	4406	}
3999	}
4000		4407
4001	while (my $size_alloc = delete $self->{size_alloc}) {	4408	while (my $size_alloc = delete $self->{size_alloc}) {
4002	my @queue = sort { $b->{visible} <=> $a->{visible} }	4409	my @queue = sort { $a->{visible} <=> $b->{visible} }
4003	values %$size_alloc;	4410	values %$size_alloc;
4004		4411
4005	while () {	4412	while () {
4006	my $widget = pop @queue || last;	4413	my $widget = pop @queue || last;
4007		4414
4008	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4415	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4009		4416
4010	$w = 0 if $w < 0;
4011	$h = 0 if $h < 0;
4012
4013	$w = max $widget->{min_w}, $w;	4417	$w = max $widget->{min_w}, $w;
4014	$h = max $widget->{min_h}, $h;	4418	$h = max $widget->{min_h}, $h;
4015		4419
4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4420	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4421	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018		4422
4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4423	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4424	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021		4425
4022	$w = int $w + 0.5;	4426	$w = int $w + 0.5;
4023	$h = int $h + 0.5;	4427	$h = int $h + 0.5;
4024		4428
4025	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4429	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4026	$widget->{old_w} = $widget->{w};	4430	$widget->{old_w} = $widget->{w};
4027	$widget->{old_h} = $widget->{h};	4431	$widget->{old_h} = $widget->{h};
4028		4432
4029	$widget->{w} = $w;	4433	$widget->{w} = $w;
4030	$widget->{h} = $h;	4434	$widget->{h} = $h;
4031		4435
4032	$widget->emit (size_allocate => $w, $h);	4436	$widget->emit (size_allocate => $w, $h);
		4437	}
4033	}	4438	}
4034	}	4439	}
4035	}	4440	}
4036		4441
4037	while ($self->{post_alloc_hook}) {	4442	while ($self->{post_alloc_hook}) {
4038	$_->()	4443	$_->()
4039	for values %{delete $self->{post_alloc_hook}};	4444	for values %{delete $self->{post_alloc_hook}};
4040	}	4445	}
4041
4042		4446
4043	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4447	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4448	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045	glClear GL_COLOR_BUFFER_BIT;	4449	glClear GL_COLOR_BUFFER_BIT;
4046		4450

Diff Legend

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