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.345 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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) = @_;
…		…
633	my ($self) = @_;	646	my ($self) = @_;
634		647
635	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
636	}	649	}
637		650
		651	my $cntx;#d#
638	sub DESTROY {	652	sub DESTROY {
639	my ($self) = @_;	653	my ($self) = @_;
640		654
641	return if CFPlus::in_destruct;	655	return if CFPlus::in_destruct;
642
643	delete $WIDGET{$self+0};
644		656
645	eval { $self->destroy };	657	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
647	}	661	}
648		662
649	#############################################################################	663	#############################################################################
650		664
651	package CFPlus::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
…		…
727	can_events => 0,	741	can_events => 0,
728	%arg,	742	%arg,
729	);	743	);
730		744
731	$self->add (@$children)	745	$self->add (@$children)
732	if $children;	746	if $children && @$children;
733		747
734	$self	748	$self
735	}	749	}
736		750
737	sub realloc {	751	sub realloc {
…		…
746	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
747		761
748	$_->set_parent ($self)	762	$_->set_parent ($self)
749	for @widgets;	763	for @widgets;
750		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	766	use sort 'stable';
752		767
753	$self->{children} = [	768	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
756	];	771	];
757		772
758	$self->realloc;	773	$self->realloc;
		774
		775	map $_+0, @widgets
759	}	776	}
760		777
761	sub children {	778	sub children {
762	@{ $_[0]{children} }	779	@{ $_[0]{children} }
763	}	780	}
…		…
774	}	791	}
775		792
776	sub clear {	793	sub clear {
777	my ($self) = @_;	794	my ($self) = @_;
778		795
779	my $children = delete $self->{children};	796	my $children = $self->{children};
780	$self->{children} = [];	797	$self->{children} = [];
781		798
782	for (@$children) {	799	for (@$children) {
783	delete $_->{parent};	800	delete $_->{parent};
784	$_->hide;	801	$_->hide;
…		…
898	glClear GL_COLOR_BUFFER_BIT;	915	glClear GL_COLOR_BUFFER_BIT;
899		916
900	{	917	{
901	package CFPlus::UI::Base;	918	package CFPlus::UI::Base;
902		919
903	($draw_x, $draw_y, $draw_w, $draw_h) =	920	local ($draw_x, $draw_y, $draw_w, $draw_h) =
904	(0, 0, $self->{w}, $self->{h});	921	(0, 0, $self->{w}, $self->{h});
		922
		923	$self->_render;
905	}	924	}
906
907	$self->_render;
908	};	925	};
909	}	926	}
910		927
911	sub _draw {	928	sub _draw {
912	my ($self) = @_;	929	my ($self) = @_;
…		…
924	}	941	}
925		942
926	#############################################################################	943	#############################################################################
927		944
928	package CFPlus::UI::ViewPort;	945	package CFPlus::UI::ViewPort;
		946
		947	use List::Util qw(min max);
929		948
930	our @ISA = CFPlus::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
931		950
932	sub new {	951	sub new {
933	my $class = shift;	952	my $class = shift;
…		…
942	sub size_request {	961	sub size_request {
943	my ($self) = @_;	962	my ($self) = @_;
944		963
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		965
947	$w = 10 if $self->{scroll_x};	966	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	967	$h = 1 if $self->{scroll_y};
949		968
950	($w, $h)	969	($w, $h)
951	}	970	}
952		971
953	sub invoke_size_allocate {	972	sub invoke_size_allocate {
…		…
965	}	984	}
966		985
967	sub set_offset {	986	sub set_offset {
968	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
969		988
		989	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		990	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		991
		992	if ($x != $self->{view_x} or $y != $self->{view_y}) {
970	$self->{view_x} = int $x;	993	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	994	$self->{view_y} = $y;
972		995
		996	$self->emit (changed => $x, $y);
973	$self->update;	997	$self->update;
		998	}
974	}	999	}
975		1000
976	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
977	sub coord2local {	1002	sub coord2local {
978	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	1018	my ($self, $x, $y) = @_;
994		1019
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	1022	) {
998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999	} else {	1024	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	1025	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	1026	}
1002	}	1027	}
1003		1028
…		…
1014		1039
1015	#############################################################################	1040	#############################################################################
1016		1041
1017	package CFPlus::UI::ScrolledWindow;	1042	package CFPlus::UI::ScrolledWindow;
1018		1043
1019	our @ISA = CFPlus::UI::HBox::;	1044	our @ISA = CFPlus::UI::Table::;
1020		1045
1021	sub new {	1046	sub new {
1022	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
1023		1048
1024	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
1025		1050
1026	my $self;	1051	my $self;
1027		1052
1028	my $slider = new CFPlus::UI::Slider	1053	my $hslider = new CFPlus::UI::Slider
		1054	col => 0,
		1055	row => 1,
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
		1065	col => 1,
		1066	row => 0,
1029	vertical => 1,	1067	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1069	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1070	$self->{vpos} = $_[1];
		1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1072	},
1034	;	1073	;
1035		1074
1036	$self = $class->SUPER::new (	1075	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1076	scroll_x => 0,
		1077	scroll_y => 1,
1038	can_events => 1,	1078	can_events => 1,
1039	slider => $slider,	1079	hslider => $hslider,
		1080	vslider => $vslider,
		1081	col_expand => [1, 0],
		1082	row_expand => [1, 0],
1040	%arg,	1083	%arg,
1041	);	1084	);
1042		1085
		1086	$self->{vp} = new CFPlus::UI::ViewPort
		1087	col => 0,
		1088	row => 0,
		1089	expand => 1,
		1090	scroll_x => $self->{scroll_x},
		1091	scroll_y => $self->{scroll_y},
		1092	on_changed => sub {
		1093	my ($vp, $x, $y) = @_;
		1094
		1095	$vp->{parent}{hslider}->set_value ($x);
		1096	$vp->{parent}{vslider}->set_value ($y);
		1097
		1098	0
		1099	},
		1100	;
		1101
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1102	$self->SUPER::add ($self->{vp});
		1103
1044	$self->add ($child) if $child;	1104	$self->add ($child) if $child;
1045		1105
1046	$self	1106	$self
1047	}	1107	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1108
1051	sub add {	1109	sub add {
1052	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
1053		1111
1054	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
1055	}	1113	}
1056		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129
		1130	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1131	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1132
		1133	my $visible = $h1 > $h2;
		1134	if ($visible != $self->{vslider_visible}) {
		1135	$self->{vslider_visible} = $visible;
		1136	$visible ? $self->SUPER::add ($self->{vslider})
		1137	: $self->SUPER::remove ($self->{vslider});
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
		1142	my ($self, $ev) = @_;
		1143
		1144	$self->grab_focus;
		1145
		1146	my $ox = $self->{vp}{view_x};
		1147	my $oy = $self->{vp}{view_y};
		1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
1057	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1059		1161
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$self->{slider}->emit (mouse_wheel => $ev);	1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063		1164
1064	1	1165	1
1065	}	1166	}
1066		1167
1067	sub update_slider {	1168	sub invoke_button_down {
1068	my ($self) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1069		1170
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1171	if ($ev->{button} == 2) {
1071	}	1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
1072		1175
1073	sub update {	1176	0
1074	my ($self) = @_;	1177	}
1075		1178
1076	$self->SUPER::update;	1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
1077		1181
1078	$self->update_slider;	1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1079	}	1198	}
1080		1199
1081	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1083		1202
1084	$self->update_slider;	1203	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1205	}
1088		1206
1089	#############################################################################	1207	#############################################################################
1090		1208
…		…
1132		1250
1133	our @ISA = CFPlus::UI::Bin::;	1251	our @ISA = CFPlus::UI::Bin::;
1134		1252
1135	use CFPlus::OpenGL;	1253	use CFPlus::OpenGL;
1136		1254
		1255	sub new {
		1256	my ($class, %arg) = @_;
		1257
		1258	if ((exists $arg{label}) && !ref $arg{label}) {
		1259	$arg{label} = new CFPlus::UI::Label
		1260	align => 1,
		1261	valign => 0,
		1262	text => $arg{label},
		1263	fontsize => ($arg{border} || 0.8) * 0.75;
		1264	}
		1265
		1266	my $self = $class->SUPER::new (
		1267	# label => "",
		1268	fg => [0.6, 0.3, 0.1],
		1269	border => 0.8,
		1270	style => 'single',
		1271	%arg,
		1272	);
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1282	}
		1283
		1284	sub border {
		1285	int $_[0]{border} * $::FONTSIZE
		1286	}
		1287
		1288	sub size_request {
		1289	my ($self) = @_;
		1290
		1291	($self->{label_w}, undef) = $self->{label}->size_request
		1292	if $self->{label};
		1293
		1294	my ($w, $h) = $self->SUPER::size_request;
		1295
		1296	(
		1297	$w + $self->border * 2,
		1298	$h + $self->border * 2,
		1299	)
		1300	}
		1301
		1302	sub invoke_size_allocate {
		1303	my ($self, $w, $h) = @_;
		1304
		1305	my $border = $self->border;
		1306
		1307	$w -= List::Util::max 0, $border * 2;
		1308	$h -= List::Util::max 0, $border * 2;
		1309
		1310	if (my $label = $self->{label}) {
		1311	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1312	$label->{h} = List::Util::min $h, $border;
		1313	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1314	}
		1315
		1316	$self->child->configure ($border, $border, $w, $h);
		1317
		1318	1
		1319	}
		1320
		1321	sub _draw {
		1322	my ($self) = @_;
		1323
		1324	my $child = $self->{children}[0];
		1325
		1326	my $border = $self->border;
		1327	my ($w, $h) = ($self->{w}, $self->{h});
		1328
		1329	$child->draw;
		1330
		1331	glColor @{$self->{fg}};
		1332	glBegin GL_LINE_STRIP;
		1333	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1338	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1339	glEnd;
		1340
		1341	if ($self->{label}) {
		1342	glTranslate $border * 2, 0;
		1343	$self->{label}->_draw;
		1344	}
		1345	}
		1346
		1347	#############################################################################
		1348
		1349	package CFPlus::UI::Toplevel;
		1350
		1351	our @ISA = CFPlus::UI::Bin::;
		1352
		1353	use CFPlus::OpenGL;
		1354
1137	my $bg =	1355	my $bg =
1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1356	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139	mipmap => 1, wrap => 1;	1357	mipmap => 1, wrap => 1;
1140		1358
1141	my @border =	1359	my @border =
1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1360	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1361	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1362
		1363	my @icon =
		1364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1365	qw(x1_move.png x1_resize.png);
1144		1366
1145	sub new {	1367	sub new {
1146	my ($class, %arg) = @_;	1368	my ($class, %arg) = @_;
1147		1369
1148	my $self = $class->SUPER::new (	1370	my $self = $class->SUPER::new (
…		…
1317	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1539	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1318		1540
1319	my $border = $self->border;	1541	my $border = $self->border;
1320		1542
1321	glColor @{ $self->{border_bg} };	1543	glColor @{ $self->{border_bg} };
1322	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1544	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1323	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1545	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1324	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1546	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1325	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1547	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1548
		1549	# move
		1550	my $w2 = ($w - $border) * .5;
		1551	my $h2 = ($h - $border) * .5;
		1552	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1555
		1556	# resize
		1557	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1559	unless $self->{has_close_button};
		1560	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1561	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1326		1562
1327	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1563	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1328	glColor @{ $self->{bg} };	1564	glColor @{ $self->{bg} };
1329		1565
1330	# TODO: repeat texture not scale	1566	# TODO: repeat texture not scale
…		…
1351		1587
1352	#############################################################################	1588	#############################################################################
1353		1589
1354	package CFPlus::UI::Table;	1590	package CFPlus::UI::Table;
1355		1591
1356	our @ISA = CFPlus::UI::Base::;	1592	our @ISA = CFPlus::UI::Container::;
1357		1593
1358	use List::Util qw(max sum);	1594	use List::Util qw(max sum);
1359		1595
1360	use CFPlus::OpenGL;	1596	use CFPlus::OpenGL;
1361		1597
1362	sub new {	1598	sub new {
1363	my $class = shift;	1599	my $class = shift;
1364		1600
1365	$class->SUPER::new (	1601	$class->SUPER::new (
1366	col_expand => [],	1602	col_expand => [],
		1603	row_expand => [],
1367	@_,	1604	@_,
1368	)	1605	)
1369	}	1606	}
1370		1607
1371	sub children {
1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1373	}
1374
1375	sub add {	1608	sub add {
		1609	my ($self, @widgets) = @_;
		1610
		1611	for my $child (@widgets) {
		1612	$child->{rowspan} ||= 1;
		1613	$child->{colspan} ||= 1;
		1614	}
		1615
		1616	$self->SUPER::add (@widgets);
		1617	}
		1618
		1619	sub add_at {
1376	my ($self) = shift;	1620	my $self = shift;
		1621
		1622	my @widgets;
1377		1623
1378	while (@_) {	1624	while (@_) {
1379	my ($x, $y, $child) = splice @_, 0, 3, ();	1625	my ($col, $row, $child) = splice @_, 0, 3, ();
1380	$child->set_parent ($self);
1381	$self->{children}[$y][$x] = $child;
1382	}
1383		1626
1384	$self->{force_realloc} = 1;	1627	$child->{row} = $row;
1385	$self->{force_size_alloc} = 1;	1628	$child->{col} = $col;
1386	$self->realloc;
1387	}
1388		1629
1389	sub remove {	1630	push @widgets, $child;
		1631	}
		1632
		1633	$self->add (@widgets);
		1634	}
		1635
		1636	sub get_wh {
1390	my ($self, $child) = @_;	1637	my ($self) = @_;
1391		1638
1392	# TODO: not yet implemented	1639	my (@w, @h);
1393	}
1394
1395	# TODO: move to container class maybe? send children a signal on removal?
1396	sub clear {
1397	my ($self) = @_;
1398		1640
1399	my @children = $self->children;	1641	my @children = $self->children;
1400	delete $self->{children};	1642
		1643	# first pass, columns
		1644	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1645	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1646
		1647	my $sw = sum @w[$c .. $c + $cs - 1];
		1648
		1649	if ($w > $sw) {
		1650	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1651	}
1401		1652	}
1402	for (@children) {
1403	delete $_->{parent};
1404	$_->hide;
1405	}
1406		1653
1407	$self->realloc;	1654	# second pass, rows
1408	}	1655	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1409
1410	sub get_wh {
1411	my ($self) = @_;
1412
1413	my (@w, @h);
1414
1415	for my $y (0 .. $#{$self->{children}}) {
1416	my $row = $self->{children}[$y]
1417	or next;
1418
1419	for my $x (0 .. $#$row) {
1420	my $widget = $row->[$x]
1421	or next;
1422	my ($w, $h) = @$widget{qw(req_w req_h)};	1656	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1423		1657
1424	$w[$x] = max $w[$x], $w;	1658	my $sh = sum @h[$r .. $r + $rs - 1];
1425	$h[$y] = max $h[$y], $h;	1659
		1660	if ($h > $sh) {
		1661	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1426	}	1662	}
1427	}	1663	}
1428		1664
1429	(\@w, \@h)	1665	(\@w, \@h)
1430	}	1666	}
…		…
1446	my ($ws, $hs) = $self->get_wh;	1682	my ($ws, $hs) = $self->get_wh;
1447		1683
1448	my $req_w = (sum @$ws) || 1;	1684	my $req_w = (sum @$ws) || 1;
1449	my $req_h = (sum @$hs) || 1;	1685	my $req_h = (sum @$hs) || 1;
1450		1686
1451	# TODO: nicer code && do row_expand	1687	# now linearly scale the rows/columns to the allocated size
1452	my @col_expand = @{$self->{col_expand}};	1688	my @col_expand = @{$self->{col_expand}};
1453	@col_expand = (1) x @$ws unless @col_expand;	1689	@col_expand = (1) x @$ws unless @col_expand;
1454	my $col_expand = (sum @col_expand) || 1;	1690	my $col_expand = (sum @col_expand) || 1;
1455		1691
1456	# linearly scale sizes
1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1692	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1459		1693
1460	CFPlus::UI::harmonize $ws;	1694	CFPlus::UI::harmonize $ws;
		1695
		1696	my @row_expand = @{$self->{row_expand}};
		1697	@row_expand = (1) x @$ws unless @row_expand;
		1698	my $row_expand = (sum @row_expand) || 1;
		1699
		1700	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1701
1461	CFPlus::UI::harmonize $hs;	1702	CFPlus::UI::harmonize $hs;
1462		1703
1463	my $y;	1704	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1705	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1464		1706
1465	for my $r (0 .. $#{$self->{children}}) {	1707	for my $widget ($self->children) {
1466	my $row = $self->{children}[$r]	1708	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1467	or next;
1468		1709
1469	my $x = 0;	1710	$widget->configure (
1470	my $row_h = $hs->[$r];	1711	$x[$c], $y[$r],
		1712	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1471		1713	);
1472	for my $c (0 .. $#$row) {	1714	}
1473	my $col_w = $ws->[$c];
1474		1715
1475	if (my $widget = $row->[$c]) {	1716	1
1476	$widget->configure ($x, $y, $col_w, $row_h);	1717	}
1477	}
1478		1718
1479	$x += $col_w;	1719	#############################################################################
		1720
		1721	package CFPlus::UI::Fixed;
		1722
		1723	use List::Util qw(min max);
		1724
		1725	our @ISA = CFPlus::UI::Container::;
		1726
		1727	sub add {
		1728	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1729
		1730	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1731	$self->SUPER::add ($child);
		1732	}
		1733
		1734	sub _scale($$$) {
		1735	my ($mode, $val, $max) = @_;
		1736
		1737	$mode eq "abs" ? $val
		1738	: $mode eq "rel" ? $val * $max
		1739	: 0
		1740	}
		1741
		1742	sub size_request {
		1743	my ($self) = @_;
		1744
		1745	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1746
		1747	# determine overall size by querying abs widgets
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	if ($pos eq "abs") {
		1752	$w = _scale $size, $w, $child->{req_w};
		1753	$h = _scale $size, $h, $child->{req_h};
		1754
		1755	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1756	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1480	}	1757	}
		1758	}
1481		1759
1482	$y += $row_h;	1760	my $W = $x2 - $x1;
		1761	my $H = $y2 - $y1;
		1762
		1763	# now layout remaining widgets
		1764	for my $child ($self->visible_children) {
		1765	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1766
		1767	if ($pos ne "abs") {
		1768	$x = _scale $pos, $x, $W;
		1769	$y = _scale $pos, $x, $H;
		1770	$w = _scale $size, $w, $child->{req_w};
		1771	$h = _scale $size, $h, $child->{req_h};
		1772
		1773	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1774	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1775	}
		1776	}
		1777
		1778	my $W = $x2 - $x1;
		1779	my $H = $y2 - $y1;
		1780
		1781	($W, $H)
		1782	}
		1783
		1784	sub invoke_size_allocate {
		1785	my ($self, $W, $H) = @_;
		1786
		1787	for my $child ($self->visible_children) {
		1788	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1789
		1790	$x = _scale $pos, $x, $W;
		1791	$y = _scale $pos, $x, $H;
		1792	$w = _scale $size, $w, $child->{req_w};
		1793	$h = _scale $size, $h, $child->{req_h};
		1794
		1795	$child->configure ($x, $y, $w, $h);
1483	}	1796	}
1484		1797
1485	1	1798	1
1486	}
1487
1488	sub find_widget {
1489	my ($self, $x, $y) = @_;
1490
1491	$x -= $self->{x};
1492	$y -= $self->{y};
1493
1494	my $res;
1495
1496	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1497	$res = $_->find_widget ($x, $y)
1498	and return $res;
1499	}
1500
1501	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1502	}
1503
1504	sub _draw {
1505	my ($self) = @_;
1506
1507	for (grep $_, @{$self->{children}}) {
1508	$_->draw for grep $_, @$_;
1509	}
1510	}	1799	}
1511		1800
1512	#############################################################################	1801	#############################################################################
1513		1802
1514	package CFPlus::UI::Box;	1803	package CFPlus::UI::Box;
…		…
1800	active_fg => [0, 0, 0],	2089	active_fg => [0, 0, 0],
1801	can_hover => 1,	2090	can_hover => 1,
1802	can_focus => 1,	2091	can_focus => 1,
1803	valign => 0,	2092	valign => 0,
1804	can_events => 1,	2093	can_events => 1,
		2094	ellipsise => 0,
1805	#text => ...	2095	#text => ...
1806	#hidden => "*",	2096	#hidden => "*",
1807	@_	2097	@_
1808	)	2098	)
1809	}	2099	}
…		…
1853	my $mod = $ev->{mod};	2143	my $mod = $ev->{mod};
1854	my $sym = $ev->{sym};	2144	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2145	my $uni = $ev->{unicode};
1856		2146
1857	my $text = $self->get_text;	2147	my $text = $self->get_text;
		2148
		2149	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1858		2150
1859	if ($uni == 8) {	2151	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2152	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2153	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2154	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFPlus::SDLK_LEFT) {	2155	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2156	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2157	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2158	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFPlus::SDLK_HOME) {	2159	} elsif ($sym == CFPlus::SDLK_HOME) {
		2160	# what a hack
		2161	$self->{cursor} =
		2162	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2163	? length $1
		2164	: 0;
		2165	} elsif ($sym == CFPlus::SDLK_END) {
		2166	# uh, again
		2167	$self->{cursor} =
		2168	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2169	? $self->{cursor} + length $1
		2170	: length $self->{text};
		2171	} elsif ($uni == 21) { # ctrl-u
		2172	$text = "";
1868	$self->{cursor} = 0;	2173	$self->{cursor} = 0;
1869	} elsif ($sym == CFPlus::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2174	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2175	$self->emit ('escape');
1873	} elsif ($uni) {	2176	} elsif ($uni == 0x0d) {
		2177	substr $text, $self->{cursor}++, 0, "\012";
		2178	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2179	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2180	} else {
1876	return 0;	2181	return 0;
1877	}	2182	}
1878		2183
1879	$self->_set_text ($text);	2184	$self->_set_text ($text);
1880		2185
1881	$self->realloc;	2186	$self->realloc;
		2187	$self->update;
1882		2188
1883	1	2189	1
1884	}	2190	}
1885		2191
1886	sub invoke_focus_in {	2192	sub invoke_focus_in {
…		…
1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956	glEnd;	2262	glEnd;
1957	}	2263	}
1958	}	2264	}
1959		2265
		2266	#############################################################################
		2267
1960	package CFPlus::UI::Entry;	2268	package CFPlus::UI::Entry;
1961		2269
1962	our @ISA = CFPlus::UI::EntryBase::;	2270	our @ISA = CFPlus::UI::EntryBase::;
1963		2271
1964	use CFPlus::OpenGL;	2272	use CFPlus::OpenGL;
…		…
1966	sub invoke_key_down {	2274	sub invoke_key_down {
1967	my ($self, $ev) = @_;	2275	my ($self, $ev) = @_;
1968		2276
1969	my $sym = $ev->{sym};	2277	my $sym = $ev->{sym};
1970		2278
1971	if ($sym == 13) {	2279	if ($ev->{uni} == 0x0d || $sym == 13) {
1972	unshift @{$self->{history}},	2280	unshift @{$self->{history}},
1973	my $txt = $self->get_text;	2281	my $txt = $self->get_text;
1974		2282
1975	$self->{history_pointer} = -1;	2283	$self->{history_pointer} = -1;
1976	$self->{history_saveback} = '';	2284	$self->{history_saveback} = '';
…		…
2006	1	2314	1
2007	}	2315	}
2008		2316
2009	#############################################################################	2317	#############################################################################
2010		2318
		2319	package CFPlus::UI::TextEdit;
		2320
		2321	our @ISA = CFPlus::UI::EntryBase::;
		2322
		2323	use CFPlus::OpenGL;
		2324
		2325	sub move_cursor_ver {
		2326	my ($self, $dy) = @_;
		2327
		2328	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2329
		2330	$y += $dy;
		2331
		2332	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2333	$self->{cursor} = $index;
		2334	delete $self->{cur_h};
		2335	$self->update;
		2336	return;
		2337	}
		2338	}
		2339
		2340	sub invoke_key_down {
		2341	my ($self, $ev) = @_;
		2342
		2343	my $sym = $ev->{sym};
		2344
		2345	if ($sym == CFPlus::SDLK_UP) {
		2346	$self->move_cursor_ver (-1);
		2347	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2348	$self->move_cursor_ver (+1);
		2349	} else {
		2350	return $self->SUPER::invoke_key_down ($ev)
		2351	}
		2352
		2353	1
		2354	}
		2355
		2356	#############################################################################
		2357
2011	package CFPlus::UI::Button;	2358	package CFPlus::UI::Button;
2012		2359
2013	our @ISA = CFPlus::UI::Label::;	2360	our @ISA = CFPlus::UI::Label::;
2014		2361
2015	use CFPlus::OpenGL;	2362	use CFPlus::OpenGL;
2016		2363
2017	my @tex =	2364	my @tex =
2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019	qw(b1_button_active.png);	2366	qw(b1_button_inactive.png b1_button_active.png);
2020		2367
2021	sub new {	2368	sub new {
2022	my $class = shift;	2369	my $class = shift;
2023		2370
2024	$class->SUPER::new (	2371	$class->SUPER::new (
2025	padding_x => 4,	2372	padding_x => 4,
2026	padding_y => 4,	2373	padding_y => 4,
2027	fg => [1, 1, 1],	2374	fg => [1.0, 1.0, 1.0],
2028	active_fg => [0, 0, 1],	2375	active_fg => [0.8, 0.8, 0.8],
2029	can_hover => 1,	2376	can_hover => 1,
2030	align => 0,	2377	align => 0,
2031	valign => 0,	2378	valign => 0,
2032	can_events => 1,	2379	can_events => 1,
2033	@_	2380	@_
…		…
2051		2398
2052	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
2053	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
2055		2402
		2403	my $tex = $tex[$GRAB == $self];
2056	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2057		2405
2058	glDisable GL_TEXTURE_2D;	2406	glDisable GL_TEXTURE_2D;
2059		2407
2060	$self->SUPER::_draw;	2408	$self->SUPER::_draw;
2061	}	2409	}
…		…
2157	or Carp::croak "'path' or 'tex' attributes required";	2505	or Carp::croak "'path' or 'tex' attributes required";
2158		2506
2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2507	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2508	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2161		2509
2162	Scalar::Util::weaken $texture_cache{$self->{path}};	2510	CFPlus::weaken $texture_cache{$self->{path}};
2163		2511
2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2512	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2165		2513
2166	$self	2514	$self
2167	}	2515	}
…		…
2540	sub invoke_mouse_wheel {	2888	sub invoke_mouse_wheel {
2541	my ($self, $ev) = @_;	2889	my ($self, $ev) = @_;
2542		2890
2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2891	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544		2892
		2893	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2894
2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2895	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2546		2896
2547	! ! $delta	2897	! ! $delta
2548	}	2898	}
2549		2899
2550	sub update {	2900	sub update {
…		…
2660	#font => default_font	3010	#font => default_font
2661	@_,	3011	@_,
2662		3012
2663	layout => (new CFPlus::Layout),	3013	layout => (new CFPlus::Layout),
2664	par => [],	3014	par => [],
		3015	max_par => 0,
2665	height => 0,	3016	height => 0,
2666	children => [	3017	children => [
2667	(new CFPlus::UI::Empty expand => 1),	3018	(new CFPlus::UI::Empty expand => 1),
2668	(new CFPlus::UI::Slider vertical => 1),	3019	(new CFPlus::UI::Slider vertical => 1),
2669	],	3020	],
…		…
2753	}	3104	}
2754		3105
2755	sub current_paragraph {	3106	sub current_paragraph {
2756	my ($self) = @_;	3107	my ($self) = @_;
2757		3108
2758	$self->force_uptodate;
2759	$self->{top_paragraph} - 1	3109	$self->{top_paragraph} - 1
2760	}	3110	}
2761		3111
2762	sub scroll_to {	3112	sub scroll_to {
2763	my ($self, $para) = @_;	3113	my ($self, $para) = @_;
2764		3114
2765	$self->force_uptodate;
2766
2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;	3115	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768		3116
2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});	3117	$self->{scroll_to} = $para;
		3118	$self->update;
2770	}	3119	}
2771		3120
2772	sub clear {	3121	sub clear {
2773	my ($self) = @_;	3122	my ($self) = @_;
2774		3123
…		…
2796		3145
2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3146	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2798	push @{$self->{par}}, $para;	3147	push @{$self->{par}}, $para;
2799	}	3148	}
2800		3149
		3150	if (my $max = $self->{max_par}) {
		3151	shift @{$self->{par}} while @{$self->{par}} > $max;
		3152	}
		3153
2801	$self->{need_reflow}++;	3154	$self->{need_reflow}++;
2802	$self->update;	3155	$self->update;
2803	}	3156	}
2804		3157
2805	sub scroll_to_bottom {	3158	sub scroll_to_bottom {
2806	my ($self) = @_;	3159	my ($self) = @_;
2807		3160
2808	$self->{scroll_to_bottom} = 1;	3161	$self->{scroll_to} = $#{$self->{par}};
2809	$self->update;	3162	$self->update;
2810	}	3163	}
2811		3164
2812	sub force_uptodate {	3165	sub force_uptodate {
2813	my ($self) = @_;	3166	my ($self) = @_;
2814		3167
2815	if (delete $self->{need_reflow}) {	3168	if (delete $self->{need_reflow}) {
2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3169	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817		3170
2818	my $height = 0;	3171	my $height = 0;
2819	my $paridx;
2820	my $top_paragraph;
2821	my $top = int $self->{children}[1]{range}[0];
2822		3172
2823	for my $para (@{$self->{par}}) {	3173	for my $para (@{$self->{par}}) {
2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {	3174	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825	my $layout = $self->get_layout ($para);	3175	my $layout = $self->get_layout ($para);
2826	my ($w, $h) = $layout->size;	3176	my ($w, $h) = $layout->size;
…		…
2829	$para->{h} = $h;	3179	$para->{h} = $h;
2830	$para->{wrapped} = $layout->has_wrapped;	3180	$para->{wrapped} = $layout->has_wrapped;
2831	}	3181	}
2832		3182
2833	$para->{y} = $height;	3183	$para->{y} = $height;
2834
2835	$paridx++;
2836	$top_paragraph ||= $paridx if $height >= $top;
2837
2838	$height += $para->{h};	3184	$height += $para->{h};
2839	}	3185	}
2840		3186
2841	$self->{top_paragraph} = $top_paragraph;
2842	$self->{height} = $height;	3187	$self->{height} = $height;
2843
2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);	3188	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845		3189
2846	delete $self->{texture};	3190	delete $self->{texture};
2847	}	3191	}
2848		3192
2849	if (delete $self->{scroll_to_bottom}) {	3193	if (my $paridx = delete $self->{scroll_to}) {
2850	$self->{children}[1]->set_value (1e10);	3194	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851	}	3195	}
2852	}	3196	}
2853		3197
2854	sub update {	3198	sub update {
2855	my ($self) = @_;	3199	my ($self) = @_;
…		…
2867		3211
2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3212	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869	glClearColor 0, 0, 0, 0;	3213	glClearColor 0, 0, 0, 0;
2870	glClear GL_COLOR_BUFFER_BIT;	3214	glClear GL_COLOR_BUFFER_BIT;
2871		3215
		3216	package CFPlus::UI::Base;
		3217	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3218	(0, 0, $self->{w}, $self->{h});
		3219
		3220	my $top = int $self->{children}[1]{range}[0];
		3221
		3222	my $paridx = 0;
		3223	my $top_paragraph;
2872	my $top = int $self->{children}[1]{range}[0];	3224	my $top = int $self->{children}[1]{range}[0];
2873		3225
2874	my $y0 = $top;	3226	my $y0 = $top;
2875	my $y1 = $top + $H;	3227	my $y1 = $top + $H;
2876		3228
…		…
2894		3246
2895	$_->draw;	3247	$_->draw;
2896	}	3248	}
2897	}	3249	}
2898	}	3250	}
		3251
		3252	$paridx++;
		3253	$top_paragraph ||= $paridx if $y >= $top;
2899	}	3254	}
		3255
		3256	$self->{top_paragraph} = $top_paragraph;
2900	};	3257	};
2901	});	3258	});
2902	}	3259	}
2903		3260
2904	sub reconfigure {	3261	sub reconfigure {
…		…
3107		3464
3108	sub new {	3465	sub new {
3109	my $class = shift;	3466	my $class = shift;
3110		3467
3111	my $self = $class->SUPER::new (	3468	my $self = $class->SUPER::new (
		3469	size_w => 32,
		3470	size_h => 8,
3112	aspect => 1,	3471	aspect => 1,
3113	can_events => 0,	3472	can_events => 0,
3114	@_,	3473	@_,
3115	);	3474	);
3116		3475
3117	if ($self->{anim} && $self->{animspeed}) {	3476	if ($self->{anim} && $self->{animspeed}) {
3118	Scalar::Util::weaken (my $widget = $self);	3477	CFPlus::weaken (my $widget = $self);
3119		3478
		3479	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3480	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3120	$self->{timer} = Event->timer (	3481	$self->{timer} = Event->timer (
3121	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3122	hard => 1,	3482	parked => 1,
3123	interval => $self->{animspeed},
3124	cb => sub {	3483	cb => sub {
		3484	return unless $::CONN && $widget;
		3485
3125	++$widget->{frame};	3486	++$widget->{frame};
		3487	$widget->update_face;
3126	$widget->update;	3488	$widget->update;
		3489
		3490	$widget->update_timer;
3127	},	3491	},
3128	);	3492	);
		3493
		3494	$self->update_face;
		3495	$self->update_timer;
3129	}	3496	}
3130		3497
3131	$self	3498	$self
3132	}	3499	}
3133		3500
		3501	sub update_timer {
		3502	my ($self) = @_;
		3503
		3504	return unless $self->{timer};
		3505
		3506	if ($self->{visible}) {
		3507	$self->{timer}->at (
		3508	$self->{anim_start}
		3509	+ $self->{animspeed}
		3510	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3511	);
		3512	$self->{timer}->start;
		3513	} else {
		3514	$self->{timer}->stop;
		3515	}
		3516	}
		3517
		3518	sub update_face {
		3519	my ($self) = @_;
		3520
		3521	return unless $::CONN;
		3522
		3523	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3524	if ($anim && @$anim) {
		3525	delete $self->{wait_face};
		3526	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3527	}
		3528	}
		3529	}
		3530
3134	sub size_request {	3531	sub size_request {
3135	(32, 8)	3532	my ($self) = @_;
		3533
		3534	if ($::CONN) {
		3535	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3536	if (my $tex = $::CONN->{texture}[$faceid]) {
		3537	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3538	} else {
		3539	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3540	$self->realloc;
		3541	});
		3542	}
		3543	}
		3544	}
		3545
		3546	($self->{size_w} || 8, $self->{size_h} || 8)
3136	}	3547	}
3137		3548
3138	sub update {	3549	sub update {
3139	my ($self) = @_;	3550	my ($self) = @_;
3140		3551
3141	return unless $self->{visible};	3552	return unless $self->{visible};
3142		3553
3143	$self->SUPER::update;	3554	$self->SUPER::update;
3144	}	3555	}
3145		3556
		3557	sub invoke_visibility_change {
		3558	my ($self) = @_;
		3559
		3560	$self->update_timer;
		3561
		3562	0
		3563	}
		3564
3146	sub _draw {	3565	sub _draw {
3147	my ($self) = @_;	3566	my ($self) = @_;
3148		3567
3149	return unless $::CONN;	3568	return unless $::CONN;
3150		3569
3151	$self->SUPER::_draw;	3570	$self->SUPER::_draw;
3152		3571
3153	my $face;
3154
3155	if ($self->{frame}) {
3156	my $anim = $::CONN->{anim}[$self->{anim}];	3572	my $faceid = $::CONN->{faceid}[$self->{face}]
3157		3573	or return;
3158	$face = $anim->[ $self->{frame} % @$anim ]
3159	if $anim && @$anim;
3160	}
3161		3574
3162	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3575	my $tex = $::CONN->{texture}[$faceid];
3163		3576
3164	if ($tex) {	3577	if ($tex) {
3165	glEnable GL_TEXTURE_2D;	3578	glEnable GL_TEXTURE_2D;
3166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3579	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3167	glColor 0, 0, 0, 1;	3580	glColor 0, 0, 0, 1;
…		…
3171	}	3584	}
3172		3585
3173	sub destroy {	3586	sub destroy {
3174	my ($self) = @_;	3587	my ($self) = @_;
3175		3588
3176	$self->{timer}->cancel	3589	(delete $self->{timer})->cancel
3177	if $self->{timer};	3590	if $self->{timer};
3178		3591
3179	$self->SUPER::destroy;	3592	$self->SUPER::destroy;
3180	}	3593	}
3181		3594
…		…
3183		3596
3184	package CFPlus::UI::Buttonbar;	3597	package CFPlus::UI::Buttonbar;
3185		3598
3186	our @ISA = CFPlus::UI::HBox::;	3599	our @ISA = CFPlus::UI::HBox::;
3187		3600
3188	# TODO: should actualyl wrap buttons and other goodies.	3601	# TODO: should actually wrap buttons and other goodies.
3189		3602
3190	#############################################################################	3603	#############################################################################
3191		3604
3192	package CFPlus::UI::Menu;	3605	package CFPlus::UI::Menu;
3193		3606
3194	our @ISA = CFPlus::UI::FancyFrame::;	3607	our @ISA = CFPlus::UI::Toplevel::;
3195		3608
3196	use CFPlus::OpenGL;	3609	use CFPlus::OpenGL;
3197		3610
3198	sub new {	3611	sub new {
3199	my $class = shift;	3612	my $class = shift;
…		…
3377	}	3790	}
3378		3791
3379	sub add {	3792	sub add {
3380	my ($self, $title, $widget, $tooltip) = @_;	3793	my ($self, $title, $widget, $tooltip) = @_;
3381		3794
3382	Scalar::Util::weaken $self;	3795	CFPlus::weaken $self;
3383		3796
3384	$self->{buttonbar}->add (new CFPlus::UI::Button	3797	$self->{buttonbar}->add (new CFPlus::UI::Button
3385	markup => $title,	3798	markup => $title,
3386	tooltip => $tooltip,	3799	tooltip => $tooltip,
3387	on_activate => sub { $self->set_current_page ($widget) },	3800	on_activate => sub { $self->set_current_page ($widget) },
…		…
3471	my $self = $class->SUPER::new (	3884	my $self = $class->SUPER::new (
3472	fontsize => 0.8,	3885	fontsize => 0.8,
3473	@_,	3886	@_,
3474	);	3887	);
3475		3888
3476	Scalar::Util::weaken (my $this = $self);	3889	CFPlus::weaken (my $this = $self);
3477		3890
3478	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3891	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3479		3892
3480	$self	3893	$self
3481	}	3894	}
…		…
3604	$self->SUPER::destroy;	4017	$self->SUPER::destroy;
3605	}	4018	}
3606		4019
3607	#############################################################################	4020	#############################################################################
3608		4021
3609	package CFPlus::UI::Inventory;
3610
3611	our @ISA = CFPlus::UI::Table::;
3612
3613	sub new {
3614	my $class = shift;
3615
3616	my $self = $class->SUPER::new (
3617	col_expand => [0, 1, 0],
3618	items => [],
3619	@_,
3620	);
3621
3622	$self->set_sort_order (undef);
3623
3624	$self
3625	}
3626
3627	sub update_items {
3628	my ($self) = @_;
3629
3630	$self->clear;
3631
3632	my @item = $self->{sort}->(@{ $self->{items} });
3633
3634	my @adds;
3635	my $row = 0;
3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
3637	CFPlus::Item::update_widgets $item;
3638
3639	push @adds, 0, $row, $item->{face_widget};
3640	push @adds, 1, $row, $item->{desc_widget};
3641	push @adds, 2, $row, $item->{weight_widget};
3642
3643	$row++;
3644	}
3645
3646	$self->add (@adds);
3647	}
3648
3649	sub set_sort_order {
3650	my ($self, $order) = @_;
3651
3652	$self->{sort} = $order ||= sub {
3653	sort {
3654	$a->{type} <=> $b->{type}
3655	or $a->{name} cmp $b->{name}
3656	} @_
3657	};
3658
3659	$self->update_items;
3660	}
3661
3662	sub set_items {
3663	my ($self, $items) = @_;
3664
3665	$self->{items} = [$items ? values %$items : ()];
3666	$self->update_items;
3667	}
3668
3669	#############################################################################
3670
3671	package CFPlus::UI::SpellList;
3672
3673	our @ISA = CFPlus::UI::Table::;
3674
3675	sub new {
3676	my $class = shift;
3677
3678	my $self = $class->SUPER::new (
3679	binding => [],
3680	commands => [],
3681	@_,
3682	)
3683	}
3684
3685	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698	sub rebuild_spell_list {
3699	my ($self) = @_;
3700
3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3702	$self->clear;
3703
3704	return unless $::CONN;
3705
3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712	my $row = 0;
3713
3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715	my $spell = $self->{spell}{$_};
3716
3717	$row++;
3718
3719	my $spell_cb = sub {
3720	my ($widget, $ev) = @_;
3721
3722	if ($ev->{button} == 1) {
3723	$::CONN->user_send ("cast $spell->{name}");
3724	} elsif ($ev->{button} == 2) {
3725	$::CONN->user_send ("invoke $spell->{name}");
3726	} elsif ($ev->{button} == 3) {
3727	(new CFPlus::UI::Menu
3728	items => [
3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731	],
3732	)->popup ($ev);
3733	} else {
3734	return 0;
3735	}
3736
3737	1
3738	};
3739
3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742	#TODO: add path info to tooltip
3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745	$self->add (0, $row, new CFPlus::UI::Face
3746	face => $spell->{face},
3747	can_hover => 1,
3748	can_events => 1,
3749	tooltip => $tooltip,
3750	on_button_down => $spell_cb,
3751	);
3752
3753	$self->add (1, $row, new CFPlus::UI::Label
3754	expand => 1,
3755	text => $spell->{name},
3756	can_hover => 1,
3757	can_events => 1,
3758	tooltip => $tooltip,
3759	on_button_down => $spell_cb,
3760	);
3761
3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766	}
3767	});
3768	}
3769
3770	sub add_spell {
3771	my ($self, $spell) = @_;
3772
3773	$self->{spell}->{$spell->{name}} = $spell;
3774	$self->rebuild_spell_list;
3775	}
3776
3777	sub remove_spell {
3778	my ($self, $spell) = @_;
3779
3780	delete $self->{spell}->{$spell->{name}};
3781	$self->rebuild_spell_list;
3782	}
3783
3784	sub clear_spells {
3785	my ($self) = @_;
3786
3787	$self->{spell} = {};
3788	$self->rebuild_spell_list;
3789	}
3790
3791	#############################################################################
3792
3793	package CFPlus::UI::Root;	4022	package CFPlus::UI::Root;
3794		4023
3795	our @ISA = CFPlus::UI::Container::;	4024	our @ISA = CFPlus::UI::Container::;
3796		4025
3797	use List::Util qw(min max);	4026	use List::Util qw(min max);
…		…
3804	my $self = $class->SUPER::new (	4033	my $self = $class->SUPER::new (
3805	visible => 1,	4034	visible => 1,
3806	@_,	4035	@_,
3807	);	4036	);
3808		4037
3809	Scalar::Util::weaken ($self->{root} = $self);	4038	CFPlus::weaken ($self->{root} = $self);
3810		4039
3811	$self	4040	$self
3812	}	4041	}
3813		4042
3814	sub size_request {	4043	sub size_request {
…		…
4009	while ($self->{post_alloc_hook}) {	4238	while ($self->{post_alloc_hook}) {
4010	$_->()	4239	$_->()
4011	for values %{delete $self->{post_alloc_hook}};	4240	for values %{delete $self->{post_alloc_hook}};
4012	}	4241	}
4013		4242
4014
4015	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4243	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4016	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4244	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4017	glClear GL_COLOR_BUFFER_BIT;	4245	glClear GL_COLOR_BUFFER_BIT;
4018		4246
4019	glMatrixMode GL_PROJECTION;	4247	glMatrixMode GL_PROJECTION;
…		…
4023	glLoadIdentity;	4251	glLoadIdentity;
4024		4252
4025	{	4253	{
4026	package CFPlus::UI::Base;	4254	package CFPlus::UI::Base;
4027		4255
4028	($draw_x, $draw_y, $draw_w, $draw_h) =	4256	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4029	(0, 0, $self->{w}, $self->{h});	4257	(0, 0, $self->{w}, $self->{h});
4030	}
4031		4258
4032	$self->_draw;	4259	$self->_draw;
		4260	}
4033	}	4261	}
4034		4262
4035	#############################################################################	4263	#############################################################################
4036		4264
4037	package CFPlus::UI;	4265	package CFPlus::UI;

Diff Legend

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