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.346 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 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,
…		…
514	);	531	);
515		532
516	sub emit {	533	sub emit {
517	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
518		535
519	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
520	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
521	my @append	538	my @append
522	= $has_coords{$signal}	539	= $has_coords{$signal}
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	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
532	}	554	}
533		555
534	sub find_widget {	556	#sub find_widget {
535	my ($self, $x, $y) = @_;	557	# in .xs
536
537	return () unless $self->{can_events};
538
539	return $self
540	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
541	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
542
543	()
544	}
545		558
546	sub set_parent {	559	sub set_parent {
547	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
548		561
549	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
550	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
551	}	564	}
552		565
553	sub realloc {	566	sub realloc {
554	my ($self) = @_;	567	my ($self) = @_;
…		…
638	sub DESTROY {	651	sub DESTROY {
639	my ($self) = @_;	652	my ($self) = @_;
640		653
641	return if CFPlus::in_destruct;	654	return if CFPlus::in_destruct;
642		655
643	delete $WIDGET{$self+0};
644
645	eval { $self->destroy };	656	eval { $self->destroy };
646	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};
647	}	660	}
648		661
649	#############################################################################	662	#############################################################################
650		663
651	package CFPlus::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
…		…
727	can_events => 0,	740	can_events => 0,
728	%arg,	741	%arg,
729	);	742	);
730		743
731	$self->add (@$children)	744	$self->add (@$children)
732	if $children;	745	if $children && @$children;
733		746
734	$self	747	$self
735	}	748	}
736		749
737	sub realloc {	750	sub realloc {
…		…
746	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
747		760
748	$_->set_parent ($self)	761	$_->set_parent ($self)
749	for @widgets;	762	for @widgets;
750		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	765	use sort 'stable';
752		766
753	$self->{children} = [	767	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
756	];	770	];
757		771
758	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
759	}	775	}
760		776
761	sub children {	777	sub children {
762	@{ $_[0]{children} }	778	@{ $_[0]{children} }
763	}	779	}
…		…
774	}	790	}
775		791
776	sub clear {	792	sub clear {
777	my ($self) = @_;	793	my ($self) = @_;
778		794
779	my $children = delete $self->{children};	795	my $children = $self->{children};
780	$self->{children} = [];	796	$self->{children} = [];
781		797
782	for (@$children) {	798	for (@$children) {
783	delete $_->{parent};	799	delete $_->{parent};
784	$_->hide;	800	$_->hide;
…		…
898	glClear GL_COLOR_BUFFER_BIT;	914	glClear GL_COLOR_BUFFER_BIT;
899		915
900	{	916	{
901	package CFPlus::UI::Base;	917	package CFPlus::UI::Base;
902		918
903	($draw_x, $draw_y, $draw_w, $draw_h) =	919	local ($draw_x, $draw_y, $draw_w, $draw_h) =
904	(0, 0, $self->{w}, $self->{h});	920	(0, 0, $self->{w}, $self->{h});
		921
		922	$self->_render;
905	}	923	}
906
907	$self->_render;
908	};	924	};
909	}	925	}
910		926
911	sub _draw {	927	sub _draw {
912	my ($self) = @_;	928	my ($self) = @_;
…		…
924	}	940	}
925		941
926	#############################################################################	942	#############################################################################
927		943
928	package CFPlus::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
		945
		946	use List::Util qw(min max);
929		947
930	our @ISA = CFPlus::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
931		949
932	sub new {	950	sub new {
933	my $class = shift;	951	my $class = shift;
…		…
942	sub size_request {	960	sub size_request {
943	my ($self) = @_;	961	my ($self) = @_;
944		962
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		964
947	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
949		967
950	($w, $h)	968	($w, $h)
951	}	969	}
952		970
953	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
965	}	983	}
966		984
967	sub set_offset {	985	sub set_offset {
968	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
969		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}) {
970	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
972		994
		995	$self->emit (changed => $x, $y);
973	$self->update;	996	$self->update;
		997	}
974	}	998	}
975		999
976	# 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
977	sub coord2local {	1001	sub coord2local {
978	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
994		1018
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	1021	) {
998	$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})
999	} else {	1023	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	1025	}
1002	}	1026	}
1003		1027
…		…
1014		1038
1015	#############################################################################	1039	#############################################################################
1016		1040
1017	package CFPlus::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
1018		1042
1019	our @ISA = CFPlus::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
1020		1044
1021	sub new {	1045	sub new {
1022	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1023		1047
1024	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1025		1049
1026	my $self;	1050	my $self;
1027		1051
1028	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,
1029	vertical => 1,	1066	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1068	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1071	},
1034	;	1072	;
1035		1073
1036	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1038	can_events => 1,	1077	can_events => 1,
1039	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
1040	%arg,	1082	%arg,
1041	);	1083	);
1042		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
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1106	$self->SUPER::add ($self->{vp});
		1107
1044	$self->add ($child) if $child;	1108	$self->add ($child) if $child;
1045		1109
1046	$self	1110	$self
1047	}	1111	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1112
1051	sub add {	1113	sub add {
1052	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1053		1115
1054	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1055	}	1117	}
1056		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
1057	sub invoke_mouse_wheel {	1167	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1168	my ($self, $ev) = @_;
1059		1169
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$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};
1063		1172
1064	1	1173	1
1065	}	1174	}
1066		1175
1067	sub update_slider {	1176	sub invoke_button_down {
1068	my ($self) = @_;	1177	my ($self, $ev, $x, $y) = @_;
1069		1178
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1179	if ($ev->{button} == 2) {
1071	}	1180	$self->start_dragging ($ev);
		1181	return 1;
		1182	}
1072		1183
1073	sub update {	1184	0
1074	my ($self) = @_;	1185	}
1075		1186
1076	$self->SUPER::update;	1187	sub invoke_button_up {
		1188	my ($self, $ev, $x, $y) = @_;
1077		1189
1078	$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
1079	}	1206	}
1080		1207
1081	sub invoke_size_allocate {	1208	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1209	my ($self, $w, $h) = @_;
1083		1210
1084	$self->update_slider;	1211	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1212	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1213	}
1088		1214
1089	#############################################################################	1215	#############################################################################
1090		1216
…		…
1138	my ($class, %arg) = @_;	1264	my ($class, %arg) = @_;
1139		1265
1140	if ((exists $arg{label}) && !ref $arg{label}) {	1266	if ((exists $arg{label}) && !ref $arg{label}) {
1141	$arg{label} = new CFPlus::UI::Label	1267	$arg{label} = new CFPlus::UI::Label
1142	align => 1,	1268	align => 1,
1143	valign => 1,	1269	valign => 0,
1144	text => $arg{label},	1270	text => $arg{label},
1145	fontsize => ($arg{border} || 0.8) * 0.75;	1271	fontsize => ($arg{border} || 0.8) * 0.75;
1146	}	1272	}
1147		1273
1148	my $self = $class->SUPER::new (	1274	my $self = $class->SUPER::new (
…		…
1240		1366
1241	my @border =	1367	my @border =
1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1243	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);
1244		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
1245	sub new {	1375	sub new {
1246	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1247		1377
1248	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1249	bg => [1, 1, 1, 1],	1379	bg => [1, 1, 1, 1],
…		…
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418		1548
1419	my $border = $self->border;	1549	my $border = $self->border;
1420		1550
1421	glColor @{ $self->{border_bg} };	1551	glColor @{ $self->{border_bg} };
1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1552	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1553	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1554	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425	$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);
1426		1570
1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1571	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428	glColor @{ $self->{bg} };	1572	glColor @{ $self->{bg} };
1429		1573
1430	# TODO: repeat texture not scale	1574	# TODO: repeat texture not scale
…		…
1451		1595
1452	#############################################################################	1596	#############################################################################
1453		1597
1454	package CFPlus::UI::Table;	1598	package CFPlus::UI::Table;
1455		1599
1456	our @ISA = CFPlus::UI::Base::;	1600	our @ISA = CFPlus::UI::Container::;
1457		1601
1458	use List::Util qw(max sum);	1602	use List::Util qw(max sum);
1459		1603
1460	use CFPlus::OpenGL;	1604	use CFPlus::OpenGL;
1461		1605
1462	sub new {	1606	sub new {
1463	my $class = shift;	1607	my $class = shift;
1464		1608
1465	$class->SUPER::new (	1609	$class->SUPER::new (
1466	col_expand => [],	1610	col_expand => [],
		1611	row_expand => [],
1467	@_,	1612	@_,
1468	)	1613	)
1469	}	1614	}
1470		1615
1471	sub children {
1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473	}
1474
1475	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 {
1476	my ($self) = shift;	1628	my $self = shift;
		1629
		1630	my @widgets;
1477		1631
1478	while (@_) {	1632	while (@_) {
1479	my ($x, $y, $child) = splice @_, 0, 3, ();	1633	my ($col, $row, $child) = splice @_, 0, 3, ();
1480	$child->set_parent ($self);
1481	$self->{children}[$y][$x] = $child;
1482	}
1483		1634
1484	$self->{force_realloc} = 1;	1635	$child->{row} = $row;
1485	$self->{force_size_alloc} = 1;	1636	$child->{col} = $col;
1486	$self->realloc;
1487	}
1488		1637
1489	sub remove {	1638	push @widgets, $child;
		1639	}
		1640
		1641	$self->add (@widgets);
		1642	}
		1643
		1644	sub get_wh {
1490	my ($self, $child) = @_;	1645	my ($self) = @_;
1491		1646
1492	# TODO: not yet implemented	1647	my (@w, @h);
1493	}
1494
1495	# TODO: move to container class maybe? send children a signal on removal?
1496	sub clear {
1497	my ($self) = @_;
1498		1648
1499	my @children = $self->children;	1649	my @children = $self->children;
1500	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	}
1501		1660	}
1502	for (@children) {
1503	delete $_->{parent};
1504	$_->hide;
1505	}
1506		1661
1507	$self->realloc;	1662	# second pass, rows
1508	}	1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1509
1510	sub get_wh {
1511	my ($self) = @_;
1512
1513	my (@w, @h);
1514
1515	for my $y (0 .. $#{$self->{children}}) {
1516	my $row = $self->{children}[$y]
1517	or next;
1518
1519	for my $x (0 .. $#$row) {
1520	my $widget = $row->[$x]
1521	or next;
1522	my ($w, $h) = @$widget{qw(req_w req_h)};	1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523		1665
1524	$w[$x] = max $w[$x], $w;	1666	my $sh = sum @h[$r .. $r + $rs - 1];
1525	$h[$y] = max $h[$y], $h;	1667
		1668	if ($h > $sh) {
		1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526	}	1670	}
1527	}	1671	}
1528		1672
1529	(\@w, \@h)	1673	(\@w, \@h)
1530	}	1674	}
…		…
1546	my ($ws, $hs) = $self->get_wh;	1690	my ($ws, $hs) = $self->get_wh;
1547		1691
1548	my $req_w = (sum @$ws) || 1;	1692	my $req_w = (sum @$ws) || 1;
1549	my $req_h = (sum @$hs) || 1;	1693	my $req_h = (sum @$hs) || 1;
1550		1694
1551	# TODO: nicer code && do row_expand	1695	# now linearly scale the rows/columns to the allocated size
1552	my @col_expand = @{$self->{col_expand}};	1696	my @col_expand = @{$self->{col_expand}};
1553	@col_expand = (1) x @$ws unless @col_expand;	1697	@col_expand = (1) x @$ws unless @col_expand;
1554	my $col_expand = (sum @col_expand) || 1;	1698	my $col_expand = (sum @col_expand) || 1;
1555		1699
1556	# linearly scale sizes
1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559		1701
1560	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
1561	CFPlus::UI::harmonize $hs;	1710	CFPlus::UI::harmonize $hs;
1562		1711
1563	my $y;	1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564		1714
1565	for my $r (0 .. $#{$self->{children}}) {	1715	for my $widget ($self->children) {
1566	my $row = $self->{children}[$r]	1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567	or next;
1568		1717
1569	my $x = 0;	1718	$widget->configure (
1570	my $row_h = $hs->[$r];	1719	$x[$c], $y[$r],
		1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571		1721	);
1572	for my $c (0 .. $#$row) {	1722	}
1573	my $col_w = $ws->[$c];
1574		1723
1575	if (my $widget = $row->[$c]) {	1724	1
1576	$widget->configure ($x, $y, $col_w, $row_h);	1725	}
1577	}
1578		1726
1579	$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;
1580	}	1765	}
		1766	}
1581		1767
1582	$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);
1583	}	1804	}
1584		1805
1585	1	1806	1
1586	}
1587
1588	sub find_widget {
1589	my ($self, $x, $y) = @_;
1590
1591	$x -= $self->{x};
1592	$y -= $self->{y};
1593
1594	my $res;
1595
1596	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1597	$res = $_->find_widget ($x, $y)
1598	and return $res;
1599	}
1600
1601	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1602	}
1603
1604	sub _draw {
1605	my ($self) = @_;
1606
1607	for (grep $_, @{$self->{children}}) {
1608	$_->draw for grep $_, @$_;
1609	}
1610	}	1807	}
1611		1808
1612	#############################################################################	1809	#############################################################################
1613		1810
1614	package CFPlus::UI::Box;	1811	package CFPlus::UI::Box;
…		…
1900	active_fg => [0, 0, 0],	2097	active_fg => [0, 0, 0],
1901	can_hover => 1,	2098	can_hover => 1,
1902	can_focus => 1,	2099	can_focus => 1,
1903	valign => 0,	2100	valign => 0,
1904	can_events => 1,	2101	can_events => 1,
		2102	ellipsise => 0,
1905	#text => ...	2103	#text => ...
1906	#hidden => "*",	2104	#hidden => "*",
1907	@_	2105	@_
1908	)	2106	)
1909	}	2107	}
…		…
1953	my $mod = $ev->{mod};	2151	my $mod = $ev->{mod};
1954	my $sym = $ev->{sym};	2152	my $sym = $ev->{sym};
1955	my $uni = $ev->{unicode};	2153	my $uni = $ev->{unicode};
1956		2154
1957	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;
1958		2158
1959	if ($uni == 8) {	2159	if ($uni == 8) {
1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961	} elsif ($uni == 127) {	2161	} elsif ($uni == 127) {
1962	substr $text, $self->{cursor}, 1, "";	2162	substr $text, $self->{cursor}, 1, "";
1963	} elsif ($sym == CFPlus::SDLK_LEFT) {	2163	} elsif ($sym == CFPlus::SDLK_LEFT) {
1964	--$self->{cursor} if $self->{cursor};	2164	--$self->{cursor} if $self->{cursor};
1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1966	++$self->{cursor} if $self->{cursor} < length $self->{text};	2166	++$self->{cursor} if $self->{cursor} < length $self->{text};
1967	} elsif ($sym == CFPlus::SDLK_HOME) {	2167	} elsif ($sym == CFPlus::SDLK_HOME) {
		2168	# what a hack
		2169	$self->{cursor} =
		2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2171	? length $1
		2172	: 0;
		2173	} elsif ($sym == CFPlus::SDLK_END) {
		2174	# uh, again
		2175	$self->{cursor} =
		2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2177	? $self->{cursor} + length $1
		2178	: length $self->{text};
		2179	} elsif ($uni == 21) { # ctrl-u
		2180	$text = "";
1968	$self->{cursor} = 0;	2181	$self->{cursor} = 0;
1969	} elsif ($sym == CFPlus::SDLK_END) {
1970	$self->{cursor} = length $text;
1971	} elsif ($uni == 27) {	2182	} elsif ($uni == 27) {
1972	$self->emit ('escape');	2183	$self->emit ('escape');
1973	} elsif ($uni) {	2184	} elsif ($uni == 0x0d) {
		2185	substr $text, $self->{cursor}++, 0, "\012";
		2186	} elsif ($uni >= 0x20) {
1974	substr $text, $self->{cursor}++, 0, chr $uni;	2187	substr $text, $self->{cursor}++, 0, chr $uni;
1975	} else {	2188	} else {
1976	return 0;	2189	return 0;
1977	}	2190	}
1978		2191
1979	$self->_set_text ($text);	2192	$self->_set_text ($text);
1980		2193
1981	$self->realloc;	2194	$self->realloc;
		2195	$self->update;
1982		2196
1983	1	2197	1
1984	}	2198	}
1985		2199
1986	sub invoke_focus_in {	2200	sub invoke_focus_in {
…		…
2055	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};
2056	glEnd;	2270	glEnd;
2057	}	2271	}
2058	}	2272	}
2059		2273
		2274	#############################################################################
		2275
2060	package CFPlus::UI::Entry;	2276	package CFPlus::UI::Entry;
2061		2277
2062	our @ISA = CFPlus::UI::EntryBase::;	2278	our @ISA = CFPlus::UI::EntryBase::;
2063		2279
2064	use CFPlus::OpenGL;	2280	use CFPlus::OpenGL;
…		…
2066	sub invoke_key_down {	2282	sub invoke_key_down {
2067	my ($self, $ev) = @_;	2283	my ($self, $ev) = @_;
2068		2284
2069	my $sym = $ev->{sym};	2285	my $sym = $ev->{sym};
2070		2286
2071	if ($sym == 13) {	2287	if ($ev->{uni} == 0x0d || $sym == 13) {
2072	unshift @{$self->{history}},	2288	unshift @{$self->{history}},
2073	my $txt = $self->get_text;	2289	my $txt = $self->get_text;
2074		2290
2075	$self->{history_pointer} = -1;	2291	$self->{history_pointer} = -1;
2076	$self->{history_saveback} = '';	2292	$self->{history_saveback} = '';
…		…
2106	1	2322	1
2107	}	2323	}
2108		2324
2109	#############################################################################	2325	#############################################################################
2110		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
2111	package CFPlus::UI::Button;	2366	package CFPlus::UI::Button;
2112		2367
2113	our @ISA = CFPlus::UI::Label::;	2368	our @ISA = CFPlus::UI::Label::;
2114		2369
2115	use CFPlus::OpenGL;	2370	use CFPlus::OpenGL;
2116		2371
2117	my @tex =	2372	my @tex =
2118	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2119	qw(b1_button_active.png);	2374	qw(b1_button_inactive.png b1_button_active.png);
2120		2375
2121	sub new {	2376	sub new {
2122	my $class = shift;	2377	my $class = shift;
2123		2378
2124	$class->SUPER::new (	2379	$class->SUPER::new (
2125	padding_x => 4,	2380	padding_x => 4,
2126	padding_y => 4,	2381	padding_y => 4,
2127	fg => [1, 1, 1],	2382	fg => [1.0, 1.0, 1.0],
2128	active_fg => [0, 0, 1],	2383	active_fg => [0.8, 0.8, 0.8],
2129	can_hover => 1,	2384	can_hover => 1,
2130	align => 0,	2385	align => 0,
2131	valign => 0,	2386	valign => 0,
2132	can_events => 1,	2387	can_events => 1,
2133	@_	2388	@_
…		…
2151		2406
2152	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2153	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2154	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2155		2410
		2411	my $tex = $tex[$GRAB == $self];
2156	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2157		2413
2158	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2159		2415
2160	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2161	}	2417	}
…		…
2257	or Carp::croak "'path' or 'tex' attributes required";	2513	or Carp::croak "'path' or 'tex' attributes required";
2258		2514
2259	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2260	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;
2261		2517
2262	Scalar::Util::weaken $texture_cache{$self->{path}};	2518	CFPlus::weaken $texture_cache{$self->{path}};
2263		2519
2264	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2265		2521
2266	$self	2522	$self
2267	}	2523	}
…		…
2640	sub invoke_mouse_wheel {	2896	sub invoke_mouse_wheel {
2641	my ($self, $ev) = @_;	2897	my ($self, $ev) = @_;
2642		2898
2643	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644		2900
		2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2902
2645	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2646		2904
2647	! ! $delta	2905	! ! $delta
2648	}	2906	}
2649		2907
2650	sub update {	2908	sub update {
…		…
2760	#font => default_font	3018	#font => default_font
2761	@_,	3019	@_,
2762		3020
2763	layout => (new CFPlus::Layout),	3021	layout => (new CFPlus::Layout),
2764	par => [],	3022	par => [],
		3023	max_par => 0,
2765	height => 0,	3024	height => 0,
2766	children => [	3025	children => [
2767	(new CFPlus::UI::Empty expand => 1),	3026	(new CFPlus::UI::Empty expand => 1),
2768	(new CFPlus::UI::Slider vertical => 1),	3027	(new CFPlus::UI::Slider vertical => 1),
2769	],	3028	],
…		…
2853	}	3112	}
2854		3113
2855	sub current_paragraph {	3114	sub current_paragraph {
2856	my ($self) = @_;	3115	my ($self) = @_;
2857		3116
2858	$self->force_uptodate;
2859	$self->{top_paragraph} - 1	3117	$self->{top_paragraph} - 1
2860	}	3118	}
2861		3119
2862	sub scroll_to {	3120	sub scroll_to {
2863	my ($self, $para) = @_;	3121	my ($self, $para) = @_;
2864		3122
2865	$self->force_uptodate;
2866
2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;	3123	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2868		3124
2869	$self->{children}[1]->set_value ($self->{par}[$para]{y});	3125	$self->{scroll_to} = $para;
		3126	$self->update;
2870	}	3127	}
2871		3128
2872	sub clear {	3129	sub clear {
2873	my ($self) = @_;	3130	my ($self) = @_;
2874		3131
…		…
2896		3153
2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3154	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2898	push @{$self->{par}}, $para;	3155	push @{$self->{par}}, $para;
2899	}	3156	}
2900		3157
		3158	if (my $max = $self->{max_par}) {
		3159	shift @{$self->{par}} while @{$self->{par}} > $max;
		3160	}
		3161
2901	$self->{need_reflow}++;	3162	$self->{need_reflow}++;
2902	$self->update;	3163	$self->update;
2903	}	3164	}
2904		3165
2905	sub scroll_to_bottom {	3166	sub scroll_to_bottom {
2906	my ($self) = @_;	3167	my ($self) = @_;
2907		3168
2908	$self->{scroll_to_bottom} = 1;	3169	$self->{scroll_to} = $#{$self->{par}};
2909	$self->update;	3170	$self->update;
2910	}	3171	}
2911		3172
2912	sub force_uptodate {	3173	sub force_uptodate {
2913	my ($self) = @_;	3174	my ($self) = @_;
2914		3175
2915	if (delete $self->{need_reflow}) {	3176	if (delete $self->{need_reflow}) {
2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3177	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2917		3178
2918	my $height = 0;	3179	my $height = 0;
2919	my $paridx;
2920	my $top_paragraph;
2921	my $top = int $self->{children}[1]{range}[0];
2922		3180
2923	for my $para (@{$self->{par}}) {	3181	for my $para (@{$self->{par}}) {
2924	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {	3182	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2925	my $layout = $self->get_layout ($para);	3183	my $layout = $self->get_layout ($para);
2926	my ($w, $h) = $layout->size;	3184	my ($w, $h) = $layout->size;
…		…
2929	$para->{h} = $h;	3187	$para->{h} = $h;
2930	$para->{wrapped} = $layout->has_wrapped;	3188	$para->{wrapped} = $layout->has_wrapped;
2931	}	3189	}
2932		3190
2933	$para->{y} = $height;	3191	$para->{y} = $height;
2934
2935	$paridx++;
2936	$top_paragraph ||= $paridx if $height >= $top;
2937
2938	$height += $para->{h};	3192	$height += $para->{h};
2939	}	3193	}
2940		3194
2941	$self->{top_paragraph} = $top_paragraph;
2942	$self->{height} = $height;	3195	$self->{height} = $height;
2943
2944	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);	3196	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2945		3197
2946	delete $self->{texture};	3198	delete $self->{texture};
2947	}	3199	}
2948		3200
2949	if (delete $self->{scroll_to_bottom}) {	3201	if (my $paridx = delete $self->{scroll_to}) {
2950	$self->{children}[1]->set_value (1e10);	3202	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2951	}	3203	}
2952	}	3204	}
2953		3205
2954	sub update {	3206	sub update {
2955	my ($self) = @_;	3207	my ($self) = @_;
…		…
2967		3219
2968	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2969	glClearColor 0, 0, 0, 0;	3221	glClearColor 0, 0, 0, 0;
2970	glClear GL_COLOR_BUFFER_BIT;	3222	glClear GL_COLOR_BUFFER_BIT;
2971		3223
		3224	package CFPlus::UI::Base;
		3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3226	(0, 0, $self->{w}, $self->{h});
		3227
		3228	my $top = int $self->{children}[1]{range}[0];
		3229
		3230	my $paridx = 0;
		3231	my $top_paragraph;
2972	my $top = int $self->{children}[1]{range}[0];	3232	my $top = int $self->{children}[1]{range}[0];
2973		3233
2974	my $y0 = $top;	3234	my $y0 = $top;
2975	my $y1 = $top + $H;	3235	my $y1 = $top + $H;
2976		3236
…		…
2994		3254
2995	$_->draw;	3255	$_->draw;
2996	}	3256	}
2997	}	3257	}
2998	}	3258	}
		3259
		3260	$paridx++;
		3261	$top_paragraph ||= $paridx if $y >= $top;
2999	}	3262	}
		3263
		3264	$self->{top_paragraph} = $top_paragraph;
3000	};	3265	};
3001	});	3266	});
3002	}	3267	}
3003		3268
3004	sub reconfigure {	3269	sub reconfigure {
…		…
3207		3472
3208	sub new {	3473	sub new {
3209	my $class = shift;	3474	my $class = shift;
3210		3475
3211	my $self = $class->SUPER::new (	3476	my $self = $class->SUPER::new (
		3477	size_w => 32,
		3478	size_h => 8,
3212	aspect => 1,	3479	aspect => 1,
3213	can_events => 0,	3480	can_events => 0,
3214	@_,	3481	@_,
3215	);	3482	);
3216		3483
3217	if ($self->{anim} && $self->{animspeed}) {	3484	if ($self->{anim} && $self->{animspeed}) {
3218	Scalar::Util::weaken (my $widget = $self);	3485	CFPlus::weaken (my $widget = $self);
3219		3486
		3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3220	$self->{timer} = Event->timer (	3489	$self->{timer} = Event->timer (
3221	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3222	hard => 1,	3490	parked => 1,
3223	interval => $self->{animspeed},
3224	cb => sub {	3491	cb => sub {
		3492	return unless $::CONN && $widget;
		3493
3225	++$widget->{frame};	3494	++$widget->{frame};
		3495	$widget->update_face;
3226	$widget->update;	3496	$widget->update;
		3497
		3498	$widget->update_timer;
3227	},	3499	},
3228	);	3500	);
		3501
		3502	$self->update_face;
		3503	$self->update_timer;
3229	}	3504	}
3230		3505
3231	$self	3506	$self
3232	}	3507	}
3233		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	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3536	}
		3537	}
		3538	}
		3539
3234	sub size_request {	3540	sub size_request {
3235	(32, 8)	3541	my ($self) = @_;
		3542
		3543	if ($::CONN) {
		3544	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3545	if (my $tex = $::CONN->{texture}[$faceid]) {
		3546	$self->{tex} = $tex;
		3547	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3548	} else {
		3549	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3550	$self->realloc;
		3551	});
		3552	}
		3553	}
		3554	}
		3555
		3556	($self->{size_w} || 8, $self->{size_h} || 8)
3236	}	3557	}
3237		3558
3238	sub update {	3559	sub update {
3239	my ($self) = @_;	3560	my ($self) = @_;
3240		3561
3241	return unless $self->{visible};	3562	return unless $self->{visible};
3242		3563
3243	$self->SUPER::update;	3564	$self->SUPER::update;
3244	}	3565	}
3245		3566
		3567	sub invoke_visibility_change {
		3568	my ($self) = @_;
		3569
		3570	$self->update_timer;
		3571
		3572	0
		3573	}
		3574
3246	sub _draw {	3575	sub _draw {
3247	my ($self) = @_;	3576	my ($self) = @_;
3248		3577
3249	return unless $::CONN;
3250
3251	$self->SUPER::_draw;	3578	$self->SUPER::_draw;
3252		3579
3253	my $face;	3580	if (my $tex = $self->{tex}) {
3254
3255	if ($self->{frame}) {
3256	my $anim = $::CONN->{anim}[$self->{anim}];
3257
3258	$face = $anim->[ $self->{frame} % @$anim ]
3259	if $anim && @$anim;
3260	}
3261
3262	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3263
3264	if ($tex) {
3265	glEnable GL_TEXTURE_2D;	3581	glEnable GL_TEXTURE_2D;
3266	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3582	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3267	glColor 0, 0, 0, 1;	3583	glColor 0, 0, 0, 1;
3268	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3584	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3269	glDisable GL_TEXTURE_2D;	3585	glDisable GL_TEXTURE_2D;
…		…
3271	}	3587	}
3272		3588
3273	sub destroy {	3589	sub destroy {
3274	my ($self) = @_;	3590	my ($self) = @_;
3275		3591
3276	$self->{timer}->cancel	3592	(delete $self->{timer})->cancel
3277	if $self->{timer};	3593	if $self->{timer};
3278		3594
3279	$self->SUPER::destroy;	3595	$self->SUPER::destroy;
3280	}	3596	}
3281		3597
…		…
3283		3599
3284	package CFPlus::UI::Buttonbar;	3600	package CFPlus::UI::Buttonbar;
3285		3601
3286	our @ISA = CFPlus::UI::HBox::;	3602	our @ISA = CFPlus::UI::HBox::;
3287		3603
3288	# TODO: should actualyl wrap buttons and other goodies.	3604	# TODO: should actually wrap buttons and other goodies.
3289		3605
3290	#############################################################################	3606	#############################################################################
3291		3607
3292	package CFPlus::UI::Menu;	3608	package CFPlus::UI::Menu;
3293		3609
…		…
3477	}	3793	}
3478		3794
3479	sub add {	3795	sub add {
3480	my ($self, $title, $widget, $tooltip) = @_;	3796	my ($self, $title, $widget, $tooltip) = @_;
3481		3797
3482	Scalar::Util::weaken $self;	3798	CFPlus::weaken $self;
3483		3799
3484	$self->{buttonbar}->add (new CFPlus::UI::Button	3800	$self->{buttonbar}->add (new CFPlus::UI::Button
3485	markup => $title,	3801	markup => $title,
3486	tooltip => $tooltip,	3802	tooltip => $tooltip,
3487	on_activate => sub { $self->set_current_page ($widget) },	3803	on_activate => sub { $self->set_current_page ($widget) },
…		…
3571	my $self = $class->SUPER::new (	3887	my $self = $class->SUPER::new (
3572	fontsize => 0.8,	3888	fontsize => 0.8,
3573	@_,	3889	@_,
3574	);	3890	);
3575		3891
3576	Scalar::Util::weaken (my $this = $self);	3892	CFPlus::weaken (my $this = $self);
3577		3893
3578	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3894	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3579		3895
3580	$self	3896	$self
3581	}	3897	}
…		…
3704	$self->SUPER::destroy;	4020	$self->SUPER::destroy;
3705	}	4021	}
3706		4022
3707	#############################################################################	4023	#############################################################################
3708		4024
3709	package CFPlus::UI::Inventory;
3710
3711	our @ISA = CFPlus::UI::Table::;
3712
3713	sub new {
3714	my $class = shift;
3715
3716	my $self = $class->SUPER::new (
3717	col_expand => [0, 1, 0],
3718	items => [],
3719	@_,
3720	);
3721
3722	$self->set_sort_order (undef);
3723
3724	$self
3725	}
3726
3727	sub update_items {
3728	my ($self) = @_;
3729
3730	$self->clear;
3731
3732	my @item = $self->{sort}->(@{ $self->{items} });
3733
3734	my @adds;
3735	my $row = 0;
3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
3737	CFPlus::Item::update_widgets $item;
3738
3739	push @adds, 0, $row, $item->{face_widget};
3740	push @adds, 1, $row, $item->{desc_widget};
3741	push @adds, 2, $row, $item->{weight_widget};
3742
3743	$row++;
3744	}
3745
3746	$self->add (@adds);
3747	}
3748
3749	sub set_sort_order {
3750	my ($self, $order) = @_;
3751
3752	$self->{sort} = $order ||= sub {
3753	sort {
3754	$a->{type} <=> $b->{type}
3755	or $a->{name} cmp $b->{name}
3756	} @_
3757	};
3758
3759	$self->update_items;
3760	}
3761
3762	sub set_items {
3763	my ($self, $items) = @_;
3764
3765	$self->{items} = [$items ? values %$items : ()];
3766	$self->update_items;
3767	}
3768
3769	#############################################################################
3770
3771	package CFPlus::UI::SpellList;
3772
3773	our @ISA = CFPlus::UI::Table::;
3774
3775	sub new {
3776	my $class = shift;
3777
3778	my $self = $class->SUPER::new (
3779	binding => [],
3780	commands => [],
3781	@_,
3782	)
3783	}
3784
3785	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3786
3787	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3789	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3790	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3791	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3793	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3795	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3797
3798	sub rebuild_spell_list {
3799	my ($self) = @_;
3800
3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3802	$self->clear;
3803
3804	return unless $::CONN;
3805
3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3811
3812	my $row = 0;
3813
3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3815	my $spell = $self->{spell}{$_};
3816
3817	$row++;
3818
3819	my $spell_cb = sub {
3820	my ($widget, $ev) = @_;
3821
3822	if ($ev->{button} == 1) {
3823	$::CONN->user_send ("cast $spell->{name}");
3824	} elsif ($ev->{button} == 2) {
3825	$::CONN->user_send ("invoke $spell->{name}");
3826	} elsif ($ev->{button} == 3) {
3827	(new CFPlus::UI::Menu
3828	items => [
3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3831	],
3832	)->popup ($ev);
3833	} else {
3834	return 0;
3835	}
3836
3837	1
3838	};
3839
3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3841
3842	#TODO: add path info to tooltip
3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3844
3845	$self->add (0, $row, new CFPlus::UI::Face
3846	face => $spell->{face},
3847	can_hover => 1,
3848	can_events => 1,
3849	tooltip => $tooltip,
3850	on_button_down => $spell_cb,
3851	);
3852
3853	$self->add (1, $row, new CFPlus::UI::Label
3854	expand => 1,
3855	text => $spell->{name},
3856	can_hover => 1,
3857	can_events => 1,
3858	tooltip => $tooltip,
3859	on_button_down => $spell_cb,
3860	);
3861
3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3866	}
3867	});
3868	}
3869
3870	sub add_spell {
3871	my ($self, $spell) = @_;
3872
3873	$self->{spell}->{$spell->{name}} = $spell;
3874	$self->rebuild_spell_list;
3875	}
3876
3877	sub remove_spell {
3878	my ($self, $spell) = @_;
3879
3880	delete $self->{spell}->{$spell->{name}};
3881	$self->rebuild_spell_list;
3882	}
3883
3884	sub clear_spells {
3885	my ($self) = @_;
3886
3887	$self->{spell} = {};
3888	$self->rebuild_spell_list;
3889	}
3890
3891	#############################################################################
3892
3893	package CFPlus::UI::Root;	4025	package CFPlus::UI::Root;
3894		4026
3895	our @ISA = CFPlus::UI::Container::;	4027	our @ISA = CFPlus::UI::Container::;
3896		4028
3897	use List::Util qw(min max);	4029	use List::Util qw(min max);
…		…
3904	my $self = $class->SUPER::new (	4036	my $self = $class->SUPER::new (
3905	visible => 1,	4037	visible => 1,
3906	@_,	4038	@_,
3907	);	4039	);
3908		4040
3909	Scalar::Util::weaken ($self->{root} = $self);	4041	CFPlus::weaken ($self->{root} = $self);
3910		4042
3911	$self	4043	$self
3912	}	4044	}
3913		4045
3914	sub size_request {	4046	sub size_request {
…		…
4009	while ($self->{refresh_hook}) {	4141	while ($self->{refresh_hook}) {
4010	$_->()	4142	$_->()
4011	for values %{delete $self->{refresh_hook}};	4143	for values %{delete $self->{refresh_hook}};
4012	}	4144	}
4013		4145
4014	if ($self->{realloc}) {	4146	while ($self->{realloc}) {
4015	my %queue;	4147	my %queue;
4016	my @queue;	4148	my @queue;
4017	my $widget;	4149	my $widget;
4018		4150
4019	outer:	4151	outer:
…		…
4066	}	4198	}
4067	}	4199	}
4068		4200
4069	delete $self->{realloc}{$widget+0};	4201	delete $self->{realloc}{$widget+0};
4070	}	4202	}
4071	}
4072		4203
4073	while (my $size_alloc = delete $self->{size_alloc}) {	4204	while (my $size_alloc = delete $self->{size_alloc}) {
4074	my @queue = sort { $b->{visible} <=> $a->{visible} }	4205	my @queue = sort { $a->{visible} <=> $b->{visible} }
4075	values %$size_alloc;	4206	values %$size_alloc;
4076		4207
4077	while () {	4208	while () {
4078	my $widget = pop @queue || last;	4209	my $widget = pop @queue || last;
4079		4210
4080	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4211	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4081		4212
4082	$w = 0 if $w < 0;
4083	$h = 0 if $h < 0;
4084
4085	$w = max $widget->{min_w}, $w;	4213	$w = max $widget->{min_w}, $w;
4086	$h = max $widget->{min_h}, $h;	4214	$h = max $widget->{min_h}, $h;
4087		4215
4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4216	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4217	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4090		4218
4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4093		4221
4094	$w = int $w + 0.5;	4222	$w = int $w + 0.5;
4095	$h = int $h + 0.5;	4223	$h = int $h + 0.5;
4096		4224
4097	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4225	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4098	$widget->{old_w} = $widget->{w};	4226	$widget->{old_w} = $widget->{w};
4099	$widget->{old_h} = $widget->{h};	4227	$widget->{old_h} = $widget->{h};
4100		4228
4101	$widget->{w} = $w;	4229	$widget->{w} = $w;
4102	$widget->{h} = $h;	4230	$widget->{h} = $h;
4103		4231
4104	$widget->emit (size_allocate => $w, $h);	4232	$widget->emit (size_allocate => $w, $h);
		4233	}
4105	}	4234	}
4106	}	4235	}
4107	}	4236	}
4108		4237
4109	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
4110	$_->()	4239	$_->()
4111	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
4112	}	4241	}
4113
4114		4242
4115	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4116	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4117	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
4118		4246
…		…
4123	glLoadIdentity;	4251	glLoadIdentity;
4124		4252
4125	{	4253	{
4126	package CFPlus::UI::Base;	4254	package CFPlus::UI::Base;
4127		4255
4128	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4129	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
4130	}
4131		4258
4132	$self->_draw;	4259	$self->_draw;
		4260	}
4133	}	4261	}
4134		4262
4135	#############################################################################	4263	#############################################################################
4136		4264
4137	package CFPlus::UI;	4265	package CFPlus::UI;

Diff Legend

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