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.362 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.420 by root, Wed Jul 25 15:50:17 2007 UTC

…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$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
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
265	$self->hide;	272	$self->hide;
266	$self->emit ("destroy");	273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
268	}	275	}
269		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
273	return if $self->{parent};	284	return if $self->{parent};
274		285
…		…
313	sub set_visibility {	324	sub set_visibility {
314	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
315		326
316	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
317		328
318	$visible ? $self->hide	329	$visible ? $self->show
319	: $self->show;	330	: $self->hide;
320	}	331	}
321		332
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
540		551
541	# parent	552	# parent
542	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
543	}	554	}
544		555
545	sub find_widget {	556	#sub find_widget {
546	my ($self, $x, $y) = @_;	557	# in .xs
547
548	return () unless $self->{can_events};
549
550	return $self
551	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554	()
555	}
556		558
557	sub set_parent {	559	sub set_parent {
558	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
559		561
560	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
591		593
592	# 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
593	# functions seems pointless.	595	# functions seems pointless.
594	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
595		597
596	sub draw {	598	#sub draw {
597	my ($self) = @_;	599	#CFPlus.xs
598
599	return unless $self->{h} && $self->{w};
600
601	# update screen rectangle
602	local $draw_x = $draw_x + $self->{x};
603	local $draw_y = $draw_y + $self->{y};
604
605	# skip widgets that are entirely outside the drawing area
606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609	glPushMatrix;
610	glTranslate $self->{x}, $self->{y}, 0;
611
612	if ($self == $HOVER && $self->{can_hover}) {
613	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614	glEnable GL_BLEND;
615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glBegin GL_QUADS;
617	glVertex 0 , 0;
618	glVertex $self->{w}, 0;
619	glVertex $self->{w}, $self->{h};
620	glVertex 0 , $self->{h};
621	glEnd;
622	glDisable GL_BLEND;
623	}
624
625	if ($ENV{CFPLUS_DEBUG} & 1) {
626	glPushMatrix;
627	glColor 1, 1, 0, 1;
628	glTranslate 0.375, 0.375;
629	glBegin GL_LINE_LOOP;
630	glVertex 0 , 0;
631	glVertex $self->{w} - 1, 0;
632	glVertex $self->{w} - 1, $self->{h} - 1;
633	glVertex 0 , $self->{h} - 1;
634	glEnd;
635	glPopMatrix;
636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637	}
638
639	$self->_draw;
640	glPopMatrix;
641	}
642		600
643	sub _draw {	601	sub _draw {
644	my ($self) = @_;	602	my ($self) = @_;
645		603
646	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
647	}	605	}
648		606
649	my $cntx;#d#
650	sub DESTROY {	607	sub DESTROY {
651	my ($self) = @_;	608	my ($self) = @_;
652		609
653	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
654		611
…		…
739	can_events => 0,	696	can_events => 0,
740	%arg,	697	%arg,
741	);	698	);
742		699
743	$self->add (@$children)	700	$self->add (@$children)
744	if $children;	701	if $children && @$children;
745		702
746	$self	703	$self
747	}	704	}
748		705
749	sub realloc {	706	sub realloc {
…		…
758	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
759		716
760	$_->set_parent ($self)	717	$_->set_parent ($self)
761	for @widgets;	718	for @widgets;
762		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
763	use sort 'stable';	721	use sort 'stable';
764		722
765	$self->{children} = [	723	$self->{children} = [
766	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
767	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
768	];	726	];
769		727
770	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
771	}	733	}
772		734
773	sub children {	735	sub children {
774	@{ $_[0]{children} }	736	@{ $_[0]{children} }
775	}	737	}
776		738
777	sub remove {	739	sub remove {
778	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
779		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
780	delete $child->{parent};	745	delete $child->{parent};
781	$child->hide;	746	$child->hide;
782
783	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
784		749
785	$self->realloc;	750	$self->realloc;
786	}	751	}
787		752
788	sub clear {	753	sub clear {
789	my ($self) = @_;	754	my ($self) = @_;
790		755
791	my $children = delete $self->{children};	756	my $children = $self->{children};
792	$self->{children} = [];	757	$self->{children} = [];
793		758
794	for (@$children) {	759	for (@$children) {
795	delete $_->{parent};	760	delete $_->{parent};
796	$_->hide;	761	$_->hide;
…		…
816	}	781	}
817		782
818	sub _draw {	783	sub _draw {
819	my ($self) = @_;	784	my ($self) = @_;
820		785
821	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
822	}	787	}
823		788
824	#############################################################################	789	#############################################################################
825		790
826	package CFPlus::UI::Bin;	791	package CFPlus::UI::Bin;
…		…
836	}	801	}
837		802
838	sub add {	803	sub add {
839	my ($self, $child) = @_;	804	my ($self, $child) = @_;
840		805
841	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
842	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
843	}	808	}
844		809
845	sub remove {	810	sub remove {
846	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
…		…
936	}	901	}
937		902
938	#############################################################################	903	#############################################################################
939		904
940	package CFPlus::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
		906
		907	use List::Util qw(min max);
941		908
942	our @ISA = CFPlus::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
943		910
944	sub new {	911	sub new {
945	my $class = shift;	912	my $class = shift;
…		…
954	sub size_request {	921	sub size_request {
955	my ($self) = @_;	922	my ($self) = @_;
956		923
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		925
959	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
961		928
962	($w, $h)	929	($w, $h)
963	}	930	}
964		931
965	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
977	}	944	}
978		945
979	sub set_offset {	946	sub set_offset {
980	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
981		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
982	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
983	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
984		955
		956	$self->emit (changed => $x, $y);
985	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
986	}	977	}
987		978
988	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
989	sub coord2local {	980	sub coord2local {
990	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
1005	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
1006		997
1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009	) {	1000	) {
1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011	} else {	1002	} else {
1012	$self->CFPlus::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
1013	}	1004	}
1014	}	1005	}
1015		1006
…		…
1026		1017
1027	#############################################################################	1018	#############################################################################
1028		1019
1029	package CFPlus::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
1030		1021
1031	our @ISA = CFPlus::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
1032		1023
1033	sub new {	1024	sub new {
1034	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
1035		1026
1036	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
1037		1028
1038	my $self;	1029	my $self;
1039		1030
1040	my $slider = new CFPlus::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	col => 0,
		1033	row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	col => 1,
		1044	row => 0,
1041	vertical => 1,	1045	vertical => 1,
1042	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
1043	on_changed => sub {	1047	on_changed => sub {
1044	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045	},	1050	},
1046	;	1051	;
1047		1052
1048	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
1049	vp => (new CFPlus::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
1050	can_events => 1,	1056	can_events => 1,
1051	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
1052	%arg,	1061	%arg,
1053	);	1062	);
1054		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	col => 0,
		1066	row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
1055	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
1056	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
1057		1088
1058	$self	1089	$self
1059	}	1090	}
1060
1061	#TODO# update range on size_allocate depending on child
1062		1091
1063	sub add {	1092	sub add {
1064	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
1065		1094
1066	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
1067	}	1096	}
1068		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
		1133	my ($self, $ev) = @_;
		1134
		1135	$self->grab_focus;
		1136
		1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
1069	sub invoke_mouse_wheel {	1150	sub invoke_mouse_wheel {
1070	my ($self, $ev) = @_;	1151	my ($self, $ev) = @_;
1071		1152
1072	return 0 unless $ev->{dy}; # only vertical movements
1073
1074	$self->{slider}->emit (mouse_wheel => $ev);	1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075		1155
1076	1	1156	1
1077	}	1157	}
1078		1158
1079	sub update_slider {	1159	sub invoke_button_down {
1080	my ($self) = @_;	1160	my ($self, $ev, $x, $y) = @_;
1081		1161
1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1162	if ($ev->{button} == 2) {
1083	}	1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
1084		1166
1085	sub update {	1167	0
1086	my ($self) = @_;	1168	}
1087		1169
1088	$self->SUPER::update;	1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
1089		1172
1090	$self->update_slider;	1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1091	}	1189	}
1092		1190
1093	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1094	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1095		1193
1096	$self->update_slider;	1194	$self->update_slider;
1097
1098	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1099	}	1196	}
1100		1197
1101	#############################################################################	1198	#############################################################################
1102		1199
…		…
1252		1349
1253	my @border =	1350	my @border =
1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
		1357
1257	sub new {	1358	sub new {
1258	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1259		1360
1260	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1261	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
…		…
1429	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430		1531
1431	my $border = $self->border;	1532	my $border = $self->border;
1432		1533
1433	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1434	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438		1553
1439	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1441		1556
1442	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1463		1578
1464	#############################################################################	1579	#############################################################################
1465		1580
1466	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1467		1582
1468	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1469		1584
1470	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1471		1586
1472	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1473		1588
1474	sub new {	1589	sub new {
1475	my $class = shift;	1590	my $class = shift;
1476		1591
1477	$class->SUPER::new (	1592	$class->SUPER::new (
1478	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1479	@_,	1595	@_,
1480	)	1596	)
1481	}	1597	}
1482		1598
1483	sub children {
1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485	}
1486
1487	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{rowspan} ||= 1;
		1604	$child->{colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1488	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1489		1614
1490	while (@_) {	1615	while (@_) {
1491	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1492	$child->set_parent ($self);
1493	$self->{children}[$y][$x] = $child;
1494	}
1495		1617
1496	$self->{force_realloc} = 1;	1618	$child->{row} = $row;
1497	$self->{force_size_alloc} = 1;	1619	$child->{col} = $col;
1498	$self->realloc;
1499	}
1500		1620
1501	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1502	my ($self, $child) = @_;	1628	my ($self) = @_;
1503		1629
1504	# TODO: not yet implemented	1630	my (@w, @h);
1505	}
1506
1507	# TODO: move to container class maybe? send children a signal on removal?
1508	sub clear {
1509	my ($self) = @_;
1510		1631
1511	my @children = $self->children;	1632	my @children = $self->children;
1512	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1513		1643	}
1514	for (@children) {
1515	delete $_->{parent};
1516	$_->hide;
1517	}
1518		1644
1519	$self->realloc;	1645	# second pass, rows
1520	}	1646	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1521
1522	sub get_wh {
1523	my ($self) = @_;
1524
1525	my (@w, @h);
1526
1527	for my $y (0 .. $#{$self->{children}}) {
1528	my $row = $self->{children}[$y]
1529	or next;
1530
1531	for my $x (0 .. $#$row) {
1532	my $widget = $row->[$x]
1533	or next;
1534	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1535		1648
1536	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1537	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538	}	1653	}
1539	}	1654	}
1540		1655
1541	(\@w, \@h)	1656	(\@w, \@h)
1542	}	1657	}
…		…
1558	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1559		1674
1560	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1561	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1562		1677
1563	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1564	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1565	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1566	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1567		1682
1568	# linearly scale sizes
1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571		1684
1572	CFPlus::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1573	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1574		1694
1575	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576		1697
1577	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1578	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1579	or next;
1580		1700
1581	my $x = 0;	1701	$widget->configure (
1582	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583		1704	);
1584	for my $c (0 .. $#$row) {	1705	}
1585	my $col_w = $ws->[$c];
1586		1706
1587	if (my $widget = $row->[$c]) {	1707	1
1588	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1589	}
1590		1709
1591	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592	}	1737	}
		1738	}
1593		1739
1594	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595	}	1771	}
1596		1772
1597	1	1773	1
1598	}	1774	}
1599		1775
1600	sub find_widget {
1601	my ($self, $x, $y) = @_;
1602
1603	$x -= $self->{x};
1604	$y -= $self->{y};
1605
1606	my $res;
1607
1608	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609	$res = $_->find_widget ($x, $y)
1610	and return $res;
1611	}
1612
1613	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614	}
1615
1616	sub _draw {
1617	my ($self) = @_;
1618
1619	for (grep $_, @{$self->{children}}) {
1620	$_->draw for grep $_, @$_;
1621	}
1622	}
1623
1624	#############################################################################	1776	#############################################################################
1625		1777
1626	package CFPlus::UI::Box;	1778	package CFPlus::UI::Box;
1627		1779
1628	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1629		1781
1630	sub size_request {	1782	sub size_request {
1631	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1632		1786
1633	$self->{vertical}	1787	$self->{vertical}
1634	? (	1788	? (
1635	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1636	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1637	)	1791	)
1638	: (	1792	: (
1639	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1640	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1641	)	1795	)
1642	}	1796	}
1643		1797
1644	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1645	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888	: ($self->{h} - $size->[1]) * 0.5);	2042	: ($self->{h} - $size->[1]) * 0.5);
1889	};	2043	};
1890		2044
1891	my $w = List::Util::min $self->{w} + 4, $size->[0];	2045	# unless ($self->{list}) {
1892	my $h = List::Util::min $self->{h} + 2, $size->[1];	2046	# $self->{list} = CFPlus::OpenGL::glGenList;
		2047	# CFPlus::OpenGL::glNewList $self->{list};
		2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2049	# CFPlus::OpenGL::glEndList;
		2050	# }
		2051	#
		2052	# CFPlus::OpenGL::glCallList $self->{list};
1893		2053
1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1895	}	2055	}
		2056
		2057	#sub destroy {
		2058	# my ($self) = @_;
		2059	#
		2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2061	#
		2062	# $self->SUPER::destroy;
		2063	#}
1896		2064
1897	#############################################################################	2065	#############################################################################
1898		2066
1899	package CFPlus::UI::EntryBase;	2067	package CFPlus::UI::EntryBase;
1900		2068
…		…
1906	my $class = shift;	2074	my $class = shift;
1907		2075
1908	$class->SUPER::new (	2076	$class->SUPER::new (
1909	fg => [1, 1, 1],	2077	fg => [1, 1, 1],
1910	bg => [0, 0, 0, 0.2],	2078	bg => [0, 0, 0, 0.2],
		2079	outline => [0.6, 0.3, 0.1],
1911	active_bg => [1, 1, 1, 0.5],	2080	active_bg => [0, 0, 1, .2],
1912	active_fg => [0, 0, 0],	2081	active_fg => [1, 1, 1],
		2082	active_outline => [1, 1, 0],
1913	can_hover => 1,	2083	can_hover => 1,
1914	can_focus => 1,	2084	can_focus => 1,
1915	valign => 0,	2085	valign => 0,
1916	can_events => 1,	2086	can_events => 1,
1917	ellipsise => 0,	2087	ellipsise => 0,
…		…
1967	my $sym = $ev->{sym};	2137	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2138	my $uni = $ev->{unicode};
1969		2139
1970	my $text = $self->get_text;	2140	my $text = $self->get_text;
1971		2141
		2142	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2143
1972	if ($uni == 8) {	2144	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2146	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2147	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2148	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2149	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2150	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2151	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2152	} elsif ($sym == CFPlus::SDLK_HOME) {
		2153	# what a hack
1981	$self->{cursor} = 0;	2154	$self->{cursor} =
		2155	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2156	? length $1
		2157	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2158	} elsif ($sym == CFPlus::SDLK_END) {
		2159	# uh, again
		2160	$self->{cursor} =
		2161	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2162	? $self->{cursor} + length $1
		2163	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2164	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2165	$text = "";
1986	$self->{cursor} = 0;	2166	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2167	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2168	$self->emit ('escape');
1989	} elsif ($uni >= 0x20 || $uni == 0x0d) {	2169	} elsif ($uni == 0x0d) {
		2170	substr $text, $self->{cursor}++, 0, "\012";
		2171	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2172	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2173	} else {
1992	return 0;	2174	return 0;
1993	}	2175	}
1994		2176
…		…
2062		2244
2063	unless (exists $self->{cur_h}) {	2245	unless (exists $self->{cur_h}) {
2064	my $text = substr $self->{text}, 0, $self->{cursor};	2246	my $text = substr $self->{text}, 0, $self->{cursor};
2065	utf8::encode $text;	2247	utf8::encode $text;
2066		2248
2067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2249	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2068	}	2250	}
2069		2251
		2252	glColor_premultiply @{$self->{active_fg}};
2070	glBegin GL_LINES;	2253	glBegin GL_LINES;
2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2072	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2256	glEnd;
		2257
		2258	glLineWidth 3;
		2259	glColor @{$self->{active_outline}};
		2260	glBegin GL_LINE_LOOP;
		2261	glVertex 0, 0;
		2262	glVertex $self->{w} - 1, 0;
		2263	glVertex $self->{w} - 1, $self->{h} - 1;
		2264	glVertex 0, $self->{h} - 1;
		2265	glEnd;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glTranslate .375, .375;
		2271	glBegin GL_LINE_STRIP;
		2272	glVertex 0, $self->{h} * .5;
		2273	glVertex 0, $self->{h} - 3;
		2274	glVertex $self->{w} - 1, $self->{h} - 3;
		2275	glVertex $self->{w} - 1, $self->{h} * .5;
2073	glEnd;	2276	glEnd;
2074	}	2277	}
2075	}	2278	}
2076		2279
2077	#############################################################################	2280	#############################################################################
…		…
2164	1	2367	1
2165	}	2368	}
2166		2369
2167	#############################################################################	2370	#############################################################################
2168		2371
2169	package CFPlus::UI::Button;	2372	package CFPlus::UI::ButtonBin;
2170		2373
2171	our @ISA = CFPlus::UI::Label::;	2374	our @ISA = CFPlus::UI::Bin::;
2172		2375
2173	use CFPlus::OpenGL;	2376	use CFPlus::OpenGL;
2174		2377
2175	my @tex =	2378	my @tex =
2176	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw(b1_button_active.png);	2380	qw(b1_button_inactive.png b1_button_active.png);
2178		2381
2179	sub new {	2382	sub new {
2180	my $class = shift;	2383	my $class = shift;
2181		2384
2182	$class->SUPER::new (	2385	$class->SUPER::new (
2183	padding_x => 4,
2184	padding_y => 4,
2185	fg => [1, 1, 1],
2186	active_fg => [0, 0, 1],
2187	can_hover => 1,	2386	can_hover => 1,
2188	align => 0,	2387	align => 0,
2189	valign => 0,	2388	valign => 0,
2190	can_events => 1,	2389	can_events => 1,
2191	@_	2390	@_
…		…
2203	}	2402	}
2204		2403
2205	sub _draw {	2404	sub _draw {
2206	my ($self) = @_;	2405	my ($self) = @_;
2207		2406
2208	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2209
2210	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2212	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2213		2410
		2411	my $tex = $tex[$GRAB == $self];
2214	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2413
		2414	glDisable GL_TEXTURE_2D;
		2415
		2416	$self->SUPER::_draw;
		2417	}
		2418
		2419	#############################################################################
		2420
		2421	package CFPlus::UI::Button;
		2422
		2423	our @ISA = CFPlus::UI::Label::;
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	my @tex =
		2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2429	qw(b1_button_inactive.png b1_button_active.png);
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 4,
		2436	padding_y => 4,
		2437	fg => [1.0, 1.0, 1.0],
		2438	active_fg => [0.8, 0.8, 0.8],
		2439	can_hover => 1,
		2440	align => 0,
		2441	valign => 0,
		2442	can_events => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub invoke_button_up {
		2448	my ($self, $ev, $x, $y) = @_;
		2449
		2450	$self->emit ("activate")
		2451	if $x >= 0 && $x < $self->{w}
		2452	&& $y >= 0 && $y < $self->{h};
		2453
		2454	1
		2455	}
		2456
		2457	sub _draw {
		2458	my ($self) = @_;
		2459
		2460	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2461
		2462	glEnable GL_TEXTURE_2D;
		2463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2464	glColor 0, 0, 0, 1;
		2465
		2466	my $tex = $tex[$GRAB == $self];
		2467	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2215		2468
2216	glDisable GL_TEXTURE_2D;	2469	glDisable GL_TEXTURE_2D;
2217		2470
2218	$self->SUPER::_draw;	2471	$self->SUPER::_draw;
2219	}	2472	}
…		…
2306	sub new {	2559	sub new {
2307	my $class = shift;	2560	my $class = shift;
2308		2561
2309	my $self = $class->SUPER::new (	2562	my $self = $class->SUPER::new (
2310	can_events => 0,	2563	can_events => 0,
		2564	scale => 1,
2311	@_,	2565	@_,
2312	);	2566	);
2313		2567
2314	$self->{path} || $self->{tex}	2568	$self->{path} || $self->{tex}
2315	or Carp::croak "'path' or 'tex' attributes required";	2569	or Carp::croak "'path' or 'tex' attributes required";
…		…
2340	}	2594	}
2341		2595
2342	sub size_request {	2596	sub size_request {
2343	my ($self) = @_;	2597	my ($self) = @_;
2344		2598
2345	($self->{tex}{w}, $self->{tex}{h})	2599	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2346	}	2600	}
2347		2601
2348	sub _draw {	2602	sub _draw {
2349	my ($self) = @_;	2603	my ($self) = @_;
2350		2604
…		…
2360	}	2614	}
2361		2615
2362	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2364		2618
2365	$tex->draw_quad (0, 0, $w, $h);	2619	$tex->draw_quad_alpha (0, 0, $w, $h);
2366		2620
2367	glDisable GL_TEXTURE_2D;	2621	glDisable GL_TEXTURE_2D;
2368	}	2622	}
2369		2623
2370	#############################################################################	2624	#############################################################################
…		…
2672		2926
2673	$self->SUPER::invoke_button_down ($ev, $x, $y);	2927	$self->SUPER::invoke_button_down ($ev, $x, $y);
2674		2928
2675	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2929	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2676		2930
2677	$self->invoke_mouse_motion ($ev, $x, $y)	2931	$self->invoke_mouse_motion ($ev, $x, $y);
		2932
		2933	1
2678	}	2934	}
2679		2935
2680	sub invoke_mouse_motion {	2936	sub invoke_mouse_motion {
2681	my ($self, $ev, $x, $y) = @_;	2937	my ($self, $ev, $x, $y) = @_;
2682		2938
…		…
2698	sub invoke_mouse_wheel {	2954	sub invoke_mouse_wheel {
2699	my ($self, $ev) = @_;	2955	my ($self, $ev) = @_;
2700		2956
2701	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2957	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702		2958
		2959	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2960
2703	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2961	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2704		2962
2705	! ! $delta	2963	1
2706	}	2964	}
2707		2965
2708	sub update {	2966	sub update {
2709	my ($self) = @_;	2967	my ($self) = @_;
2710		2968
…		…
2818	#font => default_font	3076	#font => default_font
2819	@_,	3077	@_,
2820		3078
2821	layout => (new CFPlus::Layout),	3079	layout => (new CFPlus::Layout),
2822	par => [],	3080	par => [],
		3081	max_par => 0,
2823	height => 0,	3082	height => 0,
2824	children => [	3083	children => [
2825	(new CFPlus::UI::Empty expand => 1),	3084	(new CFPlus::UI::Empty expand => 1),
2826	(new CFPlus::UI::Slider vertical => 1),	3085	(new CFPlus::UI::Slider vertical => 1),
2827	],	3086	],
…		…
2840	}	3099	}
2841		3100
2842	sub size_request {	3101	sub size_request {
2843	my ($self) = @_;	3102	my ($self) = @_;
2844		3103
2845	my ($empty, $slider) = @{ $self->{children} };	3104	my ($empty, $slider) = $self->visible_children;
2846		3105
2847	local $self->{children} = [$empty, $slider];	3106	local $self->{children} = [$empty, $slider];
2848	$self->SUPER::size_request	3107	$self->SUPER::size_request
2849	}	3108	}
2850		3109
…		…
2952		3211
2953	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3212	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954	push @{$self->{par}}, $para;	3213	push @{$self->{par}}, $para;
2955	}	3214	}
2956		3215
		3216	if (my $max = $self->{max_par}) {
		3217	shift @{$self->{par}} while @{$self->{par}} > $max;
		3218	}
		3219
2957	$self->{need_reflow}++;	3220	$self->{need_reflow}++;
2958	$self->update;	3221	$self->update;
2959	}	3222	}
2960		3223
2961	sub scroll_to_bottom {	3224	sub scroll_to_bottom {
…		…
3235	glTranslate 0.375, 0.375;	3498	glTranslate 0.375, 0.375;
3236		3499
3237	my ($w, $h) = @$self{qw(w h)};	3500	my ($w, $h) = @$self{qw(w h)};
3238		3501
3239	glColor 1, 0.8, 0.4;	3502	glColor 1, 0.8, 0.4;
3240	glBegin GL_QUADS;	3503	glRect 0, 0, $w, $h;
3241	glVertex 0 , 0;
3242	glVertex 0 , $h;
3243	glVertex $w, $h;
3244	glVertex $w, 0;
3245	glEnd;
3246		3504
3247	glColor 0, 0, 0;	3505	glColor 0, 0, 0;
3248	glBegin GL_LINE_LOOP;	3506	glBegin GL_LINE_LOOP;
3249	glVertex 0 , 0;	3507	glVertex 0 , 0;
3250	glVertex 0 , $h;	3508	glVertex 0 , $h;
…		…
3267		3525
3268	sub new {	3526	sub new {
3269	my $class = shift;	3527	my $class = shift;
3270		3528
3271	my $self = $class->SUPER::new (	3529	my $self = $class->SUPER::new (
		3530	size_w => 32,
		3531	size_h => 8,
3272	aspect => 1,	3532	aspect => 1,
3273	can_events => 0,	3533	can_events => 0,
3274	@_,	3534	@_,
3275	);	3535	);
3276		3536
3277	if ($self->{anim} && $self->{animspeed}) {	3537	if ($self->{anim} && $self->{animspeed}) {
3278	CFPlus::weaken (my $widget = $self);	3538	CFPlus::weaken (my $widget = $self);
3279		3539
		3540	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3541	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3280	$self->{timer} = Event->timer (	3542	$self->{timer} = Event->timer (
3281	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282	hard => 1,	3543	parked => 1,
3283	interval => $self->{animspeed},
3284	cb => sub {	3544	cb => sub {
		3545	return unless $::CONN && $widget;
		3546
3285	++$widget->{frame};	3547	++$widget->{frame};
		3548	$widget->update_face;
3286	$widget->update;	3549	$widget->update;
		3550
		3551	$widget->update_timer;
3287	},	3552	},
3288	);	3553	);
		3554
		3555	$self->update_face;
		3556	$self->update_timer;
3289	}	3557	}
3290		3558
3291	$self	3559	$self
3292	}	3560	}
3293		3561
		3562	sub update_timer {
		3563	my ($self) = @_;
		3564
		3565	return unless $self->{timer};
		3566
		3567	if ($self->{visible}) {
		3568	$self->{timer}->at (
		3569	$self->{anim_start}
		3570	+ $self->{animspeed}
		3571	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3572	);
		3573	$self->{timer}->start;
		3574	} else {
		3575	$self->{timer}->stop;
		3576	}
		3577	}
		3578
		3579	sub update_face {
		3580	my ($self) = @_;
		3581
		3582	return unless $::CONN;
		3583
		3584	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3585	if ($anim && @$anim) {
		3586	delete $self->{wait_face};
		3587	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3588	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3589	}
		3590	}
		3591	}
		3592
3294	sub size_request {	3593	sub size_request {
3295	(32, 8)	3594	my ($self) = @_;
		3595
		3596	if ($::CONN) {
		3597	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3598	if (my $tex = $::CONN->{texture}[$faceid]) {
		3599	$self->{tex} = $tex;
		3600	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3601	} else {
		3602	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3603	$self->realloc;
		3604	});
		3605	}
		3606	}
		3607	}
		3608
		3609	($self->{size_w} || 8, $self->{size_h} || 8)
3296	}	3610	}
3297		3611
3298	sub update {	3612	sub update {
3299	my ($self) = @_;	3613	my ($self) = @_;
3300		3614
3301	return unless $self->{visible};	3615	return unless $self->{visible};
3302		3616
3303	$self->SUPER::update;	3617	$self->SUPER::update;
3304	}	3618	}
3305		3619
		3620	sub invoke_visibility_change {
		3621	my ($self) = @_;
		3622
		3623	$self->update_timer;
		3624
		3625	0
		3626	}
		3627
3306	sub _draw {	3628	sub _draw {
3307	my ($self) = @_;	3629	my ($self) = @_;
3308		3630
3309	return unless $::CONN;
3310
3311	$self->SUPER::_draw;	3631	$self->SUPER::_draw;
3312		3632
3313	my $face;	3633	if (my $tex = $self->{tex}) {
3314
3315	if ($self->{frame}) {
3316	my $anim = $::CONN->{anim}[$self->{anim}];
3317
3318	$face = $anim->[ $self->{frame} % @$anim ]
3319	if $anim && @$anim;
3320	}
3321
3322	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3323
3324	if ($tex) {
3325	glEnable GL_TEXTURE_2D;	3634	glEnable GL_TEXTURE_2D;
3326	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3327	glColor 0, 0, 0, 1;	3636	glColor 0, 0, 0, 1;
3328	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3637	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3329	glDisable GL_TEXTURE_2D;	3638	glDisable GL_TEXTURE_2D;
…		…
3331	}	3640	}
3332		3641
3333	sub destroy {	3642	sub destroy {
3334	my ($self) = @_;	3643	my ($self) = @_;
3335		3644
3336	$self->{timer}->cancel	3645	(delete $self->{timer})->cancel
3337	if $self->{timer};	3646	if $self->{timer};
3338		3647
3339	$self->SUPER::destroy;	3648	$self->SUPER::destroy;
3340	}	3649	}
3341		3650
…		…
3381	children => [	3690	children => [
3382	(new CFPlus::UI::Label markup => $left, expand => 1),	3691	(new CFPlus::UI::Label markup => $left, expand => 1),
3383	(new CFPlus::UI::Label markup => $right, align => +1),	3692	(new CFPlus::UI::Label markup => $right, align => +1),
3384	],	3693	],
3385	;	3694	;
3386		3695
3387	} else {	3696	} else {
3388	$widget = new CFPlus::UI::Label	3697	$widget = new CFPlus::UI::Label
3389	can_hover => 1,	3698	can_hover => 1,
3390	can_events => 1,	3699	can_events => 1,
3391	markup => $widget,	3700	markup => $widget,
…		…
3527	buttonbar => (new CFPlus::UI::Buttonbar),	3836	buttonbar => (new CFPlus::UI::Buttonbar),
3528	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3837	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3529	# filter => # will be put between multiplexer and $self	3838	# filter => # will be put between multiplexer and $self
3530	@_,	3839	@_,
3531	);	3840	);
3532		3841
3533	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3842	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3534	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3843	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3535		3844
		3845	{
		3846	Scalar::Util::weaken (my $wself = $self);
		3847
		3848	$self->{multiplexer}->connect (c_add => sub {
		3849	my ($mplex, $widgets) = @_;
		3850
		3851	for my $child (@$widgets) {
		3852	Scalar::Util::weaken $child;
		3853	$child->{c_tab_} ||= do {
		3854	my $tab =
		3855	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3856	? $child->{c_tab}
		3857	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3858
		3859	$tab->connect (activate => sub {
		3860	$wself->set_current_page ($child);
		3861	});
		3862
		3863	$tab
		3864	};
		3865
		3866	$self->{buttonbar}->add ($child->{c_tab_});
		3867	}
		3868	});
		3869
		3870	$self->{multiplexer}->connect (c_remove => sub {
		3871	my ($mplex, $widgets) = @_;
		3872
		3873	for my $child (@$widgets) {
		3874	$wself->{buttonbar}->remove ($child->{c_tab_});
		3875	}
		3876	});
		3877	}
		3878
3536	$self	3879	$self
3537	}	3880	}
3538		3881
3539	sub add {	3882	sub add {
		3883	my ($self, @widgets) = @_;
		3884
		3885	$self->{multiplexer}->add (@widgets)
		3886	}
		3887
		3888	sub remove {
		3889	my ($self, @widgets) = @_;
		3890
		3891	$self->{multiplexer}->remove (@widgets)
		3892	}
		3893
		3894	sub pages {
		3895	my ($self) = @_;
		3896	$self->{multiplexer}->children
		3897	}
		3898
		3899	sub add_tab {
3540	my ($self, $title, $widget, $tooltip) = @_;	3900	my ($self, $title, $widget, $tooltip) = @_;
3541		3901
3542	CFPlus::weaken $self;	3902	$title = [$title, $tooltip] unless ref $title;
		3903	$widget->{c_tab} = $title;
3543		3904
3544	$self->{buttonbar}->add (new CFPlus::UI::Button
3545	markup => $title,
3546	tooltip => $tooltip,
3547	on_activate => sub { $self->set_current_page ($widget) },
3548	);
3549
3550	$self->{multiplexer}->add ($widget);	3905	$self->add ($widget);
3551	}	3906	}
3552		3907
3553	sub get_current_page {	3908	sub get_current_page {
3554	my ($self) = @_;	3909	my ($self) = @_;
3555		3910
…		…
3885	while ($self->{refresh_hook}) {	4240	while ($self->{refresh_hook}) {
3886	$_->()	4241	$_->()
3887	for values %{delete $self->{refresh_hook}};	4242	for values %{delete $self->{refresh_hook}};
3888	}	4243	}
3889		4244
3890	if ($self->{realloc}) {	4245	while ($self->{realloc}) {
3891	my %queue;	4246	my %queue;
3892	my @queue;	4247	my @queue;
3893	my $widget;	4248	my $widget;
3894		4249
3895	outer:	4250	outer:
…		…
3942	}	4297	}
3943	}	4298	}
3944		4299
3945	delete $self->{realloc}{$widget+0};	4300	delete $self->{realloc}{$widget+0};
3946	}	4301	}
3947	}
3948		4302
3949	while (my $size_alloc = delete $self->{size_alloc}) {	4303	while (my $size_alloc = delete $self->{size_alloc}) {
3950	my @queue = sort { $b->{visible} <=> $a->{visible} }	4304	my @queue = sort { $a->{visible} <=> $b->{visible} }
3951	values %$size_alloc;	4305	values %$size_alloc;
3952		4306
3953	while () {	4307	while () {
3954	my $widget = pop @queue || last;	4308	my $widget = pop @queue || last;
3955		4309
3956	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4310	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3957		4311
3958	$w = 0 if $w < 0;
3959	$h = 0 if $h < 0;
3960
3961	$w = max $widget->{min_w}, $w;	4312	$w = max $widget->{min_w}, $w;
3962	$h = max $widget->{min_h}, $h;	4313	$h = max $widget->{min_h}, $h;
3963		4314
3964	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4315	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4316	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966		4317
3967	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4318	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4319	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969		4320
3970	$w = int $w + 0.5;	4321	$w = int $w + 0.5;
3971	$h = int $h + 0.5;	4322	$h = int $h + 0.5;
3972		4323
3973	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4324	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3974	$widget->{old_w} = $widget->{w};	4325	$widget->{old_w} = $widget->{w};
3975	$widget->{old_h} = $widget->{h};	4326	$widget->{old_h} = $widget->{h};
3976		4327
3977	$widget->{w} = $w;	4328	$widget->{w} = $w;
3978	$widget->{h} = $h;	4329	$widget->{h} = $h;
3979		4330
3980	$widget->emit (size_allocate => $w, $h);	4331	$widget->emit (size_allocate => $w, $h);
		4332	}
3981	}	4333	}
3982	}	4334	}
3983	}	4335	}
3984		4336
3985	while ($self->{post_alloc_hook}) {	4337	while ($self->{post_alloc_hook}) {
3986	$_->()	4338	$_->()
3987	for values %{delete $self->{post_alloc_hook}};	4339	for values %{delete $self->{post_alloc_hook}};
3988	}	4340	}
3989
3990		4341
3991	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4342	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3992	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4343	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3993	glClear GL_COLOR_BUFFER_BIT;	4344	glClear GL_COLOR_BUFFER_BIT;
3994		4345

Diff Legend

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