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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 UTC

1	package CFClient::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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
79	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	81	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	82	if $FOCUS;
82	}	83	}
83		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
		96	}
		97
84	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	99	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
87		101
88	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
90		106
91	$GRAB = $widget;	107	$GRAB = $widget;
92	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
93		109
94	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
95	}	111	}
96		112
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	113	if ($GRAB) {
98		114	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	115	# mousewheel
100	if $GRAB;	116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
		122	}
101	}	123	}
102		124
103	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	126	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		127
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		129
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		131
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	132	$GRAB->emit (button_up => $ev)
112	if $GRAB;	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		134
114	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	137	$grab->update if $grab;
117	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
118		139
		140	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	141	$TOOLTIP_WATCHER->cb->();
120	}	142	}
121	}	143	}
122		144
123	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
124	my ($ev) = @_;	146	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
126		148
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		150
129	if ($widget != $HOVER) {	151	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		152
132	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	154	if $HOVER;
140	}	155	}
141		156
142	# convert position array to integers	157	# convert position array to integers
143	sub harmonize {	158	sub harmonize {
…		…
193	reconfigure_widgets;	208	reconfigure_widgets;
194	}	209	}
195		210
196	#############################################################################	211	#############################################################################
197		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
198	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
199		222
200	use strict;	223	use strict;
201		224
202	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
203		226
204	sub new {	227	sub new {
205	my $class = shift;	228	my $class = shift;
206		229
207	my $self = bless {	230	my $self = bless {
…		…
212	h => undef,	235	h => undef,
213	can_events => 1,	236	can_events => 1,
214	@_	237	@_
215	}, $class;	238	}, $class;
216		239
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		241
219	for (keys %$self) {	242	for (keys %$self) {
220	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
222	}	245	}
223	}	246	}
224		247
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		253
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		256
234	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
247	sub show {	270	sub show {
248	my ($self) = @_;	271	my ($self) = @_;
249		272
250	return if $self->{parent};	273	return if $self->{parent};
251		274
252	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
253	}	276	}
254		277
255	sub set_visible {	278	sub set_visible {
256	my ($self) = @_;	279	my ($self) = @_;
257		280
…		…
278	delete $self->{root};	301	delete $self->{root};
279		302
280	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
282		305
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
285		308
286	$self->emit ("focus_out");	309	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
288	}	311	}
…		…
345	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
346		369
347	if ($self->{aspect}) {	370	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
349		372
350	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		375
353	# use alignment to adjust x, y	376	# use alignment to adjust x, y
354		377
355	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
397		420
398	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
399		422
400	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
401		424
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	428	}
406	}	429	}
407		430
408	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
409	sub coord2local {	432	sub coord2local {
410	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
411		434
		435	Carp::confess unless $self->{parent};#d#
		436
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	438	}
414		439
415	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
416	sub coord2global {	441	sub coord2global {
417	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
418		443
		444	Carp::confess unless $self->{parent};#d#
		445
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	447	}
421		448
422	sub invoke_focus_in {	449	sub invoke_focus_in {
423	my ($self) = @_;	450	my ($self) = @_;
…		…
452		479
453	$FOCUS->emit ("focus_out") if $FOCUS;	480	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	481	$self->emit ("focus_in");
455	}	482	}
456		483
457	sub invoke_mouse_motion { 1 }	484	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	485	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	486	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
461		489
462	sub invoke_button_down {	490	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
464		492
465	$self->grab_focus;	493	$self->grab_focus;
466		494
467	1	495	0
468	}	496	}
469		497
470	sub connect {	498	sub connect {
471	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
472		500
473	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
474	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
475		515
476	sub emit {	516	sub emit {
477	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
478		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
479	#d##TODO# stop propagating at first true, do not use sum	528	#d##TODO# stop propagating at first true, do not use sum
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483	}	532	}
484		533
485	sub find_widget {	534	sub find_widget {
486	my ($self, $x, $y) = @_;	535	my ($self, $x, $y) = @_;
487		536
…		…
571	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
574	glEnd;	623	glEnd;
575	glPopMatrix;	624	glPopMatrix;
576	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577	}	626	}
578		627
579	$self->_draw;	628	$self->_draw;
580	glPopMatrix;	629	glPopMatrix;
581	}	630	}
…		…
587	}	636	}
588		637
589	sub DESTROY {	638	sub DESTROY {
590	my ($self) = @_;	639	my ($self) = @_;
591		640
		641	return if CFPlus::in_destruct;
		642
592	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
593		644
594	eval { $self->destroy };	645	eval { $self->destroy };
595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	647	}
597		648
598	#############################################################################	649	#############################################################################
599		650
600	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
601		652
602	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
603		654
604	use strict;	655	use strict;
605	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
606		657
607	sub new {	658	sub new {
608	my $class = shift;	659	my $class = shift;
609		660
610	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
641	}	692	}
642	}	693	}
643		694
644	#############################################################################	695	#############################################################################
645		696
646	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
647		698
648	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
649		700
650	sub new {	701	sub new {
651	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
652	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
653	}	704	}
…		…
660		711
661	sub draw { }	712	sub draw { }
662		713
663	#############################################################################	714	#############################################################################
664		715
665	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
666		717
667	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
668		719
669	sub new {	720	sub new {
670	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
671		722
672	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
681	if $children;	732	if $children;
682		733
683	$self	734	$self
684	}	735	}
685		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
686	sub add {	745	sub add {
687	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
688		747
689	$_->set_parent ($self)	748	$_->set_parent ($self)
690	for @widgets;	749	for @widgets;
…		…
750	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
751	}	810	}
752		811
753	#############################################################################	812	#############################################################################
754		813
755	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
756		815
757	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
758		817
759	sub new {	818	sub new {
760	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
761		820
762	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763		822
764	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
765	}	824	}
766		825
767	sub add {	826	sub add {
…		…
774	sub remove {	833	sub remove {
775	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
776		835
777	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
778		837
779	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
780	unless @{$self->{children}};	839	unless @{$self->{children}};
781	}	840	}
782		841
783	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
784		843
…		…
796		855
797	#############################################################################	856	#############################################################################
798		857
799	# back-buffered drawing area	858	# back-buffered drawing area
800		859
801	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
802		861
803	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
804		863
805	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
806		865
807	sub new {	866	sub new {
808	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
809		868
810	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
832	}	891	}
833		892
834	sub render_child {	893	sub render_child {
835	my ($self) = @_;	894	my ($self) = @_;
836		895
837	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
839	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
840		899
841	{	900	{
842	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
843		902
844	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
845	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
846	}	905	}
847		906
…		…
866	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
867	}	926	}
868		927
869	#############################################################################	928	#############################################################################
870		929
871	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
872		931
873	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
874		933
875	sub new {	934	sub new {
876	my $class = shift;	935	my $class = shift;
877		936
878	$class->SUPER::new (	937	$class->SUPER::new (
…		…
938	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
940	) {	999	) {
941	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942	} else {	1001	} else {
943	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
944	}	1003	}
945	}	1004	}
946		1005
947	sub _render {	1006	sub _render {
948	my ($self) = @_;	1007	my ($self) = @_;
949		1008
950	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952		1011
953	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954		1013
955	$self->SUPER::_render;	1014	$self->SUPER::_render;
956	}	1015	}
957		1016
958	#############################################################################	1017	#############################################################################
959		1018
960	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
961		1020
962	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
963		1022
964	sub new {	1023	sub new {
965	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
966		1025
967	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
968		1027
969	my $self;	1028	my $self;
970		1029
971	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
972	vertical => 1,	1031	vertical => 1,
973	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
974	on_changed => sub {	1033	on_changed => sub {
975	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
976	},	1035	},
977	;	1036	;
978		1037
979	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
		1040	can_events => 1,
981	slider => $slider,	1041	slider => $slider,
982	%arg,	1042	%arg,
983	);	1043	);
984		1044
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1045	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1046	$self->add ($child) if $child;
…		…
994	my ($self, $widget) = @_;	1054	my ($self, $widget) = @_;
995		1055
996	$self->{vp}->add ($self->{child} = $widget);	1056	$self->{vp}->add ($self->{child} = $widget);
997	}	1057	}
998		1058
		1059	sub invoke_mouse_wheel {
		1060	my ($self, $ev) = @_;
		1061
		1062	return 0 unless $ev->{dy}; # only vertical movements
		1063
		1064	$self->{slider}->emit (mouse_wheel => $ev);
		1065
		1066	1
		1067	}
		1068
999	sub update_slider {	1069	sub update_slider {
1000	my ($self) = @_;	1070	my ($self) = @_;
1001		1071
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1072	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003	}	1073	}
…		…
1018	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1019	}	1089	}
1020		1090
1021	#############################################################################	1091	#############################################################################
1022		1092
1023	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1024		1094
1025	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1026		1096
1027	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1028		1098
1029	sub new {	1099	sub new {
1030	my $class = shift;	1100	my $class = shift;
1031		1101
1032	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1058	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1059	}	1129	}
1060		1130
1061	#############################################################################	1131	#############################################################################
1062		1132
1063	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1064		1134
1065	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1066		1136
1067	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1068		1138
1069	my $bg =	1139	my $bg =
1070	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1072		1142
1073	my @border =	1143	my @border =
1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076		1146
1077	sub new {	1147	sub new {
1078	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1079		1149
1080	my $self = $class->SUPER::new (	1150	my $self = $class->SUPER::new (
1081	bg => [1, 1, 1, 1],	1151	bg => [1, 1, 1, 1],
1082	border_bg => [1, 1, 1, 1],	1152	border_bg => [1, 1, 1, 1],
1083	border => 0.6,	1153	border => 0.6,
1084	can_events => 1,	1154	can_events => 1,
1085	min_w => 16,	1155	min_w => 64,
1086	min_h => 16,	1156	min_h => 32,
1087	%arg,	1157	%arg,
1088	);	1158	);
1089		1159
1090	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1091	align => 0,	1161	align => 0,
1092	valign => 1,	1162	valign => 1,
1093	text => $self->{title},	1163	text => $self->{title},
1094	fontsize => $self->{border},	1164	fontsize => $self->{border},
1095	if exists $self->{title};	1165	if exists $self->{title};
1096		1166
1097	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1098	$self->{close_button} =	1168	$self->{close_button} =
1099	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1100	path => 'x1_close.png',	1170	path => 'x1_close.png',
1101	on_activate => sub { $self->emit ("delete") };	1171	on_activate => sub { $self->emit ("delete") };
1102		1172
1103	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1104	}	1174	}
1105		1175
1106	$self	1176	$self
1107	}	1177	}
1108		1178
1109	sub add {	1179	sub add {
1110	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1111		1181
1112	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115	}	1185	}
1116		1186
1117	sub border {	1187	sub border {
1118	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1119	}	1189	}
…		…
1227	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1228		1298
1229	! ! $self->{motion}	1299	! ! $self->{motion}
1230	}	1300	}
1231		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1232	sub _draw {	1310	sub _draw {
1233	my ($self) = @_;	1311	my ($self) = @_;
1234		1312
1235	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1236		1314
…		…
1273	if $self->{close_button};	1351	if $self->{close_button};
1274	}	1352	}
1275		1353
1276	#############################################################################	1354	#############################################################################
1277		1355
1278	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1279		1357
1280	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1281		1359
1282	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1283		1361
1284	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1285		1363
1286	sub new {	1364	sub new {
1287	my $class = shift;	1365	my $class = shift;
1288		1366
1289	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1295	sub children {	1373	sub children {
1296	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297	}	1375	}
1298		1376
1299	sub add {	1377	sub add {
1300	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1301		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1302	$child->set_parent ($self);	1382	$child->set_parent ($self);
1303	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1304		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1305	$self->realloc;	1388	$self->realloc;
1306	}	1389	}
1307		1390
1308	sub remove {	1391	sub remove {
1309	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1374		1457
1375	# linearly scale sizes	1458	# linearly scale sizes
1376	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378		1461
1379	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1380	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1381		1464
1382	my $y;	1465	my $y;
1383		1466
1384	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1385	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1428	}	1511	}
1429	}	1512	}
1430		1513
1431	#############################################################################	1514	#############################################################################
1432		1515
1433	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1434		1517
1435	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1436		1519
1437	sub size_request {	1520	sub size_request {
1438	my ($self) = @_;	1521	my ($self) = @_;
1439		1522
1440	$self->{vertical}	1523	$self->{vertical}
…		…
1473	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1474	for 0 .. $#children;	1557	for 0 .. $#children;
1475	}	1558	}
1476	}	1559	}
1477		1560
1478	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1479		1562
1480	my $pos = 0;	1563	my $pos = 0;
1481	for (0 .. $#children) {	1564	for (0 .. $#children) {
1482	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1488	1	1571	1
1489	}	1572	}
1490		1573
1491	#############################################################################	1574	#############################################################################
1492		1575
1493	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1494		1577
1495	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1496		1579
1497	sub new {	1580	sub new {
1498	my $class = shift;	1581	my $class = shift;
1499		1582
1500	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1503	)	1586	)
1504	}	1587	}
1505		1588
1506	#############################################################################	1589	#############################################################################
1507		1590
1508	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1509		1592
1510	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1511		1594
1512	sub new {	1595	sub new {
1513	my $class = shift;	1596	my $class = shift;
1514		1597
1515	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1518	)	1601	)
1519	}	1602	}
1520		1603
1521	#############################################################################	1604	#############################################################################
1522		1605
1523	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1524		1607
1525	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1526		1609
1527	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1528		1611
1529	sub new {	1612	sub new {
1530	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1531		1614
1532	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1536	#font => default_font	1619	#font => default_font
1537	#text => initial text	1620	#text => initial text
1538	#markup => initial narkup	1621	#markup => initial narkup
1539	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1540	ellipsise => 3, # end	1623	ellipsise => 3, # end
1541	layout => (new CFClient::Layout 2),	1624	layout => (new CFPlus::Layout),
1542	fontsize => 1,	1625	fontsize => 1,
1543	align => -1,	1626	align => -1,
1544	valign => -1,	1627	valign => -1,
1545	padding_x => 2,	1628	padding_x => 2,
1546	padding_y => 2,	1629	padding_y => 2,
1547	can_events => 0,	1630	can_events => 0,
1548	%arg	1631	%arg
1549	);	1632	);
1550		1633
1551	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1552	my $layout = new CFClient::Layout 2;	1635	my $layout = new CFPlus::Layout;
1553	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1554	$self->{template} = $layout;	1637	$self->{template} = $layout;
1555	}	1638	}
1556		1639
1557	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1559	} else {	1642	} else {
1560	$self->set_text (delete $self->{text});	1643	$self->set_text (delete $self->{text});
1561	}	1644	}
1562		1645
1563	$self	1646	$self
1564	}
1565
1566	sub escape($) {
1567	local $_ = $_[0];
1568
1569	s/&/&amp;/g;
1570	s/>/&gt;/g;
1571	s/</&lt;/g;
1572
1573	$_
1574	}	1647	}
1575		1648
1576	sub update {	1649	sub update {
1577	my ($self) = @_;	1650	my ($self) = @_;
1578		1651
…		…
1627		1700
1628	my ($w, $h) = $self->{layout}->size;	1701	my ($w, $h) = $self->{layout}->size;
1629		1702
1630	if (exists $self->{template}) {	1703	if (exists $self->{template}) {
1631	$self->{template}->set_font ($self->{font}) if $self->{font};	1704	$self->{template}->set_font ($self->{font}) if $self->{font};
		1705	$self->{template}->set_width ($self->{max_w} || -1);
1632	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633		1707
1634	my ($w2, $h2) = $self->{template}->size;	1708	my ($w2, $h2) = $self->{template}->size;
1635		1709
1636	$w = List::Util::max $w, $w2;	1710	$w = List::Util::max $w, $w2;
…		…
1688	$self->{layout}->set_width ($self->{w});	1762	$self->{layout}->set_width ($self->{w});
1689	$self->{layout}->set_ellipsise ($self->{ellipsise});	1763	$self->{layout}->set_ellipsise ($self->{ellipsise});
1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1764	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1765	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692		1766
1693	$self->{size_req}	1767	[$self->{layout}->size]
1694	};	1768	};
1695		1769
1696	unless (exists $self->{ox}) {	1770	unless (exists $self->{ox}) {
1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1771	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	1772	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
…		…
1709	$self->{layout}->render ($self->{ox}, $self->{oy});	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1710	}	1784	}
1711		1785
1712	#############################################################################	1786	#############################################################################
1713		1787
1714	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1715		1789
1716	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1717		1791
1718	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1719		1793
1720	sub new {	1794	sub new {
1721	my $class = shift;	1795	my $class = shift;
1722		1796
1723	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1785		1859
1786	if ($uni == 8) {	1860	if ($uni == 8) {
1787	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1789	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1790	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1791	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1792	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1793	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1794	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1795	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1796	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1797	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1798	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1799	$self->emit ('escape');	1873	$self->emit ('escape');
1800	} elsif ($uni) {	1874	} elsif ($uni) {
1801	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1825		1899
1826	my $idx = $self->{layout}->xy_to_index ($x, $y);	1900	my $idx = $self->{layout}->xy_to_index ($x, $y);
1827		1901
1828	# byte-index to char-index	1902	# byte-index to char-index
1829	my $text = $self->{text};	1903	my $text = $self->{text};
1830	utf8::encode $text;	1904	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831	$self->{cursor} = length substr $text, 0, $idx;	1905	$self->{cursor} = length $text;
1832		1906
1833	$self->_set_text ($self->{text});	1907	$self->_set_text ($self->{text});
1834	$self->update;	1908	$self->update;
1835		1909
1836	1	1910	1
…		…
1883	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884	glEnd;	1958	glEnd;
1885	}	1959	}
1886	}	1960	}
1887		1961
1888	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1889		1963
1890	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1891		1965
1892	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1893		1967
1894	sub invoke_key_down {	1968	sub invoke_key_down {
1895	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1896		1970
1897	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1903	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1904	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1905	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1906	$self->update;	1980	$self->update;
1907		1981
1908	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1909	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1910	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1911	}	1985	}
1912	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1913	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1915	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1916	}	1990	}
1917	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1918	}	1992	}
1919		1993
1920	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1921	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1922	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923		1997
1924	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1925	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1934	1	2008	1
1935	}	2009	}
1936		2010
1937	#############################################################################	2011	#############################################################################
1938		2012
1939	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1940		2014
1941	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1942		2016
1943	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1944		2018
1945	my @tex =	2019	my @tex =
1946	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1948		2022
1949	sub new {	2023	sub new {
1950	my $class = shift;	2024	my $class = shift;
1951		2025
…		…
1988	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
1989	}	2063	}
1990		2064
1991	#############################################################################	2065	#############################################################################
1992		2066
		2067	package CFPlus::UI::CheckBox;
		2068
		2069	our @ISA = CFPlus::UI::DrawBG::;
		2070
		2071	my @tex =
		2072	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2073	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2074
		2075	use CFPlus::OpenGL;
		2076
		2077	sub new {
		2078	my $class = shift;
		2079
		2080	$class->SUPER::new (
		2081	padding_x => 2,
		2082	padding_y => 2,
		2083	fg => [1, 1, 1],
		2084	active_fg => [1, 1, 0],
		2085	bg => [0, 0, 0, 0.2],
		2086	active_bg => [1, 1, 1, 0.5],
		2087	state => 0,
		2088	can_hover => 1,
		2089	@_
		2090	)
		2091	}
		2092
		2093	sub size_request {
		2094	my ($self) = @_;
		2095
		2096	(6) x 2
		2097	}
		2098
		2099	sub toggle {
		2100	my ($self) = @_;
		2101
		2102	$self->{state} = !$self->{state};
		2103	$self->emit (changed => $self->{state});
		2104	$self->update;
		2105	}
		2106
		2107	sub invoke_button_down {
		2108	my ($self, $ev, $x, $y) = @_;
		2109
		2110	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2111	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2112	$self->toggle;
		2113	} else {
		2114	return 0
		2115	}
		2116
		2117	1
		2118	}
		2119
		2120	sub _draw {
		2121	my ($self) = @_;
		2122
		2123	$self->SUPER::_draw;
		2124
		2125	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2126
		2127	my ($w, $h) = @$self{qw(w h)};
		2128
		2129	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2130
		2131	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2132
		2133	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2134
		2135	glEnable GL_TEXTURE_2D;
		2136	$tex->draw_quad_alpha (0, 0, $s, $s);
		2137	glDisable GL_TEXTURE_2D;
		2138	}
		2139
		2140	#############################################################################
		2141
		2142	package CFPlus::UI::Image;
		2143
		2144	our @ISA = CFPlus::UI::Base::;
		2145
		2146	use CFPlus::OpenGL;
		2147
		2148	our %texture_cache;
		2149
		2150	sub new {
		2151	my $class = shift;
		2152
		2153	my $self = $class->SUPER::new (
		2154	can_events => 0,
		2155	@_,
		2156	);
		2157
		2158	$self->{path} || $self->{tex}
		2159	or Carp::croak "'path' or 'tex' attributes required";
		2160
		2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2163
		2164	Scalar::Util::weaken $texture_cache{$self->{path}};
		2165
		2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2167
		2168	$self
		2169	}
		2170
		2171	sub STORABLE_freeze {
		2172	my ($self, $cloning) = @_;
		2173
		2174	$self->{path}
		2175	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2176
		2177	$self->{path}
		2178	}
		2179
		2180	sub STORABLE_attach {
		2181	my ($self, $cloning, $path) = @_;
		2182
		2183	$self->new (path => $path)
		2184	}
		2185
		2186	sub size_request {
		2187	my ($self) = @_;
		2188
		2189	($self->{tex}{w}, $self->{tex}{h})
		2190	}
		2191
		2192	sub _draw {
		2193	my ($self) = @_;
		2194
		2195	my $tex = $self->{tex};
		2196
		2197	my ($w, $h) = ($self->{w}, $self->{h});
		2198
		2199	if ($self->{rot90}) {
		2200	glRotate 90, 0, 0, 1;
		2201	glTranslate 0, -$self->{w}, 0;
		2202
		2203	($w, $h) = ($h, $w);
		2204	}
		2205
		2206	glEnable GL_TEXTURE_2D;
		2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2208
		2209	$tex->draw_quad (0, 0, $w, $h);
		2210
		2211	glDisable GL_TEXTURE_2D;
		2212	}
		2213
		2214	#############################################################################
		2215
1993	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
1994		2217
1995	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
1996		2219
1997	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
1998		2221
1999	my %textures;	2222	my %textures;
2000		2223
2001	sub new {	2224	sub new {
2002	my $class = shift;	2225	my $class = shift;
…		…
2024	1	2247	1
2025	}	2248	}
2026		2249
2027	#############################################################################	2250	#############################################################################
2028		2251
2029	package CFClient::UI::CheckBox;
2030
2031	our @ISA = CFClient::UI::DrawBG::;
2032
2033	my @tex =
2034	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037	use CFClient::OpenGL;
2038
2039	sub new {
2040	my $class = shift;
2041
2042	$class->SUPER::new (
2043	padding_x => 2,
2044	padding_y => 2,
2045	fg => [1, 1, 1],
2046	active_fg => [1, 1, 0],
2047	bg => [0, 0, 0, 0.2],
2048	active_bg => [1, 1, 1, 0.5],
2049	state => 0,
2050	can_hover => 1,
2051	@_
2052	)
2053	}
2054
2055	sub size_request {
2056	my ($self) = @_;
2057
2058	(6) x 2
2059	}
2060
2061	sub toggle {
2062	my ($self) = @_;
2063
2064	$self->{state} = !$self->{state};
2065	$self->emit (changed => $self->{state});
2066	$self->update;
2067	}
2068
2069	sub invoke_button_down {
2070	my ($self, $ev, $x, $y) = @_;
2071
2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074	$self->toggle;
2075	} else {
2076	return 0
2077	}
2078
2079	1
2080	}
2081
2082	sub _draw {
2083	my ($self) = @_;
2084
2085	$self->SUPER::_draw;
2086
2087	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089	my ($w, $h) = @$self{qw(w h)};
2090
2091	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095	my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097	glEnable GL_TEXTURE_2D;
2098	$tex->draw_quad_alpha (0, 0, $s, $s);
2099	glDisable GL_TEXTURE_2D;
2100	}
2101
2102	#############################################################################
2103
2104	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2105		2253
2106	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2107
2108	use CFClient::OpenGL;
2109
2110	our %texture_cache;
2111
2112	sub new {
2113	my $class = shift;
2114
2115	my $self = $class->SUPER::new (
2116	can_events => 0,
2117	@_,
2118	);
2119
2120	$self->{path}
2121	or Carp::croak "required attribute 'path' not set";
2122
2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2124	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130	$self
2131	}
2132
2133	sub size_request {
2134	my ($self) = @_;
2135
2136	($self->{tex}{w}, $self->{tex}{h})
2137	}
2138
2139	sub _draw {
2140	my ($self) = @_;
2141
2142	my $tex = $self->{tex};
2143
2144	my ($w, $h) = ($self->{w}, $self->{h});
2145
2146	if ($self->{rot90}) {
2147	glRotate 90, 0, 0, 1;
2148	glTranslate 0, -$self->{w}, 0;
2149
2150	($w, $h) = ($h, $w);
2151	}
2152
2153	glEnable GL_TEXTURE_2D;
2154	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156	$tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158	glDisable GL_TEXTURE_2D;
2159	}
2160
2161	#############################################################################
2162
2163	package CFClient::UI::VGauge;
2164
2165	our @ISA = CFClient::UI::Base::;
2166		2255
2167	use List::Util qw(min max);	2256	use List::Util qw(min max);
2168		2257
2169	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2170		2259
2171	my %tex = (	2260	my %tex = (
2172	food => [	2261	food => [
2173	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175	],	2264	],
2176	grace => [	2265	grace => [
2177	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179	],	2268	],
2180	hp => [	2269	hp => [
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183	],	2272	],
2184	mana => [	2273	mana => [
2185	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187	],	2276	],
2188	);	2277	);
2189		2278
2190	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2293	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2294	}	2383	}
2295		2384
2296	#############################################################################	2385	#############################################################################
2297		2386
2298	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2299		2388
2300	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2301		2390
2302	sub new {	2391	sub new {
2303	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2304		2393
2305	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2307	can_hover => 1,	2396	can_hover => 1,
2308	can_events => 1,	2397	can_events => 1,
2309	%arg,	2398	%arg,
2310	);	2399	);
2311		2400
2312	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2401	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2402	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2403	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315		2404
2316	$self	2405	$self
2317	}	2406	}
2318		2407
2319	sub set_fontsize {	2408	sub set_fontsize {
…		…
2340	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2341	}	2430	}
2342		2431
2343	#############################################################################	2432	#############################################################################
2344		2433
2345	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2346		2435
2347	use strict;	2436	use strict;
2348		2437
2349	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2350		2439
2351	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2352		2441
2353	my @tex =	2442	my @tex =
2354	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2356		2445
2357	sub new {	2446	sub new {
2358	my $class = shift;	2447	my $class = shift;
2359		2448
…		…
2448	}	2537	}
2449		2538
2450	1	2539	1
2451	}	2540	}
2452		2541
		2542	sub invoke_mouse_wheel {
		2543	my ($self, $ev) = @_;
		2544
		2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2546
		2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2548
		2549	! ! $delta
		2550	}
		2551
2453	sub update {	2552	sub update {
2454	my ($self) = @_;	2553	my ($self) = @_;
2455		2554
2456	delete $self->{knob_w};	2555	delete $self->{knob_w};
2457	$self->SUPER::update;	2556	$self->SUPER::update;
…		…
2504	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2505	}	2604	}
2506		2605
2507	#############################################################################	2606	#############################################################################
2508		2607
2509	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2510		2609
2511	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2512		2611
2513	sub new {	2612	sub new {
2514	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2515		2614
2516	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2517		2616
2518	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2519	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521	to_value => sub { shift },	2620	to_value => sub { shift },
2522	from_value => sub { shift },	2621	from_value => sub { shift },
2523	%arg,	2622	%arg,
2524	);	2623	);
2525		2624
…		…
2545	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2546	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2547		2646
2548	#############################################################################	2647	#############################################################################
2549		2648
2550	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2551		2650
2552	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2553		2652
2554	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2555		2654
2556	sub new {	2655	sub new {
2557	my $class = shift;	2656	my $class = shift;
2558		2657
2559	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
2560	fontsize => 1,	2659	fontsize => 1,
2561	can_events => 0,	2660	can_events => 1,
2562	indent => 0,	2661	indent => 0,
2563	#font => default_font	2662	#font => default_font
2564	@_,	2663	@_,
2565		2664
2566	layout => (new CFClient::Layout 2),	2665	layout => (new CFPlus::Layout),
2567	par => [],	2666	par => [],
2568	height => 0,	2667	height => 0,
2569	children => [	2668	children => [
2570	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2571	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2572	],	2671	],
2573	);	2672	);
2574		2673
2575	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2576		2675
…		…
2606		2705
2607	$self->reflow;	2706	$self->reflow;
2608		2707
2609	local $self->{children} = [$empty, $slider];	2708	local $self->{children} = [$empty, $slider];
2610	$self->SUPER::invoke_size_allocate ($w, $h)	2709	$self->SUPER::invoke_size_allocate ($w, $h)
		2710	}
		2711
		2712	sub invoke_mouse_wheel {
		2713	my ($self, $ev) = @_;
		2714
		2715	return 0 unless $ev->{dy}; # only vertical movements
		2716
		2717	$self->{children}[1]->emit (mouse_wheel => $ev);
		2718
		2719	1
2611	}	2720	}
2612		2721
2613	sub get_layout {	2722	sub get_layout {
2614	my ($self, $para) = @_;	2723	my ($self, $para) = @_;
2615		2724
…		…
2655	$self->{height} = 0;	2764	$self->{height} = 0;
2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657	}	2766	}
2658		2767
2659	sub add_paragraph {	2768	sub add_paragraph {
2660	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2661		2770
2662	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2663
2664	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2665	w => 1e10,	2778	w => 1e10,
2666	wrapped => 1,	2779	wrapped => 1,
2667	fg => $color,
2668	indent => $indent,
2669	markup => $text,
2670	widget => \@w,
2671	};	2780	};
2672		2781
2673	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2675		2785
2676	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2677	$self->update;	2787	$self->update;
2678	}	2788	}
2679		2789
…		…
2721		2831
2722	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2723	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2724	}	2834	}
2725		2835
2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2728	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2729		2839
2730	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2731		2841
…		…
2784	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2785	}	2895	}
2786		2896
2787	#############################################################################	2897	#############################################################################
2788		2898
2789	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2790		2900
2791	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2792		2902
2793	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2794		2904
2795	sub moveto {	2905	sub moveto {
2796	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2797		2907
2798	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2826	glPopMatrix;	2936	glPopMatrix;
2827	}	2937	}
2828		2938
2829	#############################################################################	2939	#############################################################################
2830		2940
2831	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2832		2942
2833	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2834		2944
2835	sub new {	2945	sub new {
2836	my $class = shift;	2946	my $class = shift;
2837		2947
2838	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2850	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2851	}	2961	}
2852		2962
2853	#############################################################################	2963	#############################################################################
2854		2964
2855	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2856		2966
2857	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2858		2968
2859	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2860		2970
2861	sub new {	2971	sub new {
2862	my $class = shift;	2972	my $class = shift;
2863		2973
2864	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2867	)	2977	)
2868	}	2978	}
2869		2979
2870	sub set_tooltip_from {	2980	sub set_tooltip_from {
2871	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2872		2985
2873	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2874		2987
2875	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2876	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2880	}	2993	}
2881		2994
2882	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2883	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2884		2997
2885	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2886	markup => $tooltip,	2999	markup => $tooltip,
2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888	fontsize => 0.8,	3001	fontsize => 0.8,
2889	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2890	ellipsise => 0,	3003	ellipsise => 0,
…		…
2913		3026
2914	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2915	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2916	or return;	3029	or return;
2917		3030
		3031	if ($widget->{visible}) {
2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919		3033
2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2922		3036
2923	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2924	});	3041	});
2925	}	3042	}
2926		3043
2927	sub _draw {	3044	sub _draw {
2928	my ($self) = @_;	3045	my ($self) = @_;
…		…
2952	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
2953	}	3070	}
2954		3071
2955	#############################################################################	3072	#############################################################################
2956		3073
2957	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
2958		3075
2959	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
2960		3077
2961	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
2962		3079
2963	sub new {	3080	sub new {
2964	my $class = shift;	3081	my $class = shift;
2965		3082
2966	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3001	sub _draw {	3118	sub _draw {
3002	my ($self) = @_;	3119	my ($self) = @_;
3003		3120
3004	return unless $::CONN;	3121	return unless $::CONN;
3005		3122
		3123	$self->SUPER::_draw;
		3124
3006	my $face;	3125	my $face;
3007		3126
3008	if ($self->{frame}) {	3127	if ($self->{frame}) {
3009	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3010		3129
…		…
3032	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3033	}	3152	}
3034		3153
3035	#############################################################################	3154	#############################################################################
3036		3155
3037	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3038		3157
3039	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3040		3159
3041	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3042		3161
3043	#############################################################################	3162	#############################################################################
3044		3163
3045	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3046		3165
3047	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3048		3167
3049	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3050		3169
3051	sub new {	3170	sub new {
3052	my $class = shift;	3171	my $class = shift;
3053		3172
3054	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3055	items => [],	3174	items => [],
3056	z => 100,	3175	z => 100,
3057	@_,	3176	@_,
3058	);	3177	);
3059		3178
3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061		3180
3062	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3063	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3064		3183
3065	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3066	if (!ref $widget) {	3185	if (!ref $widget) {
3067	if ($widget =~ /\t/) {	3186	if ($widget =~ /\t/) {
3068	my ($left, $right) = split /\t/, $widget, 2;	3187	my ($left, $right) = split /\t/, $widget, 2;
3069		3188
3070	$widget = new CFClient::UI::HBox	3189	$widget = new CFPlus::UI::HBox
3071	can_hover => 1,	3190	can_hover => 1,
3072	can_events => 1,	3191	can_events => 1,
3073	tooltip => $tooltip,	3192	tooltip => $tooltip,
3074	children => [	3193	children => [
3075	(new CFClient::UI::Label markup => $left, expand => 1),	3194	(new CFPlus::UI::Label markup => $left, expand => 1),
3076	(new CFClient::UI::Label markup => $right, align => +1),	3195	(new CFPlus::UI::Label markup => $right, align => +1),
3077	],	3196	],
3078	;	3197	;
3079		3198
3080	} else {	3199	} else {
3081	$widget = new CFClient::UI::Label	3200	$widget = new CFPlus::UI::Label
3082	can_hover => 1,	3201	can_hover => 1,
3083	can_events => 1,	3202	can_events => 1,
3084	markup => $widget,	3203	markup => $widget,
3085	tooltip => $tooltip;	3204	tooltip => $tooltip;
3086	}	3205	}
…		…
3134	1	3253	1
3135	}	3254	}
3136		3255
3137	#############################################################################	3256	#############################################################################
3138		3257
3139	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3140		3259
3141	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3142		3261
3143	sub new {	3262	sub new {
3144	my $class = shift;	3263	my $class = shift;
3145		3264
3146	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3207	$self->{current}->draw;	3326	$self->{current}->draw;
3208	}	3327	}
3209		3328
3210	#############################################################################	3329	#############################################################################
3211		3330
3212	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3213		3332
3214	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3215		3334
3216	sub new {	3335	sub new {
3217	my $class = shift;	3336	my $class = shift;
3218		3337
3219	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3220	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3221	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3222	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3223	@_,	3342	@_,
3224	);	3343	);
3225		3344
3226	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3232	sub add {	3351	sub add {
3233	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3234		3353
3235	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3236		3355
3237	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3238	markup => $title,	3357	markup => $title,
3239	tooltip => $tooltip,	3358	tooltip => $tooltip,
3240	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3241	);	3360	);
3242		3361
…		…
3256	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3257	}	3376	}
3258		3377
3259	#############################################################################	3378	#############################################################################
3260		3379
3261	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3262		3381
3263	use utf8;	3382	use utf8;
3264		3383
3265	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3266		3385
3267	sub new {	3386	sub new {
3268	my $class = shift;	3387	my $class = shift;
3269		3388
3270	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3287	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3288		3407
3289	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290	}	3409	}
3291		3410
3292	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293	}	3412	}
3294		3413
3295	sub _set_value {	3414	sub _set_value {
3296	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3297		3416
…		…
3312	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3313	}	3432	}
3314		3433
3315	#############################################################################	3434	#############################################################################
3316		3435
3317	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3318		3437
3319	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3320		3439
3321	sub new {	3440	sub new {
3322	my $class = shift;	3441	my $class = shift;
3323		3442
3324	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3336	sub reorder {	3455	sub reorder {
3337	my ($self) = @_;	3456	my ($self) = @_;
3338	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3339		3458
3340	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3341	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3342	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3343	values %{ $self->{item} };	3462	values %{ $self->{item} };
3344		3463
3345	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3346	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3347	}	3466	}
…		…
3368	for ($short) {	3487	for ($short) {
3369	s/^\s+//;	3488	s/^\s+//;
3370	s/\s+/ /g;	3489	s/\s+/ /g;
3371	}	3490	}
3372		3491
3373	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3374	markup => $short,	3493	markup => $short,
3375	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3376	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3377	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3378	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3457	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3458	}	3577	}
3459		3578
3460	#############################################################################	3579	#############################################################################
3461		3580
3462	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3463		3582
3464	our @ISA = CFClient::UI::Table::;	3583	our @ISA = CFPlus::UI::Table::;
3465		3584
3466	sub new {	3585	sub new {
3467	my $class = shift;	3586	my $class = shift;
3468		3587
3469	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3470	col_expand => [0, 1, 0],	3589	col_expand => [0, 1, 0],
		3590	items => [],
3471	@_,	3591	@_,
3472	);	3592	);
3473		3593
		3594	$self->set_sort_order (undef);
		3595
3474	$self	3596	$self
		3597	}
		3598
		3599	sub update_items {
		3600	my ($self) = @_;
		3601
		3602	$self->clear;
		3603
		3604	my @item = $self->{sort}->(@{ $self->{items} });
		3605
		3606	my @adds;
		3607	my $row = 0;
		3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3609	CFPlus::Item::update_widgets $item;
		3610
		3611	push @adds, 0, $row, $item->{face_widget};
		3612	push @adds, 1, $row, $item->{desc_widget};
		3613	push @adds, 2, $row, $item->{weight_widget};
		3614
		3615	$row++;
		3616	}
		3617
		3618	$self->add (@adds);
		3619	}
		3620
		3621	sub set_sort_order {
		3622	my ($self, $order) = @_;
		3623
		3624	$self->{sort} = $order ||= sub {
		3625	sort {
		3626	$a->{type} <=> $b->{type}
		3627	or $a->{name} cmp $b->{name}
		3628	} @_
		3629	};
		3630
		3631	$self->update_items;
3475	}	3632	}
3476		3633
3477	sub set_items {	3634	sub set_items {
3478	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3479		3636
3480	$self->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3481	return unless $items;	3638	$self->update_items;
3482
3483	my @items = sort {
3484	($a->{type} <=> $b->{type})
3485	or ($a->{name} cmp $b->{name})
3486	} values %$items;
3487
3488	$self->{real_items} = \@items;
3489
3490	my $row = 0;
3491	for my $item (@items) {
3492	CFClient::Item::update_widgets $item;
3493
3494	$self->add (0, $row, $item->{face_widget});
3495	$self->add (1, $row, $item->{desc_widget});
3496	$self->add (2, $row, $item->{weight_widget});
3497
3498	$row++;
3499	}
3500	}	3639	}
3501		3640
3502	#############################################################################	3641	#############################################################################
3503		3642
3504	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3505		3644
3506	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3507		3646
3508	sub new {	3647	sub new {
3509	my $class = shift;	3648	my $class = shift;
3510		3649
3511	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3529	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530		3669
3531	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3532	my ($self) = @_;	3671	my ($self) = @_;
3533		3672
3534	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3535	$self->clear;	3674	$self->clear;
3536		3675
3537	return unless $::CONN;	3676	return unless $::CONN;
3538		3677
3539	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3678	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3679	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3680	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3681	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544		3683
3545	my $row = 0;	3684	my $row = 0;
3546		3685
3547	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3555	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3556	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3557	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3558	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3559	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3560	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3561	items => [	3700	items => [
3562	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3701	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564	],	3703	],
3565	)->popup ($ev);	3704	)->popup ($ev);
…		…
3571	};	3710	};
3572		3711
3573	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574		3713
3575	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3576	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3577		3716
3578	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3579	face => $spell->{face},	3718	face => $spell->{face},
3580	can_hover => 1,	3719	can_hover => 1,
3581	can_events => 1,	3720	can_events => 1,
3582	tooltip => $tooltip,	3721	tooltip => $tooltip,
3583	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3584	);	3723	);
3585		3724
3586	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3587	expand => 1,	3726	expand => 1,
3588	text => $spell->{name},	3727	text => $spell->{name},
3589	can_hover => 1,	3728	can_hover => 1,
3590	can_events => 1,	3729	can_events => 1,
3591	tooltip => $tooltip,	3730	tooltip => $tooltip,
3592	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3593	);	3732	);
3594		3733
3595	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3734	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3735	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3736	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599	}	3738	}
3600	});	3739	});
3601	}	3740	}
3602		3741
3603	sub add_spell {	3742	sub add_spell {
…		…
3621	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3622	}	3761	}
3623		3762
3624	#############################################################################	3763	#############################################################################
3625		3764
3626	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3627		3766
3628	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3629		3768
3630	use List::Util qw(min max);	3769	use List::Util qw(min max);
3631		3770
3632	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3633		3772
3634	sub new {	3773	sub new {
3635	my $class = shift;	3774	my $class = shift;
3636		3775
3637	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3813	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3952	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3814		3953
3815	$w = 0 if $w < 0;	3954	$w = 0 if $w < 0;
3816	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3817		3956
		3957	$w = max $widget->{min_w}, $w;
		3958	$h = max $widget->{min_h}, $h;
		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
		3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3965
3818	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3819	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
3820		3968
3821	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3969	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3822	$widget->{old_w} = $widget->{w};	3970	$widget->{old_w} = $widget->{w};
…		…
3845	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3846	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3847	glLoadIdentity;	3995	glLoadIdentity;
3848		3996
3849	{	3997	{
3850	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3851		3999
3852	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3853	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3854	}	4002	}
3855		4003
3856	$self->_draw;	4004	$self->_draw;
3857	}	4005	}
3858		4006
3859	#############################################################################	4007	#############################################################################
3860		4008
3861	package CFClient::UI;	4009	package CFPlus::UI;
3862		4010
3863	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3864	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3865		4013
3866	1	4014	1
3867		4015

Diff Legend

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