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.350 by root, Sat Aug 19 18:39:24 2006 UTC vs.
Revision 1.411 by root, Sun Jul 22 19:34:59 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) = @_;
…		…
580		593
581	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
582	# functions seems pointless.	595	# functions seems pointless.
583	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
584		597
585	sub draw {	598	#sub draw {
586	my ($self) = @_;	599	#CFPlus.xs
587
588	return unless $self->{h} && $self->{w};
589
590	# update screen rectangle
591	local $draw_x = $draw_x + $self->{x};
592	local $draw_y = $draw_y + $self->{y};
593
594	# skip widgets that are entirely outside the drawing area
595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
597
598	glPushMatrix;
599	glTranslate $self->{x}, $self->{y}, 0;
600
601	if ($self == $HOVER && $self->{can_hover}) {
602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
603	glEnable GL_BLEND;
604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
605	glBegin GL_QUADS;
606	glVertex 0 , 0;
607	glVertex $self->{w}, 0;
608	glVertex $self->{w}, $self->{h};
609	glVertex 0 , $self->{h};
610	glEnd;
611	glDisable GL_BLEND;
612	}
613
614	if ($ENV{CFPLUS_DEBUG} & 1) {
615	glPushMatrix;
616	glColor 1, 1, 0, 1;
617	glTranslate 0.375, 0.375;
618	glBegin GL_LINE_LOOP;
619	glVertex 0 , 0;
620	glVertex $self->{w} - 1, 0;
621	glVertex $self->{w} - 1, $self->{h} - 1;
622	glVertex 0 , $self->{h} - 1;
623	glEnd;
624	glPopMatrix;
625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
626	}
627
628	$self->_draw;
629	glPopMatrix;
630	}
631		600
632	sub _draw {	601	sub _draw {
633	my ($self) = @_;	602	my ($self) = @_;
634		603
635	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
…		…
637		606
638	sub DESTROY {	607	sub DESTROY {
639	my ($self) = @_;	608	my ($self) = @_;
640		609
641	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
642
643	delete $WIDGET{$self+0};
644		611
645	eval { $self->destroy };	612	eval { $self->destroy };
646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
647	}	616	}
648		617
649	#############################################################################	618	#############################################################################
650		619
651	package CFPlus::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
…		…
727	can_events => 0,	696	can_events => 0,
728	%arg,	697	%arg,
729	);	698	);
730		699
731	$self->add (@$children)	700	$self->add (@$children)
732	if $children;	701	if $children && @$children;
733		702
734	$self	703	$self
735	}	704	}
736		705
737	sub realloc {	706	sub realloc {
…		…
746	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
747		716
748	$_->set_parent ($self)	717	$_->set_parent ($self)
749	for @widgets;	718	for @widgets;
750		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
751	use sort 'stable';	721	use sort 'stable';
752		722
753	$self->{children} = [	723	$self->{children} = [
754	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
755	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
756	];	726	];
757		727
758	$self->realloc;	728	$self->realloc;
		729
		730	map $_+0, @widgets
759	}	731	}
760		732
761	sub children {	733	sub children {
762	@{ $_[0]{children} }	734	@{ $_[0]{children} }
763	}	735	}
…		…
774	}	746	}
775		747
776	sub clear {	748	sub clear {
777	my ($self) = @_;	749	my ($self) = @_;
778		750
779	my $children = delete $self->{children};	751	my $children = $self->{children};
780	$self->{children} = [];	752	$self->{children} = [];
781		753
782	for (@$children) {	754	for (@$children) {
783	delete $_->{parent};	755	delete $_->{parent};
784	$_->hide;	756	$_->hide;
…		…
898	glClear GL_COLOR_BUFFER_BIT;	870	glClear GL_COLOR_BUFFER_BIT;
899		871
900	{	872	{
901	package CFPlus::UI::Base;	873	package CFPlus::UI::Base;
902		874
903	($draw_x, $draw_y, $draw_w, $draw_h) =	875	local ($draw_x, $draw_y, $draw_w, $draw_h) =
904	(0, 0, $self->{w}, $self->{h});	876	(0, 0, $self->{w}, $self->{h});
		877
		878	$self->_render;
905	}	879	}
906
907	$self->_render;
908	};	880	};
909	}	881	}
910		882
911	sub _draw {	883	sub _draw {
912	my ($self) = @_;	884	my ($self) = @_;
…		…
924	}	896	}
925		897
926	#############################################################################	898	#############################################################################
927		899
928	package CFPlus::UI::ViewPort;	900	package CFPlus::UI::ViewPort;
		901
		902	use List::Util qw(min max);
929		903
930	our @ISA = CFPlus::UI::Window::;	904	our @ISA = CFPlus::UI::Window::;
931		905
932	sub new {	906	sub new {
933	my $class = shift;	907	my $class = shift;
…		…
942	sub size_request {	916	sub size_request {
943	my ($self) = @_;	917	my ($self) = @_;
944		918
945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	919	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
946		920
947	$w = 10 if $self->{scroll_x};	921	$w = 1 if $self->{scroll_x};
948	$h = 10 if $self->{scroll_y};	922	$h = 1 if $self->{scroll_y};
949		923
950	($w, $h)	924	($w, $h)
951	}	925	}
952		926
953	sub invoke_size_allocate {	927	sub invoke_size_allocate {
…		…
965	}	939	}
966		940
967	sub set_offset {	941	sub set_offset {
968	my ($self, $x, $y) = @_;	942	my ($self, $x, $y) = @_;
969		943
		944	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		945	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		946
		947	if ($x != $self->{view_x} or $y != $self->{view_y}) {
970	$self->{view_x} = int $x;	948	$self->{view_x} = $x;
971	$self->{view_y} = int $y;	949	$self->{view_y} = $y;
972		950
		951	$self->emit (changed => $x, $y);
973	$self->update;	952	$self->update;
		953	}
974	}	954	}
975		955
976	# hmm, this does not work for topleft of $self... but we should not ask for that	956	# hmm, this does not work for topleft of $self... but we should not ask for that
977	sub coord2local {	957	sub coord2local {
978	my ($self, $x, $y) = @_;	958	my ($self, $x, $y) = @_;
…		…
993	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
994		974
995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
997	) {	977	) {
998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
999	} else {	979	} else {
1000	$self->CFPlus::UI::Base::find_widget ($x, $y)	980	$self->CFPlus::UI::Base::find_widget ($x, $y)
1001	}	981	}
1002	}	982	}
1003		983
…		…
1014		994
1015	#############################################################################	995	#############################################################################
1016		996
1017	package CFPlus::UI::ScrolledWindow;	997	package CFPlus::UI::ScrolledWindow;
1018		998
1019	our @ISA = CFPlus::UI::HBox::;	999	our @ISA = CFPlus::UI::Table::;
1020		1000
1021	sub new {	1001	sub new {
1022	my ($class, %arg) = @_;	1002	my ($class, %arg) = @_;
1023		1003
1024	my $child = delete $arg{child};	1004	my $child = delete $arg{child};
1025		1005
1026	my $self;	1006	my $self;
1027		1007
1028	my $slider = new CFPlus::UI::Slider	1008	my $hslider = new CFPlus::UI::Slider
		1009	col => 0,
		1010	row => 1,
		1011	vertical => 0,
		1012	range => [0, 0, 1, 0.01], # HACK fix
		1013	on_changed => sub {
		1014	$self->{hpos} = $_[1];
		1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1016	},
		1017	;
		1018
		1019	my $vslider = new CFPlus::UI::Slider
		1020	col => 1,
		1021	row => 0,
1029	vertical => 1,	1022	vertical => 1,
1030	range => [0, 0, 1, 0.01], # HACK fix	1023	range => [0, 0, 1, 0.01], # HACK fix
1031	on_changed => sub {	1024	on_changed => sub {
1032	$self->{vp}->set_offset (0, $_[1]);	1025	$self->{vpos} = $_[1];
		1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1033	},	1027	},
1034	;	1028	;
1035		1029
1036	$self = $class->SUPER::new (	1030	$self = $class->SUPER::new (
1037	vp => (new CFPlus::UI::ViewPort expand => 1),	1031	scroll_x => 0,
		1032	scroll_y => 1,
1038	can_events => 1,	1033	can_events => 1,
1039	slider => $slider,	1034	hslider => $hslider,
		1035	vslider => $vslider,
		1036	col_expand => [1, 0],
		1037	row_expand => [1, 0],
1040	%arg,	1038	%arg,
1041	);	1039	);
1042		1040
		1041	$self->{vp} = new CFPlus::UI::ViewPort
		1042	col => 0,
		1043	row => 0,
		1044	expand => 1,
		1045	scroll_x => $self->{scroll_x},
		1046	scroll_y => $self->{scroll_y},
		1047	on_changed => sub {
		1048	my ($vp, $x, $y) = @_;
		1049
		1050	$vp->{parent}{hslider}->set_value ($x);
		1051	$vp->{parent}{vslider}->set_value ($y);
		1052
		1053	0
		1054	},
		1055	on_size_allocate => sub {
		1056	my ($vp, $w, $h) = @_;
		1057	$vp->{parent}->update_slider;
		1058	0
		1059	},
		1060	;
		1061
1043	$self->SUPER::add ($self->{vp}, $self->{slider});	1062	$self->SUPER::add ($self->{vp});
		1063
1044	$self->add ($child) if $child;	1064	$self->add ($child) if $child;
1045		1065
1046	$self	1066	$self
1047	}	1067	}
1048
1049	#TODO# update range on size_allocate depending on child
1050		1068
1051	sub add {	1069	sub add {
1052	my ($self, $widget) = @_;	1070	my ($self, $widget) = @_;
1053		1071
1054	$self->{vp}->add ($self->{child} = $widget);	1072	$self->{vp}->add ($self->{child} = $widget);
1055	}	1073	}
1056		1074
		1075	sub update_slider {
		1076	my ($self) = @_;
		1077
		1078	my $child = ($self->{vp} or return)->child;
		1079
		1080	if ($self->{scroll_x}) {
		1081	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1082	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1083
		1084	my $visible = $w1 > $w2;
		1085	if ($visible != $self->{hslider_visible}) {
		1086	$self->{hslider_visible} = $visible;
		1087	$visible ? $self->SUPER::add ($self->{hslider})
		1088	: $self->SUPER::remove ($self->{hslider});
		1089	}
		1090	}
		1091
		1092	if ($self->{scroll_y}) {
		1093	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1094	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1095
		1096	my $visible = $h1 > $h2;
		1097	if ($visible != $self->{vslider_visible}) {
		1098	$self->{vslider_visible} = $visible;
		1099	$visible ? $self->SUPER::add ($self->{vslider})
		1100	: $self->SUPER::remove ($self->{vslider});
		1101	}
		1102	}
		1103	}
		1104
		1105	sub start_dragging {
		1106	my ($self, $ev) = @_;
		1107
		1108	$self->grab_focus;
		1109
		1110	my $ox = $self->{vp}{view_x};
		1111	my $oy = $self->{vp}{view_y};
		1112
		1113	$self->{motion} = sub {
		1114	my ($ev, $x, $y) = @_;
		1115
		1116	$ox -= $ev->{xrel};
		1117	$oy -= $ev->{yrel};
		1118
		1119	$self->{vp}->set_offset ($ox, $oy);
		1120	};
		1121	}
		1122
1057	sub invoke_mouse_wheel {	1123	sub invoke_mouse_wheel {
1058	my ($self, $ev) = @_;	1124	my ($self, $ev) = @_;
1059		1125
1060	return 0 unless $ev->{dy}; # only vertical movements
1061
1062	$self->{slider}->emit (mouse_wheel => $ev);	1126	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1127	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1063		1128
1064	1	1129	1
1065	}	1130	}
1066		1131
1067	sub update_slider {	1132	sub invoke_button_down {
1068	my ($self) = @_;	1133	my ($self, $ev, $x, $y) = @_;
1069		1134
1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1135	if ($ev->{button} == 2) {
1071	}	1136	$self->start_dragging ($ev);
		1137	return 1;
		1138	}
1072		1139
1073	sub update {	1140	0
1074	my ($self) = @_;	1141	}
1075		1142
1076	$self->SUPER::update;	1143	sub invoke_button_up {
		1144	my ($self, $ev, $x, $y) = @_;
1077		1145
1078	$self->update_slider;	1146	if (delete $self->{motion}) {
		1147	return 1;
		1148	}
		1149
		1150	0
		1151	}
		1152
		1153	sub invoke_mouse_motion {
		1154	my ($self, $ev, $x, $y) = @_;
		1155
		1156	if ($self->{motion}) {
		1157	$self->{motion}->($ev, $x, $y);
		1158	return 1;
		1159	}
		1160
		1161	0
1079	}	1162	}
1080		1163
1081	sub invoke_size_allocate {	1164	sub invoke_size_allocate {
1082	my ($self, $w, $h) = @_;	1165	my ($self, $w, $h) = @_;
1083		1166
1084	$self->update_slider;	1167	$self->update_slider;
1085
1086	$self->SUPER::invoke_size_allocate ($w, $h)	1168	$self->SUPER::invoke_size_allocate ($w, $h)
1087	}	1169	}
1088		1170
1089	#############################################################################	1171	#############################################################################
1090		1172
…		…
1240		1322
1241	my @border =	1323	my @border =
1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1324	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);	1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1244		1326
		1327	my @icon =
		1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1329	qw(x1_move.png x1_resize.png);
		1330
1245	sub new {	1331	sub new {
1246	my ($class, %arg) = @_;	1332	my ($class, %arg) = @_;
1247		1333
1248	my $self = $class->SUPER::new (	1334	my $self = $class->SUPER::new (
1249	bg => [1, 1, 1, 1],	1335	bg => [1, 1, 1, 1],
…		…
1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1418		1504
1419	my $border = $self->border;	1505	my $border = $self->border;
1420		1506
1421	glColor @{ $self->{border_bg} };	1507	glColor @{ $self->{border_bg} };
1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1512
		1513	# move
		1514	my $w2 = ($w - $border) * .5;
		1515	my $h2 = ($h - $border) * .5;
		1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1519
		1520	# resize
		1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1523	unless $self->{has_close_button};
		1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1426		1526
1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1428	glColor @{ $self->{bg} };	1528	glColor @{ $self->{bg} };
1429		1529
1430	# TODO: repeat texture not scale	1530	# TODO: repeat texture not scale
…		…
1451		1551
1452	#############################################################################	1552	#############################################################################
1453		1553
1454	package CFPlus::UI::Table;	1554	package CFPlus::UI::Table;
1455		1555
1456	our @ISA = CFPlus::UI::Base::;	1556	our @ISA = CFPlus::UI::Container::;
1457		1557
1458	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1459		1559
1460	use CFPlus::OpenGL;	1560	use CFPlus::OpenGL;
1461		1561
1462	sub new {	1562	sub new {
1463	my $class = shift;	1563	my $class = shift;
1464		1564
1465	$class->SUPER::new (	1565	$class->SUPER::new (
1466	col_expand => [],	1566	col_expand => [],
		1567	row_expand => [],
1467	@_,	1568	@_,
1468	)	1569	)
1469	}	1570	}
1470		1571
1471	sub children {
1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1473	}
1474
1475	sub add {	1572	sub add {
		1573	my ($self, @widgets) = @_;
		1574
		1575	for my $child (@widgets) {
		1576	$child->{rowspan} ||= 1;
		1577	$child->{colspan} ||= 1;
		1578	}
		1579
		1580	$self->SUPER::add (@widgets);
		1581	}
		1582
		1583	sub add_at {
1476	my ($self) = shift;	1584	my $self = shift;
		1585
		1586	my @widgets;
1477		1587
1478	while (@_) {	1588	while (@_) {
1479	my ($x, $y, $child) = splice @_, 0, 3, ();	1589	my ($col, $row, $child) = splice @_, 0, 3, ();
1480	$child->set_parent ($self);
1481	$self->{children}[$y][$x] = $child;
1482	}
1483		1590
1484	$self->{force_realloc} = 1;	1591	$child->{row} = $row;
1485	$self->{force_size_alloc} = 1;	1592	$child->{col} = $col;
1486	$self->realloc;
1487	}
1488		1593
1489	sub remove {	1594	push @widgets, $child;
		1595	}
		1596
		1597	$self->add (@widgets);
		1598	}
		1599
		1600	sub get_wh {
1490	my ($self, $child) = @_;	1601	my ($self) = @_;
1491		1602
1492	# TODO: not yet implemented	1603	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		1604
1499	my @children = $self->children;	1605	my @children = $self->children;
1500	delete $self->{children};	1606
		1607	# first pass, columns
		1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1610
		1611	my $sw = sum @w[$c .. $c + $cs - 1];
		1612
		1613	if ($w > $sw) {
		1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1615	}
1501		1616	}
1502	for (@children) {
1503	delete $_->{parent};
1504	$_->hide;
1505	}
1506		1617
1507	$self->realloc;	1618	# second pass, rows
1508	}	1619	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)};	1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1523		1621
1524	$w[$x] = max $w[$x], $w;	1622	my $sh = sum @h[$r .. $r + $rs - 1];
1525	$h[$y] = max $h[$y], $h;	1623
		1624	if ($h > $sh) {
		1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1526	}	1626	}
1527	}	1627	}
1528		1628
1529	(\@w, \@h)	1629	(\@w, \@h)
1530	}	1630	}
…		…
1546	my ($ws, $hs) = $self->get_wh;	1646	my ($ws, $hs) = $self->get_wh;
1547		1647
1548	my $req_w = (sum @$ws) || 1;	1648	my $req_w = (sum @$ws) || 1;
1549	my $req_h = (sum @$hs) || 1;	1649	my $req_h = (sum @$hs) || 1;
1550		1650
1551	# TODO: nicer code && do row_expand	1651	# now linearly scale the rows/columns to the allocated size
1552	my @col_expand = @{$self->{col_expand}};	1652	my @col_expand = @{$self->{col_expand}};
1553	@col_expand = (1) x @$ws unless @col_expand;	1653	@col_expand = (1) x @$ws unless @col_expand;
1554	my $col_expand = (sum @col_expand) || 1;	1654	my $col_expand = (sum @col_expand) || 1;
1555		1655
1556	# linearly scale sizes
1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1559		1657
1560	CFPlus::UI::harmonize $ws;	1658	CFPlus::UI::harmonize $ws;
		1659
		1660	my @row_expand = @{$self->{row_expand}};
		1661	@row_expand = (1) x @$ws unless @row_expand;
		1662	my $row_expand = (sum @row_expand) || 1;
		1663
		1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1665
1561	CFPlus::UI::harmonize $hs;	1666	CFPlus::UI::harmonize $hs;
1562		1667
1563	my $y;	1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1564		1670
1565	for my $r (0 .. $#{$self->{children}}) {	1671	for my $widget ($self->children) {
1566	my $row = $self->{children}[$r]	1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1567	or next;
1568		1673
1569	my $x = 0;	1674	$widget->configure (
1570	my $row_h = $hs->[$r];	1675	$x[$c], $y[$r],
		1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1571		1677	);
1572	for my $c (0 .. $#$row) {	1678	}
1573	my $col_w = $ws->[$c];
1574		1679
1575	if (my $widget = $row->[$c]) {	1680	1
1576	$widget->configure ($x, $y, $col_w, $row_h);	1681	}
1577	}
1578		1682
1579	$x += $col_w;	1683	#############################################################################
		1684
		1685	package CFPlus::UI::Fixed;
		1686
		1687	use List::Util qw(min max);
		1688
		1689	our @ISA = CFPlus::UI::Container::;
		1690
		1691	sub _scale($$$) {
		1692	my ($rel, $val, $max) = @_;
		1693
		1694	$rel ? $val * $max : $val
		1695	}
		1696
		1697	sub size_request {
		1698	my ($self) = @_;
		1699
		1700	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1701
		1702	# determine overall size by querying abs widgets
		1703	for my $child ($self->visible_children) {
		1704	unless ($child->{c_rel}) {
		1705	my $x = $child->{c_x};
		1706	my $y = $child->{c_y};
		1707
		1708	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1709	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1580	}	1710	}
		1711	}
1581		1712
1582	$y += $row_h;	1713	my $W = $x2 - $x1;
		1714	my $H = $y2 - $y1;
		1715
		1716	# now layout remaining widgets
		1717	for my $child ($self->visible_children) {
		1718	if ($child->{c_rel}) {
		1719	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1720	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1721
		1722	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1723	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1724	}
		1725	}
		1726
		1727	my $W = $x2 - $x1;
		1728	my $H = $y2 - $y1;
		1729
		1730	($W, $H)
		1731	}
		1732
		1733	sub invoke_size_allocate {
		1734	my ($self, $W, $H) = @_;
		1735
		1736	for my $child ($self->visible_children) {
		1737	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1738	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1739
		1740	$x += $child->{c_halign} * $child->{req_w};
		1741	$y += $child->{c_valign} * $child->{req_h};
		1742
		1743	$child->configure ($x, $y, $child->{req_w}, $child->{req_h});
1583	}	1744	}
1584		1745
1585	1	1746	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	}	1747	}
1611		1748
1612	#############################################################################	1749	#############################################################################
1613		1750
1614	package CFPlus::UI::Box;	1751	package CFPlus::UI::Box;
…		…
1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2011	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2012	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1876	: ($self->{h} - $size->[1]) * 0.5);	2013	: ($self->{h} - $size->[1]) * 0.5);
1877	};	2014	};
1878		2015
1879	my $w = List::Util::min $self->{w} + 4, $size->[0];	2016	# unless ($self->{list}) {
1880	my $h = List::Util::min $self->{h} + 2, $size->[1];	2017	# $self->{list} = CFPlus::OpenGL::glGenList;
		2018	# CFPlus::OpenGL::glNewList $self->{list};
		2019	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2020	# CFPlus::OpenGL::glEndList;
		2021	# }
		2022	#
		2023	# CFPlus::OpenGL::glCallList $self->{list};
1881		2024
1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2025	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1883	}	2026	}
		2027
		2028	#sub destroy {
		2029	# my ($self) = @_;
		2030	#
		2031	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2032	#
		2033	# $self->SUPER::destroy;
		2034	#}
1884		2035
1885	#############################################################################	2036	#############################################################################
1886		2037
1887	package CFPlus::UI::EntryBase;	2038	package CFPlus::UI::EntryBase;
1888		2039
…		…
1900	active_fg => [0, 0, 0],	2051	active_fg => [0, 0, 0],
1901	can_hover => 1,	2052	can_hover => 1,
1902	can_focus => 1,	2053	can_focus => 1,
1903	valign => 0,	2054	valign => 0,
1904	can_events => 1,	2055	can_events => 1,
		2056	ellipsise => 0,
1905	#text => ...	2057	#text => ...
1906	#hidden => "*",	2058	#hidden => "*",
1907	@_	2059	@_
1908	)	2060	)
1909	}	2061	}
…		…
1953	my $mod = $ev->{mod};	2105	my $mod = $ev->{mod};
1954	my $sym = $ev->{sym};	2106	my $sym = $ev->{sym};
1955	my $uni = $ev->{unicode};	2107	my $uni = $ev->{unicode};
1956		2108
1957	my $text = $self->get_text;	2109	my $text = $self->get_text;
		2110
		2111	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1958		2112
1959	if ($uni == 8) {	2113	if ($uni == 8) {
1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2114	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1961	} elsif ($uni == 127) {	2115	} elsif ($uni == 127) {
1962	substr $text, $self->{cursor}, 1, "";	2116	substr $text, $self->{cursor}, 1, "";
1963	} elsif ($sym == CFPlus::SDLK_LEFT) {	2117	} elsif ($sym == CFPlus::SDLK_LEFT) {
1964	--$self->{cursor} if $self->{cursor};	2118	--$self->{cursor} if $self->{cursor};
1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2119	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1966	++$self->{cursor} if $self->{cursor} < length $self->{text};	2120	++$self->{cursor} if $self->{cursor} < length $self->{text};
1967	} elsif ($sym == CFPlus::SDLK_HOME) {	2121	} elsif ($sym == CFPlus::SDLK_HOME) {
		2122	# what a hack
1968	$self->{cursor} = 0;	2123	$self->{cursor} =
		2124	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2125	? length $1
		2126	: 0;
1969	} elsif ($sym == CFPlus::SDLK_END) {	2127	} elsif ($sym == CFPlus::SDLK_END) {
		2128	# uh, again
		2129	$self->{cursor} =
		2130	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1970	$self->{cursor} = length $text;	2131	? $self->{cursor} + length $1
		2132	: length $self->{text};
1971	} elsif ($uni == 21) { # ctrl-u	2133	} elsif ($uni == 21) { # ctrl-u
1972	$text = "";	2134	$text = "";
1973	$self->{cursor} = 0;	2135	$self->{cursor} = 0;
1974	} elsif ($uni == 27) {	2136	} elsif ($uni == 27) {
1975	$self->emit ('escape');	2137	$self->emit ('escape');
1976	} elsif ($uni) {	2138	} elsif ($uni == 0x0d) {
		2139	substr $text, $self->{cursor}++, 0, "\012";
		2140	} elsif ($uni >= 0x20) {
1977	substr $text, $self->{cursor}++, 0, chr $uni;	2141	substr $text, $self->{cursor}++, 0, chr $uni;
1978	} else {	2142	} else {
1979	return 0;	2143	return 0;
1980	}	2144	}
1981		2145
1982	$self->_set_text ($text);	2146	$self->_set_text ($text);
1983		2147
1984	$self->realloc;	2148	$self->realloc;
		2149	$self->update;
1985		2150
1986	1	2151	1
1987	}	2152	}
1988		2153
1989	sub invoke_focus_in {	2154	sub invoke_focus_in {
…		…
2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2223	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2059	glEnd;	2224	glEnd;
2060	}	2225	}
2061	}	2226	}
2062		2227
		2228	#############################################################################
		2229
2063	package CFPlus::UI::Entry;	2230	package CFPlus::UI::Entry;
2064		2231
2065	our @ISA = CFPlus::UI::EntryBase::;	2232	our @ISA = CFPlus::UI::EntryBase::;
2066		2233
2067	use CFPlus::OpenGL;	2234	use CFPlus::OpenGL;
…		…
2069	sub invoke_key_down {	2236	sub invoke_key_down {
2070	my ($self, $ev) = @_;	2237	my ($self, $ev) = @_;
2071		2238
2072	my $sym = $ev->{sym};	2239	my $sym = $ev->{sym};
2073		2240
2074	if ($sym == 13) {	2241	if ($ev->{uni} == 0x0d || $sym == 13) {
2075	unshift @{$self->{history}},	2242	unshift @{$self->{history}},
2076	my $txt = $self->get_text;	2243	my $txt = $self->get_text;
2077		2244
2078	$self->{history_pointer} = -1;	2245	$self->{history_pointer} = -1;
2079	$self->{history_saveback} = '';	2246	$self->{history_saveback} = '';
…		…
2109	1	2276	1
2110	}	2277	}
2111		2278
2112	#############################################################################	2279	#############################################################################
2113		2280
		2281	package CFPlus::UI::TextEdit;
		2282
		2283	our @ISA = CFPlus::UI::EntryBase::;
		2284
		2285	use CFPlus::OpenGL;
		2286
		2287	sub move_cursor_ver {
		2288	my ($self, $dy) = @_;
		2289
		2290	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2291
		2292	$y += $dy;
		2293
		2294	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2295	$self->{cursor} = $index;
		2296	delete $self->{cur_h};
		2297	$self->update;
		2298	return;
		2299	}
		2300	}
		2301
		2302	sub invoke_key_down {
		2303	my ($self, $ev) = @_;
		2304
		2305	my $sym = $ev->{sym};
		2306
		2307	if ($sym == CFPlus::SDLK_UP) {
		2308	$self->move_cursor_ver (-1);
		2309	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2310	$self->move_cursor_ver (+1);
		2311	} else {
		2312	return $self->SUPER::invoke_key_down ($ev)
		2313	}
		2314
		2315	1
		2316	}
		2317
		2318	#############################################################################
		2319
2114	package CFPlus::UI::Button;	2320	package CFPlus::UI::Button;
2115		2321
2116	our @ISA = CFPlus::UI::Label::;	2322	our @ISA = CFPlus::UI::Label::;
2117		2323
2118	use CFPlus::OpenGL;	2324	use CFPlus::OpenGL;
2119		2325
2120	my @tex =	2326	my @tex =
2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2327	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2122	qw(b1_button_active.png);	2328	qw(b1_button_inactive.png b1_button_active.png);
2123		2329
2124	sub new {	2330	sub new {
2125	my $class = shift;	2331	my $class = shift;
2126		2332
2127	$class->SUPER::new (	2333	$class->SUPER::new (
2128	padding_x => 4,	2334	padding_x => 4,
2129	padding_y => 4,	2335	padding_y => 4,
2130	fg => [1, 1, 1],	2336	fg => [1.0, 1.0, 1.0],
2131	active_fg => [0, 0, 1],	2337	active_fg => [0.8, 0.8, 0.8],
2132	can_hover => 1,	2338	can_hover => 1,
2133	align => 0,	2339	align => 0,
2134	valign => 0,	2340	valign => 0,
2135	can_events => 1,	2341	can_events => 1,
2136	@_	2342	@_
…		…
2154		2360
2155	glEnable GL_TEXTURE_2D;	2361	glEnable GL_TEXTURE_2D;
2156	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157	glColor 0, 0, 0, 1;	2363	glColor 0, 0, 0, 1;
2158		2364
		2365	my $tex = $tex[$GRAB == $self];
2159	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2366	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2160		2367
2161	glDisable GL_TEXTURE_2D;	2368	glDisable GL_TEXTURE_2D;
2162		2369
2163	$self->SUPER::_draw;	2370	$self->SUPER::_draw;
2164	}	2371	}
…		…
2260	or Carp::croak "'path' or 'tex' attributes required";	2467	or Carp::croak "'path' or 'tex' attributes required";
2261		2468
2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2469	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2470	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2264		2471
2265	Scalar::Util::weaken $texture_cache{$self->{path}};	2472	CFPlus::weaken $texture_cache{$self->{path}};
2266		2473
2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2474	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268		2475
2269	$self	2476	$self
2270	}	2477	}
…		…
2617		2824
2618	$self->SUPER::invoke_button_down ($ev, $x, $y);	2825	$self->SUPER::invoke_button_down ($ev, $x, $y);
2619		2826
2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2827	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2621		2828
2622	$self->invoke_mouse_motion ($ev, $x, $y)	2829	$self->invoke_mouse_motion ($ev, $x, $y);
		2830
		2831	1
2623	}	2832	}
2624		2833
2625	sub invoke_mouse_motion {	2834	sub invoke_mouse_motion {
2626	my ($self, $ev, $x, $y) = @_;	2835	my ($self, $ev, $x, $y) = @_;
2627		2836
…		…
2643	sub invoke_mouse_wheel {	2852	sub invoke_mouse_wheel {
2644	my ($self, $ev) = @_;	2853	my ($self, $ev) = @_;
2645		2854
2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2855	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647		2856
		2857	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2858
2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2859	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649		2860
2650	! ! $delta	2861	1
2651	}	2862	}
2652		2863
2653	sub update {	2864	sub update {
2654	my ($self) = @_;	2865	my ($self) = @_;
2655		2866
…		…
2763	#font => default_font	2974	#font => default_font
2764	@_,	2975	@_,
2765		2976
2766	layout => (new CFPlus::Layout),	2977	layout => (new CFPlus::Layout),
2767	par => [],	2978	par => [],
		2979	max_par => 0,
2768	height => 0,	2980	height => 0,
2769	children => [	2981	children => [
2770	(new CFPlus::UI::Empty expand => 1),	2982	(new CFPlus::UI::Empty expand => 1),
2771	(new CFPlus::UI::Slider vertical => 1),	2983	(new CFPlus::UI::Slider vertical => 1),
2772	],	2984	],
…		…
2897		3109
2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3110	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899	push @{$self->{par}}, $para;	3111	push @{$self->{par}}, $para;
2900	}	3112	}
2901		3113
		3114	if (my $max = $self->{max_par}) {
		3115	shift @{$self->{par}} while @{$self->{par}} > $max;
		3116	}
		3117
2902	$self->{need_reflow}++;	3118	$self->{need_reflow}++;
2903	$self->update;	3119	$self->update;
2904	}	3120	}
2905		3121
2906	sub scroll_to_bottom {	3122	sub scroll_to_bottom {
…		…
2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3174	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2959		3175
2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3176	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2961	glClearColor 0, 0, 0, 0;	3177	glClearColor 0, 0, 0, 0;
2962	glClear GL_COLOR_BUFFER_BIT;	3178	glClear GL_COLOR_BUFFER_BIT;
		3179
		3180	package CFPlus::UI::Base;
		3181	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3182	(0, 0, $self->{w}, $self->{h});
2963		3183
2964	my $top = int $self->{children}[1]{range}[0];	3184	my $top = int $self->{children}[1]{range}[0];
2965		3185
2966	my $paridx = 0;	3186	my $paridx = 0;
2967	my $top_paragraph;	3187	my $top_paragraph;
…		…
3208		3428
3209	sub new {	3429	sub new {
3210	my $class = shift;	3430	my $class = shift;
3211		3431
3212	my $self = $class->SUPER::new (	3432	my $self = $class->SUPER::new (
		3433	size_w => 32,
		3434	size_h => 8,
3213	aspect => 1,	3435	aspect => 1,
3214	can_events => 0,	3436	can_events => 0,
3215	@_,	3437	@_,
3216	);	3438	);
3217		3439
3218	if ($self->{anim} && $self->{animspeed}) {	3440	if ($self->{anim} && $self->{animspeed}) {
3219	Scalar::Util::weaken (my $widget = $self);	3441	CFPlus::weaken (my $widget = $self);
3220		3442
		3443	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3444	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3221	$self->{timer} = Event->timer (	3445	$self->{timer} = Event->timer (
3222	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3223	hard => 1,	3446	parked => 1,
3224	interval => $self->{animspeed},
3225	cb => sub {	3447	cb => sub {
		3448	return unless $::CONN && $widget;
		3449
3226	++$widget->{frame};	3450	++$widget->{frame};
		3451	$widget->update_face;
3227	$widget->update;	3452	$widget->update;
		3453
		3454	$widget->update_timer;
3228	},	3455	},
3229	);	3456	);
		3457
		3458	$self->update_face;
		3459	$self->update_timer;
3230	}	3460	}
3231		3461
3232	$self	3462	$self
3233	}	3463	}
3234		3464
		3465	sub update_timer {
		3466	my ($self) = @_;
		3467
		3468	return unless $self->{timer};
		3469
		3470	if ($self->{visible}) {
		3471	$self->{timer}->at (
		3472	$self->{anim_start}
		3473	+ $self->{animspeed}
		3474	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3475	);
		3476	$self->{timer}->start;
		3477	} else {
		3478	$self->{timer}->stop;
		3479	}
		3480	}
		3481
		3482	sub update_face {
		3483	my ($self) = @_;
		3484
		3485	return unless $::CONN;
		3486
		3487	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3488	if ($anim && @$anim) {
		3489	delete $self->{wait_face};
		3490	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3491	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3492	}
		3493	}
		3494	}
		3495
3235	sub size_request {	3496	sub size_request {
3236	(32, 8)	3497	my ($self) = @_;
		3498
		3499	if ($::CONN) {
		3500	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3501	if (my $tex = $::CONN->{texture}[$faceid]) {
		3502	$self->{tex} = $tex;
		3503	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3504	} else {
		3505	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3506	$self->realloc;
		3507	});
		3508	}
		3509	}
		3510	}
		3511
		3512	($self->{size_w} || 8, $self->{size_h} || 8)
3237	}	3513	}
3238		3514
3239	sub update {	3515	sub update {
3240	my ($self) = @_;	3516	my ($self) = @_;
3241		3517
3242	return unless $self->{visible};	3518	return unless $self->{visible};
3243		3519
3244	$self->SUPER::update;	3520	$self->SUPER::update;
3245	}	3521	}
3246		3522
		3523	sub invoke_visibility_change {
		3524	my ($self) = @_;
		3525
		3526	$self->update_timer;
		3527
		3528	0
		3529	}
		3530
3247	sub _draw {	3531	sub _draw {
3248	my ($self) = @_;	3532	my ($self) = @_;
3249		3533
3250	return unless $::CONN;
3251
3252	$self->SUPER::_draw;	3534	$self->SUPER::_draw;
3253		3535
3254	my $face;	3536	if (my $tex = $self->{tex}) {
3255
3256	if ($self->{frame}) {
3257	my $anim = $::CONN->{anim}[$self->{anim}];
3258
3259	$face = $anim->[ $self->{frame} % @$anim ]
3260	if $anim && @$anim;
3261	}
3262
3263	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3264
3265	if ($tex) {
3266	glEnable GL_TEXTURE_2D;	3537	glEnable GL_TEXTURE_2D;
3267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3538	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3268	glColor 0, 0, 0, 1;	3539	glColor 0, 0, 0, 1;
3269	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3540	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3270	glDisable GL_TEXTURE_2D;	3541	glDisable GL_TEXTURE_2D;
…		…
3272	}	3543	}
3273		3544
3274	sub destroy {	3545	sub destroy {
3275	my ($self) = @_;	3546	my ($self) = @_;
3276		3547
3277	$self->{timer}->cancel	3548	(delete $self->{timer})->cancel
3278	if $self->{timer};	3549	if $self->{timer};
3279		3550
3280	$self->SUPER::destroy;	3551	$self->SUPER::destroy;
3281	}	3552	}
3282		3553
…		…
3284		3555
3285	package CFPlus::UI::Buttonbar;	3556	package CFPlus::UI::Buttonbar;
3286		3557
3287	our @ISA = CFPlus::UI::HBox::;	3558	our @ISA = CFPlus::UI::HBox::;
3288		3559
3289	# TODO: should actualyl wrap buttons and other goodies.	3560	# TODO: should actually wrap buttons and other goodies.
3290		3561
3291	#############################################################################	3562	#############################################################################
3292		3563
3293	package CFPlus::UI::Menu;	3564	package CFPlus::UI::Menu;
3294		3565
…		…
3478	}	3749	}
3479		3750
3480	sub add {	3751	sub add {
3481	my ($self, $title, $widget, $tooltip) = @_;	3752	my ($self, $title, $widget, $tooltip) = @_;
3482		3753
3483	Scalar::Util::weaken $self;	3754	CFPlus::weaken $self;
3484		3755
3485	$self->{buttonbar}->add (new CFPlus::UI::Button	3756	unless (ref $title) {
		3757	$title = new CFPlus::UI::Button
3486	markup => $title,	3758	markup => $title,
3487	tooltip => $tooltip,	3759	tooltip => $tooltip,
		3760	;
		3761	}
		3762
3488	on_activate => sub { $self->set_current_page ($widget) },	3763	$title->connect (activate => sub { $self->set_current_page ($widget) });
3489	);	3764	$self->{buttonbar}->add ($title);
3490		3765
3491	$self->{multiplexer}->add ($widget);	3766	$self->{multiplexer}->add ($widget);
3492	}	3767	}
3493		3768
3494	sub get_current_page {	3769	sub get_current_page {
…		…
3572	my $self = $class->SUPER::new (	3847	my $self = $class->SUPER::new (
3573	fontsize => 0.8,	3848	fontsize => 0.8,
3574	@_,	3849	@_,
3575	);	3850	);
3576		3851
3577	Scalar::Util::weaken (my $this = $self);	3852	CFPlus::weaken (my $this = $self);
3578		3853
3579	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3854	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3580		3855
3581	$self	3856	$self
3582	}	3857	}
…		…
3705	$self->SUPER::destroy;	3980	$self->SUPER::destroy;
3706	}	3981	}
3707		3982
3708	#############################################################################	3983	#############################################################################
3709		3984
3710	package CFPlus::UI::Inventory;
3711
3712	our @ISA = CFPlus::UI::Table::;
3713
3714	sub new {
3715	my $class = shift;
3716
3717	my $self = $class->SUPER::new (
3718	col_expand => [0, 1, 0],
3719	items => [],
3720	@_,
3721	);
3722
3723	$self->set_sort_order (undef);
3724
3725	$self
3726	}
3727
3728	sub update_items {
3729	my ($self) = @_;
3730
3731	$self->clear;
3732
3733	my @item = $self->{sort}->(@{ $self->{items} });
3734
3735	my @adds;
3736	my $row = 0;
3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
3738	CFPlus::Item::update_widgets $item;
3739
3740	push @adds, 0, $row, $item->{face_widget};
3741	push @adds, 1, $row, $item->{desc_widget};
3742	push @adds, 2, $row, $item->{weight_widget};
3743
3744	$row++;
3745	}
3746
3747	$self->add (@adds);
3748	}
3749
3750	sub set_sort_order {
3751	my ($self, $order) = @_;
3752
3753	$self->{sort} = $order ||= sub {
3754	sort {
3755	$a->{type} <=> $b->{type}
3756	or $a->{name} cmp $b->{name}
3757	} @_
3758	};
3759
3760	$self->update_items;
3761	}
3762
3763	sub set_items {
3764	my ($self, $items) = @_;
3765
3766	$self->{items} = [$items ? values %$items : ()];
3767	$self->update_items;
3768	}
3769
3770	#############################################################################
3771
3772	package CFPlus::UI::SpellList;
3773
3774	our @ISA = CFPlus::UI::Table::;
3775
3776	sub new {
3777	my $class = shift;
3778
3779	my $self = $class->SUPER::new (
3780	binding => [],
3781	commands => [],
3782	@_,
3783	)
3784	}
3785
3786	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3787
3788	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3789	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3790	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3791	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3792	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3793	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3794	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3795	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3796	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3798
3799	sub rebuild_spell_list {
3800	my ($self) = @_;
3801
3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3803	$self->clear;
3804
3805	return unless $::CONN;
3806
3807	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3808	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3809	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3810	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3812
3813	my $row = 0;
3814
3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3816	my $spell = $self->{spell}{$_};
3817
3818	$row++;
3819
3820	my $spell_cb = sub {
3821	my ($widget, $ev) = @_;
3822
3823	if ($ev->{button} == 1) {
3824	$::CONN->user_send ("cast $spell->{name}");
3825	} elsif ($ev->{button} == 2) {
3826	$::CONN->user_send ("invoke $spell->{name}");
3827	} elsif ($ev->{button} == 3) {
3828	(new CFPlus::UI::Menu
3829	items => [
3830	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3832	],
3833	)->popup ($ev);
3834	} else {
3835	return 0;
3836	}
3837
3838	1
3839	};
3840
3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3842
3843	#TODO: add path info to tooltip
3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3845
3846	$self->add (0, $row, new CFPlus::UI::Face
3847	face => $spell->{face},
3848	can_hover => 1,
3849	can_events => 1,
3850	tooltip => $tooltip,
3851	on_button_down => $spell_cb,
3852	);
3853
3854	$self->add (1, $row, new CFPlus::UI::Label
3855	expand => 1,
3856	text => $spell->{name},
3857	can_hover => 1,
3858	can_events => 1,
3859	tooltip => $tooltip,
3860	on_button_down => $spell_cb,
3861	);
3862
3863	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3864	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3865	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3867	}
3868	});
3869	}
3870
3871	sub add_spell {
3872	my ($self, $spell) = @_;
3873
3874	$self->{spell}->{$spell->{name}} = $spell;
3875	$self->rebuild_spell_list;
3876	}
3877
3878	sub remove_spell {
3879	my ($self, $spell) = @_;
3880
3881	delete $self->{spell}->{$spell->{name}};
3882	$self->rebuild_spell_list;
3883	}
3884
3885	sub clear_spells {
3886	my ($self) = @_;
3887
3888	$self->{spell} = {};
3889	$self->rebuild_spell_list;
3890	}
3891
3892	#############################################################################
3893
3894	package CFPlus::UI::Root;	3985	package CFPlus::UI::Root;
3895		3986
3896	our @ISA = CFPlus::UI::Container::;	3987	our @ISA = CFPlus::UI::Container::;
3897		3988
3898	use List::Util qw(min max);	3989	use List::Util qw(min max);
…		…
3905	my $self = $class->SUPER::new (	3996	my $self = $class->SUPER::new (
3906	visible => 1,	3997	visible => 1,
3907	@_,	3998	@_,
3908	);	3999	);
3909		4000
3910	Scalar::Util::weaken ($self->{root} = $self);	4001	CFPlus::weaken ($self->{root} = $self);
3911		4002
3912	$self	4003	$self
3913	}	4004	}
3914		4005
3915	sub size_request {	4006	sub size_request {
…		…
4010	while ($self->{refresh_hook}) {	4101	while ($self->{refresh_hook}) {
4011	$_->()	4102	$_->()
4012	for values %{delete $self->{refresh_hook}};	4103	for values %{delete $self->{refresh_hook}};
4013	}	4104	}
4014		4105
4015	if ($self->{realloc}) {	4106	while ($self->{realloc}) {
4016	my %queue;	4107	my %queue;
4017	my @queue;	4108	my @queue;
4018	my $widget;	4109	my $widget;
4019		4110
4020	outer:	4111	outer:
…		…
4067	}	4158	}
4068	}	4159	}
4069		4160
4070	delete $self->{realloc}{$widget+0};	4161	delete $self->{realloc}{$widget+0};
4071	}	4162	}
4072	}
4073		4163
4074	while (my $size_alloc = delete $self->{size_alloc}) {	4164	while (my $size_alloc = delete $self->{size_alloc}) {
4075	my @queue = sort { $b->{visible} <=> $a->{visible} }	4165	my @queue = sort { $a->{visible} <=> $b->{visible} }
4076	values %$size_alloc;	4166	values %$size_alloc;
4077		4167
4078	while () {	4168	while () {
4079	my $widget = pop @queue || last;	4169	my $widget = pop @queue || last;
4080		4170
4081	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4171	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4082		4172
4083	$w = 0 if $w < 0;
4084	$h = 0 if $h < 0;
4085
4086	$w = max $widget->{min_w}, $w;	4173	$w = max $widget->{min_w}, $w;
4087	$h = max $widget->{min_h}, $h;	4174	$h = max $widget->{min_h}, $h;
4088		4175
4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4176	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4177	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4091		4178
4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4179	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4180	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4094		4181
4095	$w = int $w + 0.5;	4182	$w = int $w + 0.5;
4096	$h = int $h + 0.5;	4183	$h = int $h + 0.5;
4097		4184
4098	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4185	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4099	$widget->{old_w} = $widget->{w};	4186	$widget->{old_w} = $widget->{w};
4100	$widget->{old_h} = $widget->{h};	4187	$widget->{old_h} = $widget->{h};
4101		4188
4102	$widget->{w} = $w;	4189	$widget->{w} = $w;
4103	$widget->{h} = $h;	4190	$widget->{h} = $h;
4104		4191
4105	$widget->emit (size_allocate => $w, $h);	4192	$widget->emit (size_allocate => $w, $h);
		4193	}
4106	}	4194	}
4107	}	4195	}
4108	}	4196	}
4109		4197
4110	while ($self->{post_alloc_hook}) {	4198	while ($self->{post_alloc_hook}) {
4111	$_->()	4199	$_->()
4112	for values %{delete $self->{post_alloc_hook}};	4200	for values %{delete $self->{post_alloc_hook}};
4113	}	4201	}
4114
4115		4202
4116	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4203	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4117	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4204	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4118	glClear GL_COLOR_BUFFER_BIT;	4205	glClear GL_COLOR_BUFFER_BIT;
4119		4206
…		…
4124	glLoadIdentity;	4211	glLoadIdentity;
4125		4212
4126	{	4213	{
4127	package CFPlus::UI::Base;	4214	package CFPlus::UI::Base;
4128		4215
4129	($draw_x, $draw_y, $draw_w, $draw_h) =	4216	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4130	(0, 0, $self->{w}, $self->{h});	4217	(0, 0, $self->{w}, $self->{h});
4131	}
4132		4218
4133	$self->_draw;	4219	$self->_draw;
		4220	}
4134	}	4221	}
4135		4222
4136	#############################################################################	4223	#############################################################################
4137		4224
4138	package CFPlus::UI;	4225	package CFPlus::UI;

Diff Legend

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