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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.402 by root, Sat Jul 21 20:49:44 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFPlus;	9	use CFPlus;
11	use CFPlus::Pod;	10	use CFPlus::Pod;
…		…
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24	if (!$GRAB) {	23	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	28	$TOOLTIP->hide;
29		29
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		32
32	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
33		34
34	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
35		36
…		…
43	}	44	}
44	}	45	}
45	}	46	}
46		47
47	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
49	});	51	});
50		52
51	sub get_layout {	53	sub get_layout {
52	my $layout;	54	my $layout;
…		…
111	}	113	}
112		114
113	if ($GRAB) {	115	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	117	# mousewheel
116	$ev->{dx} = 0;
117	$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
118	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
119	} else {	125	} else {
120	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
121	}	127	}
122	}	128	}
…		…
235	h => undef,	241	h => undef,
236	can_events => 1,	242	can_events => 1,
237	@_	243	@_
238	}, $class;	244	}, $class;
239		245
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		247
242	for (keys %$self) {	248	for (keys %$self) {
243	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
245	}	251	}
…		…
262		268
263	sub destroy {	269	sub destroy {
264	my ($self) = @_;	270	my ($self) = @_;
265		271
266	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
267	%$self = ();	274	%$self = ();
		275	}
		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
268	}	279	}
269		280
270	sub show {	281	sub show {
271	my ($self) = @_;	282	my ($self) = @_;
272		283
…		…
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
…		…
502		513
503	defined wantarray and CFPlus::guard {	514	defined wantarray and CFPlus::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
506	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
507	}	524	}
508		525
509	my %has_coords = (	526	my %has_coords = (
510	button_down => 1,	527	button_down => 1,
511	button_up => 1,	528	button_up => 1,
…		…
523	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
524	: ();	541	: ();
525		542
526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527		544
528	if ($self->{tooltip} =~ /Apply.*audio/) {	545	for my $cb (
529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#	546	@{$self->{signal_cb}{$signal} || []}, # before
530	warn "3 $self->{parent}\n";#d#	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
531	}	550	}
532		551
533	#d##TODO# stop propagating at first true, do not use sum	552	# parent
534	my $res =
535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
538	;
539	if ($self->{tooltip} =~ /Apply.*audio/) {
540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541	warn "5 $self->{parent}\n";#d#
542	}
543
544	$res
545	}	554	}
546		555
547	sub find_widget {	556	#sub find_widget {
548	my ($self, $x, $y) = @_;	557	# in .xs
549
550	return () unless $self->{can_events};
551
552	return $self
553	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
554	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
555
556	()
557	}
558		558
559	sub set_parent {	559	sub set_parent {
560	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
561		561
562	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
564	}	564	}
565		565
566	sub realloc {	566	sub realloc {
567	my ($self) = @_;	567	my ($self) = @_;
…		…
651	sub DESTROY {	651	sub DESTROY {
652	my ($self) = @_;	652	my ($self) = @_;
653		653
654	return if CFPlus::in_destruct;	654	return if CFPlus::in_destruct;
655		655
656	delete $WIDGET{$self+0};
657
658	eval { $self->destroy };	656	eval { $self->destroy };
659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		658
		659	delete $WIDGET{$self+0};
660	}	660	}
661		661
662	#############################################################################	662	#############################################################################
663		663
664	package CFPlus::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
…		…
740	can_events => 0,	740	can_events => 0,
741	%arg,	741	%arg,
742	);	742	);
743		743
744	$self->add (@$children)	744	$self->add (@$children)
745	if $children;	745	if $children && @$children;
746		746
747	$self	747	$self
748	}	748	}
749		749
750	sub realloc {	750	sub realloc {
…		…
759	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
760		760
761	$_->set_parent ($self)	761	$_->set_parent ($self)
762	for @widgets;	762	for @widgets;
763		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
764	use sort 'stable';	765	use sort 'stable';
765		766
766	$self->{children} = [	767	$self->{children} = [
767	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
768	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
769	];	770	];
770		771
771	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
772	}	775	}
773		776
774	sub children {	777	sub children {
775	@{ $_[0]{children} }	778	@{ $_[0]{children} }
776	}	779	}
…		…
787	}	790	}
788		791
789	sub clear {	792	sub clear {
790	my ($self) = @_;	793	my ($self) = @_;
791		794
792	my $children = delete $self->{children};	795	my $children = $self->{children};
793	$self->{children} = [];	796	$self->{children} = [];
794		797
795	for (@$children) {	798	for (@$children) {
796	delete $_->{parent};	799	delete $_->{parent};
797	$_->hide;	800	$_->hide;
…		…
937	}	940	}
938		941
939	#############################################################################	942	#############################################################################
940		943
941	package CFPlus::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
		945
		946	use List::Util qw(min max);
942		947
943	our @ISA = CFPlus::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
944		949
945	sub new {	950	sub new {
946	my $class = shift;	951	my $class = shift;
…		…
955	sub size_request {	960	sub size_request {
956	my ($self) = @_;	961	my ($self) = @_;
957		962
958	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
959		964
960	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
961	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
962		967
963	($w, $h)	968	($w, $h)
964	}	969	}
965		970
966	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
978	}	983	}
979		984
980	sub set_offset {	985	sub set_offset {
981	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
982		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
983	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
984	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
985		994
		995	$self->emit (changed => $x, $y);
986	$self->update;	996	$self->update;
		997	}
987	}	998	}
988		999
989	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
990	sub coord2local {	1001	sub coord2local {
991	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
1006	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
1007		1018
1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1010	) {	1021	) {
1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1012	} else {	1023	} else {
1013	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1014	}	1025	}
1015	}	1026	}
1016		1027
…		…
1027		1038
1028	#############################################################################	1039	#############################################################################
1029		1040
1030	package CFPlus::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
1031		1042
1032	our @ISA = CFPlus::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
1033		1044
1034	sub new {	1045	sub new {
1035	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1036		1047
1037	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1038		1049
1039	my $self;	1050	my $self;
1040		1051
1041	my $slider = new CFPlus::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
1042	vertical => 1,	1066	vertical => 1,
1043	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1044	on_changed => sub {	1068	on_changed => sub {
1045	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1046	},	1071	},
1047	;	1072	;
1048		1073
1049	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1050	vp => (new CFPlus::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1051	can_events => 1,	1077	can_events => 1,
1052	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
1053	%arg,	1082	%arg,
1054	);	1083	);
1055		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	on_size_allocate => sub {
		1100	my ($vp, $w, $h) = @_;
		1101	$vp->{parent}->update_slider;
		1102	0
		1103	},
		1104	;
		1105
1056	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
1057	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
1058		1109
1059	$self	1110	$self
1060	}	1111	}
1061
1062	#TODO# update range on size_allocate depending on child
1063		1112
1064	sub add {	1113	sub add {
1065	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1066		1115
1067	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1068	}	1117	}
1069		1118
		1119	sub update_slider {
		1120	my ($self) = @_;
		1121
		1122	my $child = ($self->{vp} or return)->child;
		1123
		1124	if ($self->{scroll_x}) {
		1125	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1126	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1127
		1128	my $visible = $w1 > $w2;
		1129	if ($visible != $self->{hslider_visible}) {
		1130	$self->{hslider_visible} = $visible;
		1131	$visible ? $self->SUPER::add ($self->{hslider})
		1132	: $self->SUPER::remove ($self->{hslider});
		1133	}
		1134	}
		1135
		1136	if ($self->{scroll_y}) {
		1137	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1138	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1139
		1140	my $visible = $h1 > $h2;
		1141	if ($visible != $self->{vslider_visible}) {
		1142	$self->{vslider_visible} = $visible;
		1143	$visible ? $self->SUPER::add ($self->{vslider})
		1144	: $self->SUPER::remove ($self->{vslider});
		1145	}
		1146	}
		1147	}
		1148
		1149	sub start_dragging {
		1150	my ($self, $ev) = @_;
		1151
		1152	$self->grab_focus;
		1153
		1154	my $ox = $self->{vp}{view_x};
		1155	my $oy = $self->{vp}{view_y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
		1159
		1160	$ox -= $ev->{xrel};
		1161	$oy -= $ev->{yrel};
		1162
		1163	$self->{vp}->set_offset ($ox, $oy);
		1164	};
		1165	}
		1166
1070	sub invoke_mouse_wheel {	1167	sub invoke_mouse_wheel {
1071	my ($self, $ev) = @_;	1168	my ($self, $ev) = @_;
1072		1169
1073	return 0 unless $ev->{dy}; # only vertical movements
1074
1075	$self->{slider}->emit (mouse_wheel => $ev);	1170	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1171	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1076		1172
1077	1	1173	1
1078	}	1174	}
1079		1175
1080	sub update_slider {	1176	sub invoke_button_down {
1081	my ($self) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1082		1178
1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1179	if ($ev->{button} == 2) {
1084	}	1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
1085		1183
1086	sub update {	1184	0
1087	my ($self) = @_;	1185	}
1088		1186
1089	$self->SUPER::update;	1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
1090		1189
1091	$self->update_slider;	1190	if (delete $self->{motion}) {
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
		1197	sub invoke_mouse_motion {
		1198	my ($self, $ev, $x, $y) = @_;
		1199
		1200	if ($self->{motion}) {
		1201	$self->{motion}->($ev, $x, $y);
		1202	return 1;
		1203	}
		1204
		1205	0
1092	}	1206	}
1093		1207
1094	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1095	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1096		1210
1097	$self->update_slider;	1211	$self->update_slider;
1098
1099	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1100	}	1213	}
1101		1214
1102	#############################################################################	1215	#############################################################################
1103		1216
…		…
1253		1366
1254	my @border =	1367	my @border =
1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257		1370
		1371	my @icon =
		1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1373	qw(x1_move.png x1_resize.png);
		1374
1258	sub new {	1375	sub new {
1259	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1260		1377
1261	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1262	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
…		…
1430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1431		1548
1432	my $border = $self->border;	1549	my $border = $self->border;
1433		1550
1434	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1435	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1436	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1437	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1438	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1555	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1556
		1557	# move
		1558	my $w2 = ($w - $border) * .5;
		1559	my $h2 = ($h - $border) * .5;
		1560	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1561	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1562	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1563
		1564	# resize
		1565	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1567	unless $self->{has_close_button};
		1568	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1569	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1439		1570
1440	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1441	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1442		1573
1443	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1464		1595
1465	#############################################################################	1596	#############################################################################
1466		1597
1467	package CFPlus::UI::Table;	1598	package CFPlus::UI::Table;
1468		1599
1469	our @ISA = CFPlus::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1470		1601
1471	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1472		1603
1473	use CFPlus::OpenGL;	1604	use CFPlus::OpenGL;
1474		1605
1475	sub new {	1606	sub new {
1476	my $class = shift;	1607	my $class = shift;
1477		1608
1478	$class->SUPER::new (	1609	$class->SUPER::new (
1479	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1480	@_,	1612	@_,
1481	)	1613	)
1482	}	1614	}
1483		1615
1484	sub children {
1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1486	}
1487
1488	sub add {	1616	sub add {
		1617	my ($self, @widgets) = @_;
		1618
		1619	for my $child (@widgets) {
		1620	$child->{rowspan} ||= 1;
		1621	$child->{colspan} ||= 1;
		1622	}
		1623
		1624	$self->SUPER::add (@widgets);
		1625	}
		1626
		1627	sub add_at {
1489	my ($self) = shift;	1628	my $self = shift;
		1629
		1630	my @widgets;
1490		1631
1491	while (@_) {	1632	while (@_) {
1492	my ($x, $y, $child) = splice @_, 0, 3, ();	1633	my ($col, $row, $child) = splice @_, 0, 3, ();
1493	$child->set_parent ($self);
1494	$self->{children}[$y][$x] = $child;
1495	}
1496		1634
1497	$self->{force_realloc} = 1;	1635	$child->{row} = $row;
1498	$self->{force_size_alloc} = 1;	1636	$child->{col} = $col;
1499	$self->realloc;
1500	}
1501		1637
1502	sub remove {	1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1503	my ($self, $child) = @_;	1645	my ($self) = @_;
1504		1646
1505	# TODO: not yet implemented	1647	my (@w, @h);
1506	}
1507
1508	# TODO: move to container class maybe? send children a signal on removal?
1509	sub clear {
1510	my ($self) = @_;
1511		1648
1512	my @children = $self->children;	1649	my @children = $self->children;
1513	delete $self->{children};	1650
		1651	# first pass, columns
		1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1654
		1655	my $sw = sum @w[$c .. $c + $cs - 1];
		1656
		1657	if ($w > $sw) {
		1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1659	}
1514		1660	}
1515	for (@children) {
1516	delete $_->{parent};
1517	$_->hide;
1518	}
1519		1661
1520	$self->realloc;	1662	# second pass, rows
1521	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1522
1523	sub get_wh {
1524	my ($self) = @_;
1525
1526	my (@w, @h);
1527
1528	for my $y (0 .. $#{$self->{children}}) {
1529	my $row = $self->{children}[$y]
1530	or next;
1531
1532	for my $x (0 .. $#$row) {
1533	my $widget = $row->[$x]
1534	or next;
1535	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1536		1665
1537	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1538	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1539	}	1670	}
1540	}	1671	}
1541		1672
1542	(\@w, \@h)	1673	(\@w, \@h)
1543	}	1674	}
…		…
1559	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1560		1691
1561	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1562	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1563		1694
1564	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1565	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1566	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1567	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1568		1699
1569	# linearly scale sizes
1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1572		1701
1573	CFPlus::UI::harmonize $ws;	1702	CFPlus::UI::harmonize $ws;
		1703
		1704	my @row_expand = @{$self->{row_expand}};
		1705	@row_expand = (1) x @$ws unless @row_expand;
		1706	my $row_expand = (sum @row_expand) || 1;
		1707
		1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1709
1574	CFPlus::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1575		1711
1576	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1577		1714
1578	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1579	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1580	or next;
1581		1717
1582	my $x = 0;	1718	$widget->configure (
1583	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1584		1721	);
1585	for my $c (0 .. $#$row) {	1722	}
1586	my $col_w = $ws->[$c];
1587		1723
1588	if (my $widget = $row->[$c]) {	1724	1
1589	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1590	}
1591		1726
1592	$x += $col_w;	1727	#############################################################################
		1728
		1729	package CFPlus::UI::Fixed;
		1730
		1731	use List::Util qw(min max);
		1732
		1733	our @ISA = CFPlus::UI::Container::;
		1734
		1735	sub add_fixed {
		1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1737
		1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1739	$self->SUPER::add ($child);
		1740	}
		1741
		1742	sub _scale($$$) {
		1743	my ($mode, $val, $max) = @_;
		1744
		1745	$mode eq "abs" ? $val
		1746	: $mode eq "rel" ? $val * $max
		1747	: 0
		1748	}
		1749
		1750	sub size_request {
		1751	my ($self) = @_;
		1752
		1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1754
		1755	# determine overall size by querying abs widgets
		1756	for my $child ($self->visible_children) {
		1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1758
		1759	if ($pos eq "abs") {
		1760	$w = _scale $size, $w, $child->{req_w};
		1761	$h = _scale $size, $h, $child->{req_h};
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1593	}	1765	}
		1766	}
1594		1767
1595	$y += $row_h;	1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	# now layout remaining widgets
		1772	for my $child ($self->visible_children) {
		1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1774
		1775	if ($pos ne "abs") {
		1776	$x = _scale $pos, $x, $W;
		1777	$y = _scale $pos, $x, $H;
		1778	$w = _scale $size, $w, $child->{req_w};
		1779	$h = _scale $size, $h, $child->{req_h};
		1780
		1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1783	}
		1784	}
		1785
		1786	my $W = $x2 - $x1;
		1787	my $H = $y2 - $y1;
		1788
		1789	($W, $H)
		1790	}
		1791
		1792	sub invoke_size_allocate {
		1793	my ($self, $W, $H) = @_;
		1794
		1795	for my $child ($self->visible_children) {
		1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1797
		1798	$x = _scale $pos, $x, $W;
		1799	$y = _scale $pos, $x, $H;
		1800	$w = _scale $size, $w, $W;
		1801	$h = _scale $size, $h, $H;
		1802
		1803	$child->configure ($x, $y, $w, $h);
1596	}	1804	}
1597		1805
1598	1	1806	1
1599	}
1600
1601	sub find_widget {
1602	my ($self, $x, $y) = @_;
1603
1604	$x -= $self->{x};
1605	$y -= $self->{y};
1606
1607	my $res;
1608
1609	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1610	$res = $_->find_widget ($x, $y)
1611	and return $res;
1612	}
1613
1614	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1615	}
1616
1617	sub _draw {
1618	my ($self) = @_;
1619
1620	for (grep $_, @{$self->{children}}) {
1621	$_->draw for grep $_, @$_;
1622	}
1623	}	1807	}
1624		1808
1625	#############################################################################	1809	#############################################################################
1626		1810
1627	package CFPlus::UI::Box;	1811	package CFPlus::UI::Box;
…		…
1913	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1914	can_hover => 1,	2098	can_hover => 1,
1915	can_focus => 1,	2099	can_focus => 1,
1916	valign => 0,	2100	valign => 0,
1917	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1918	#text => ...	2103	#text => ...
1919	#hidden => "*",	2104	#hidden => "*",
1920	@_	2105	@_
1921	)	2106	)
1922	}	2107	}
…		…
1966	my $mod = $ev->{mod};	2151	my $mod = $ev->{mod};
1967	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1969		2154
1970	my $text = $self->get_text;	2155	my $text = $self->get_text;
		2156
		2157	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1971		2158
1972	if ($uni == 8) {	2159	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
1981	$self->{cursor} = 0;	2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
1982	} elsif ($sym == CFPlus::SDLK_END) {	2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983	$self->{cursor} = length $text;	2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
1984	} elsif ($uni == 21) { # ctrl-u	2179	} elsif ($uni == 21) { # ctrl-u
1985	$text = "";	2180	$text = "";
1986	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1987	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1988	$self->emit ('escape');	2183	$self->emit ('escape');
1989	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1990	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1991	} else {	2188	} else {
1992	return 0;	2189	return 0;
1993	}	2190	}
1994		2191
1995	$self->_set_text ($text);	2192	$self->_set_text ($text);
1996		2193
1997	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1998		2196
1999	1	2197	1
2000	}	2198	}
2001		2199
2002	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072	glEnd;	2270	glEnd;
2073	}	2271	}
2074	}	2272	}
2075		2273
		2274	#############################################################################
		2275
2076	package CFPlus::UI::Entry;	2276	package CFPlus::UI::Entry;
2077		2277
2078	our @ISA = CFPlus::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
2079		2279
2080	use CFPlus::OpenGL;	2280	use CFPlus::OpenGL;
…		…
2082	sub invoke_key_down {	2282	sub invoke_key_down {
2083	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
2084		2284
2085	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
2086		2286
2087	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
2088	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
2089	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
2090		2290
2091	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
2092	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
…		…
2122	1	2322	1
2123	}	2323	}
2124		2324
2125	#############################################################################	2325	#############################################################################
2126		2326
		2327	package CFPlus::UI::TextEdit;
		2328
		2329	our @ISA = CFPlus::UI::EntryBase::;
		2330
		2331	use CFPlus::OpenGL;
		2332
		2333	sub move_cursor_ver {
		2334	my ($self, $dy) = @_;
		2335
		2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2337
		2338	$y += $dy;
		2339
		2340	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2341	$self->{cursor} = $index;
		2342	delete $self->{cur_h};
		2343	$self->update;
		2344	return;
		2345	}
		2346	}
		2347
		2348	sub invoke_key_down {
		2349	my ($self, $ev) = @_;
		2350
		2351	my $sym = $ev->{sym};
		2352
		2353	if ($sym == CFPlus::SDLK_UP) {
		2354	$self->move_cursor_ver (-1);
		2355	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2356	$self->move_cursor_ver (+1);
		2357	} else {
		2358	return $self->SUPER::invoke_key_down ($ev)
		2359	}
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
2127	package CFPlus::UI::Button;	2366	package CFPlus::UI::Button;
2128		2367
2129	our @ISA = CFPlus::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
2130		2369
2131	use CFPlus::OpenGL;	2370	use CFPlus::OpenGL;
2132		2371
2133	my @tex =	2372	my @tex =
2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2135	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
2136		2375
2137	sub new {	2376	sub new {
2138	my $class = shift;	2377	my $class = shift;
2139		2378
2140	$class->SUPER::new (	2379	$class->SUPER::new (
2141	padding_x => 4,	2380	padding_x => 4,
2142	padding_y => 4,	2381	padding_y => 4,
2143	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
2144	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
2145	can_hover => 1,	2384	can_hover => 1,
2146	align => 0,	2385	align => 0,
2147	valign => 0,	2386	valign => 0,
2148	can_events => 1,	2387	can_events => 1,
2149	@_	2388	@_
…		…
2167		2406
2168	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2171		2410
		2411	my $tex = $tex[$GRAB == $self];
2172	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2173		2413
2174	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2175		2415
2176	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2177	}	2417	}
…		…
2273	or Carp::croak "'path' or 'tex' attributes required";	2513	or Carp::croak "'path' or 'tex' attributes required";
2274		2514
2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277		2517
2278	Scalar::Util::weaken $texture_cache{$self->{path}};	2518	CFPlus::weaken $texture_cache{$self->{path}};
2279		2519
2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281		2521
2282	$self	2522	$self
2283	}	2523	}
…		…
2656	sub invoke_mouse_wheel {	2896	sub invoke_mouse_wheel {
2657	my ($self, $ev) = @_;	2897	my ($self, $ev) = @_;
2658		2898
2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662		2904
2663	! ! $delta	2905	! ! $delta
2664	}	2906	}
2665		2907
2666	sub update {	2908	sub update {
…		…
2776	#font => default_font	3018	#font => default_font
2777	@_,	3019	@_,
2778		3020
2779	layout => (new CFPlus::Layout),	3021	layout => (new CFPlus::Layout),
2780	par => [],	3022	par => [],
		3023	max_par => 0,
2781	height => 0,	3024	height => 0,
2782	children => [	3025	children => [
2783	(new CFPlus::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2784	(new CFPlus::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2785	],	3028	],
…		…
2908	wrapped => 1,	3151	wrapped => 1,
2909	};	3152	};
2910		3153
2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
		3156	}
		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
2913	}	3160	}
2914		3161
2915	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2916	$self->update;	3163	$self->update;
2917	}	3164	}
…		…
3225		3472
3226	sub new {	3473	sub new {
3227	my $class = shift;	3474	my $class = shift;
3228		3475
3229	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
3230	aspect => 1,	3479	aspect => 1,
3231	can_events => 0,	3480	can_events => 0,
3232	@_,	3481	@_,
3233	);	3482	);
3234		3483
3235	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
3236	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
3237		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3238	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3239	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240	hard => 1,	3490	parked => 1,
3241	interval => $self->{animspeed},
3242	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
3243	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3244	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3245	},	3499	},
3246	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3247	}	3504	}
3248		3505
3249	$self	3506	$self
3250	}	3507	}
3251		3508
		3509	sub update_timer {
		3510	my ($self) = @_;
		3511
		3512	return unless $self->{timer};
		3513
		3514	if ($self->{visible}) {
		3515	$self->{timer}->at (
		3516	$self->{anim_start}
		3517	+ $self->{animspeed}
		3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3519	);
		3520	$self->{timer}->start;
		3521	} else {
		3522	$self->{timer}->stop;
		3523	}
		3524	}
		3525
		3526	sub update_face {
		3527	my ($self) = @_;
		3528
		3529	return unless $::CONN;
		3530
		3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3532	if ($anim && @$anim) {
		3533	delete $self->{wait_face};
		3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3535	}
		3536	}
		3537	}
		3538
3252	sub size_request {	3539	sub size_request {
3253	(32, 8)	3540	my ($self) = @_;
		3541
		3542	if ($::CONN) {
		3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3544	if (my $tex = $::CONN->{texture}[$faceid]) {
		3545	$self->{tex} = $tex;
		3546	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3547	} else {
		3548	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3549	$self->realloc;
		3550	});
		3551	}
		3552	}
		3553	}
		3554
		3555	($self->{size_w} || 8, $self->{size_h} || 8)
3254	}	3556	}
3255		3557
3256	sub update {	3558	sub update {
3257	my ($self) = @_;	3559	my ($self) = @_;
3258		3560
3259	return unless $self->{visible};	3561	return unless $self->{visible};
3260		3562
3261	$self->SUPER::update;	3563	$self->SUPER::update;
3262	}	3564	}
3263		3565
		3566	sub invoke_visibility_change {
		3567	my ($self) = @_;
		3568
		3569	$self->update_timer;
		3570
		3571	0
		3572	}
		3573
3264	sub _draw {	3574	sub _draw {
3265	my ($self) = @_;	3575	my ($self) = @_;
3266		3576
3267	return unless $::CONN;
3268
3269	$self->SUPER::_draw;	3577	$self->SUPER::_draw;
3270		3578
3271	my $face;	3579	if (my $tex = $self->{tex}) {
3272
3273	if ($self->{frame}) {
3274	my $anim = $::CONN->{anim}[$self->{anim}];
3275
3276	$face = $anim->[ $self->{frame} % @$anim ]
3277	if $anim && @$anim;
3278	}
3279
3280	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3281
3282	if ($tex) {
3283	glEnable GL_TEXTURE_2D;	3580	glEnable GL_TEXTURE_2D;
3284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3581	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3285	glColor 0, 0, 0, 1;	3582	glColor 0, 0, 0, 1;
3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3583	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3287	glDisable GL_TEXTURE_2D;	3584	glDisable GL_TEXTURE_2D;
…		…
3289	}	3586	}
3290		3587
3291	sub destroy {	3588	sub destroy {
3292	my ($self) = @_;	3589	my ($self) = @_;
3293		3590
3294	$self->{timer}->cancel	3591	(delete $self->{timer})->cancel
3295	if $self->{timer};	3592	if $self->{timer};
3296		3593
3297	$self->SUPER::destroy;	3594	$self->SUPER::destroy;
3298	}	3595	}
3299		3596
…		…
3495	}	3792	}
3496		3793
3497	sub add {	3794	sub add {
3498	my ($self, $title, $widget, $tooltip) = @_;	3795	my ($self, $title, $widget, $tooltip) = @_;
3499		3796
3500	Scalar::Util::weaken $self;	3797	CFPlus::weaken $self;
3501		3798
3502	$self->{buttonbar}->add (new CFPlus::UI::Button	3799	$self->{buttonbar}->add (new CFPlus::UI::Button
3503	markup => $title,	3800	markup => $title,
3504	tooltip => $tooltip,	3801	tooltip => $tooltip,
3505	on_activate => sub { $self->set_current_page ($widget) },	3802	on_activate => sub { $self->set_current_page ($widget) },
…		…
3589	my $self = $class->SUPER::new (	3886	my $self = $class->SUPER::new (
3590	fontsize => 0.8,	3887	fontsize => 0.8,
3591	@_,	3888	@_,
3592	);	3889	);
3593		3890
3594	Scalar::Util::weaken (my $this = $self);	3891	CFPlus::weaken (my $this = $self);
3595		3892
3596	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3893	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597		3894
3598	$self	3895	$self
3599	}	3896	}
…		…
3722	$self->SUPER::destroy;	4019	$self->SUPER::destroy;
3723	}	4020	}
3724		4021
3725	#############################################################################	4022	#############################################################################
3726		4023
3727	package CFPlus::UI::Inventory;
3728
3729	our @ISA = CFPlus::UI::Table::;
3730
3731	sub new {
3732	my $class = shift;
3733
3734	my $self = $class->SUPER::new (
3735	col_expand => [0, 1, 0],
3736	items => [],
3737	@_,
3738	);
3739
3740	$self->set_sort_order (undef);
3741
3742	$self
3743	}
3744
3745	sub update_items {
3746	my ($self) = @_;
3747
3748	$self->clear;
3749
3750	my @item = $self->{sort}->(@{ $self->{items} });
3751
3752	my @adds;
3753	my $row = 0;
3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
3755	CFPlus::Item::update_widgets $item;
3756
3757	push @adds, 0, $row, $item->{face_widget};
3758	push @adds, 1, $row, $item->{desc_widget};
3759	push @adds, 2, $row, $item->{weight_widget};
3760
3761	$row++;
3762	}
3763
3764	$self->add (@adds);
3765	}
3766
3767	sub set_sort_order {
3768	my ($self, $order) = @_;
3769
3770	$self->{sort} = $order ||= sub {
3771	sort {
3772	$a->{type} <=> $b->{type}
3773	or $a->{name} cmp $b->{name}
3774	} @_
3775	};
3776
3777	$self->update_items;
3778	}
3779
3780	sub set_items {
3781	my ($self, $items) = @_;
3782
3783	$self->{items} = [$items ? values %$items : ()];
3784	$self->update_items;
3785	}
3786
3787	#############################################################################
3788
3789	package CFPlus::UI::SpellList;
3790
3791	our @ISA = CFPlus::UI::Table::;
3792
3793	sub new {
3794	my $class = shift;
3795
3796	my $self = $class->SUPER::new (
3797	binding => [],
3798	commands => [],
3799	@_,
3800	)
3801	}
3802
3803	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816	sub rebuild_spell_list {
3817	my ($self) = @_;
3818
3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3820	$self->clear;
3821
3822	return unless $::CONN;
3823
3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830	my $row = 0;
3831
3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833	my $spell = $self->{spell}{$_};
3834
3835	$row++;
3836
3837	my $spell_cb = sub {
3838	my ($widget, $ev) = @_;
3839
3840	if ($ev->{button} == 1) {
3841	$::CONN->user_send ("cast $spell->{name}");
3842	} elsif ($ev->{button} == 2) {
3843	$::CONN->user_send ("invoke $spell->{name}");
3844	} elsif ($ev->{button} == 3) {
3845	(new CFPlus::UI::Menu
3846	items => [
3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849	],
3850	)->popup ($ev);
3851	} else {
3852	return 0;
3853	}
3854
3855	1
3856	};
3857
3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860	#TODO: add path info to tooltip
3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863	$self->add (0, $row, new CFPlus::UI::Face
3864	face => $spell->{face},
3865	can_hover => 1,
3866	can_events => 1,
3867	tooltip => $tooltip,
3868	on_button_down => $spell_cb,
3869	);
3870
3871	$self->add (1, $row, new CFPlus::UI::Label
3872	expand => 1,
3873	text => $spell->{name},
3874	can_hover => 1,
3875	can_events => 1,
3876	tooltip => $tooltip,
3877	on_button_down => $spell_cb,
3878	);
3879
3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884	}
3885	});
3886	}
3887
3888	sub add_spell {
3889	my ($self, $spell) = @_;
3890
3891	$self->{spell}->{$spell->{name}} = $spell;
3892	$self->rebuild_spell_list;
3893	}
3894
3895	sub remove_spell {
3896	my ($self, $spell) = @_;
3897
3898	delete $self->{spell}->{$spell->{name}};
3899	$self->rebuild_spell_list;
3900	}
3901
3902	sub clear_spells {
3903	my ($self) = @_;
3904
3905	$self->{spell} = {};
3906	$self->rebuild_spell_list;
3907	}
3908
3909	#############################################################################
3910
3911	package CFPlus::UI::Root;	4024	package CFPlus::UI::Root;
3912		4025
3913	our @ISA = CFPlus::UI::Container::;	4026	our @ISA = CFPlus::UI::Container::;
3914		4027
3915	use List::Util qw(min max);	4028	use List::Util qw(min max);
…		…
3922	my $self = $class->SUPER::new (	4035	my $self = $class->SUPER::new (
3923	visible => 1,	4036	visible => 1,
3924	@_,	4037	@_,
3925	);	4038	);
3926		4039
3927	Scalar::Util::weaken ($self->{root} = $self);	4040	CFPlus::weaken ($self->{root} = $self);
3928		4041
3929	$self	4042	$self
3930	}	4043	}
3931		4044
3932	sub size_request {	4045	sub size_request {
…		…
4027	while ($self->{refresh_hook}) {	4140	while ($self->{refresh_hook}) {
4028	$_->()	4141	$_->()
4029	for values %{delete $self->{refresh_hook}};	4142	for values %{delete $self->{refresh_hook}};
4030	}	4143	}
4031		4144
4032	if ($self->{realloc}) {	4145	while ($self->{realloc}) {
4033	my %queue;	4146	my %queue;
4034	my @queue;	4147	my @queue;
4035	my $widget;	4148	my $widget;
4036		4149
4037	outer:	4150	outer:
…		…
4084	}	4197	}
4085	}	4198	}
4086		4199
4087	delete $self->{realloc}{$widget+0};	4200	delete $self->{realloc}{$widget+0};
4088	}	4201	}
4089	}
4090		4202
4091	while (my $size_alloc = delete $self->{size_alloc}) {	4203	while (my $size_alloc = delete $self->{size_alloc}) {
4092	my @queue = sort { $b->{visible} <=> $a->{visible} }	4204	my @queue = sort { $a->{visible} <=> $b->{visible} }
4093	values %$size_alloc;	4205	values %$size_alloc;
4094		4206
4095	while () {	4207	while () {
4096	my $widget = pop @queue || last;	4208	my $widget = pop @queue || last;
4097		4209
4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4210	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4099		4211
4100	$w = 0 if $w < 0;
4101	$h = 0 if $h < 0;
4102
4103	$w = max $widget->{min_w}, $w;	4212	$w = max $widget->{min_w}, $w;
4104	$h = max $widget->{min_h}, $h;	4213	$h = max $widget->{min_h}, $h;
4105		4214
4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4215	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4216	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108		4217
4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4218	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4219	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111		4220
4112	$w = int $w + 0.5;	4221	$w = int $w + 0.5;
4113	$h = int $h + 0.5;	4222	$h = int $h + 0.5;
4114		4223
4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4224	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4116	$widget->{old_w} = $widget->{w};	4225	$widget->{old_w} = $widget->{w};
4117	$widget->{old_h} = $widget->{h};	4226	$widget->{old_h} = $widget->{h};
4118		4227
4119	$widget->{w} = $w;	4228	$widget->{w} = $w;
4120	$widget->{h} = $h;	4229	$widget->{h} = $h;
4121		4230
4122	$widget->emit (size_allocate => $w, $h);	4231	$widget->emit (size_allocate => $w, $h);
		4232	}
4123	}	4233	}
4124	}	4234	}
4125	}	4235	}
4126		4236
4127	while ($self->{post_alloc_hook}) {	4237	while ($self->{post_alloc_hook}) {
4128	$_->()	4238	$_->()
4129	for values %{delete $self->{post_alloc_hook}};	4239	for values %{delete $self->{post_alloc_hook}};
4130	}	4240	}
4131
4132		4241
4133	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4242	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4134	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4243	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4135	glClear GL_COLOR_BUFFER_BIT;	4244	glClear GL_COLOR_BUFFER_BIT;
4136		4245

Diff Legend

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