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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 2007 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 ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
79	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	84	if $FOCUS;
82	}	85	}
83		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
84	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	101	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
87		103
88	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
89	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
90		108
91	$GRAB = $widget;	109	$GRAB = $widget;
92	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
93		111
94	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
95	}	113	}
96		114
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
98		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
100	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
101	}	125	}
102		126
103	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	128	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		129
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		131
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		133
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
112	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		136
114	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	139	$grab->update if $grab;
117	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
118		141
		142	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	143	$TOOLTIP_WATCHER->cb->();
120	}	144	}
121	}	145	}
122		146
123	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
124	my ($ev) = @_;	148	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
126		150
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		152
129	if ($widget != $HOVER) {	153	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		154
132	$hover->update if $hover && $hover->{can_hover};	155	$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;	156	if $HOVER;
140	}	157	}
141		158
142	# convert position array to integers	159	# convert position array to integers
143	sub harmonize {	160	sub harmonize {
…		…
193	reconfigure_widgets;	210	reconfigure_widgets;
194	}	211	}
195		212
196	#############################################################################	213	#############################################################################
197		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
198	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
199		224
200	use strict;	225	use strict;
201		226
202	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
203		228
204	sub new {	229	sub new {
205	my $class = shift;	230	my $class = shift;
206		231
207	my $self = bless {	232	my $self = bless {
…		…
212	h => undef,	237	h => undef,
213	can_events => 1,	238	can_events => 1,
214	@_	239	@_
215	}, $class;	240	}, $class;
216		241
217	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218		243
219	for (keys %$self) {	244	for (keys %$self) {
220	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
221	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
222	}	247	}
223	}	248	}
224		249
225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230		255
231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233		258
234	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
239		264
240	sub destroy {	265	sub destroy {
241	my ($self) = @_;	266	my ($self) = @_;
242		267
243	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
244	%$self = ();	270	%$self = ();
245	}	271	}
246		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
247	sub show {	277	sub show {
248	my ($self) = @_;	278	my ($self) = @_;
249		279
250	return if $self->{parent};	280	return if $self->{parent};
251		281
252	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
253	}	283	}
254		284
255	sub set_visible {	285	sub set_visible {
256	my ($self) = @_;	286	my ($self) = @_;
257		287
…		…
278	delete $self->{root};	308	delete $self->{root};
279		309
280	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
282		312
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
285		315
286	$self->emit ("focus_out");	316	$self->emit ("focus_out");
287	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
288	}	318	}
…		…
290	sub set_visibility {	320	sub set_visibility {
291	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
292		322
293	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
294		324
295	$visible ? $self->hide	325	$visible ? $self->show
296	: $self->show;	326	: $self->hide;
297	}	327	}
298		328
299	sub toggle_visibility {	329	sub toggle_visibility {
300	my ($self) = @_;	330	my ($self) = @_;
301		331
…		…
345	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
346		376
347	if ($self->{aspect}) {	377	if ($self->{aspect}) {
348	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
349		379
350	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352		382
353	# use alignment to adjust x, y	383	# use alignment to adjust x, y
354		384
355	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
356	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
397		427
398	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
399		429
400	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
401		431
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
404	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
405	}	435	}
406	}	436	}
407		437
408	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
409	sub coord2local {	439	sub coord2local {
410	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
411		441
		442	Carp::confess unless $self->{parent};#d#
		443
412	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413	}	445	}
414		446
415	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
416	sub coord2global {	448	sub coord2global {
417	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
418		452
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	454	}
421		455
422	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
456		490
457	sub invoke_mouse_motion { 0 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 0 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 0 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 0 }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
461		496
462	sub invoke_button_down {	497	sub invoke_button_down {
463	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
464		499
465	$self->grab_focus;	500	$self->grab_focus;
…		…
469		504
470	sub connect {	505	sub connect {
471	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
472		507
473	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
474	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
475		528
476	sub emit {	529	sub emit {
477	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
478		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
479	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480		540
481	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
482	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
483	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
484	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
485	}	550	}
486		551
487	sub find_widget {	552	sub find_widget {
488	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
489		554
…		…
497	}	562	}
498		563
499	sub set_parent {	564	sub set_parent {
500	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
501		566
502	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
503	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
504	}	569	}
505		570
506	sub realloc {	571	sub realloc {
507	my ($self) = @_;	572	my ($self) = @_;
…		…
573	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
574	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
575	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
576	glEnd;	641	glEnd;
577	glPopMatrix;	642	glPopMatrix;
578	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579	}	644	}
580		645
581	$self->_draw;	646	$self->_draw;
582	glPopMatrix;	647	glPopMatrix;
583	}	648	}
…		…
586	my ($self) = @_;	651	my ($self) = @_;
587		652
588	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
589	}	654	}
590		655
		656	my $cntx;#d#
591	sub DESTROY {	657	sub DESTROY {
592	my ($self) = @_;	658	my ($self) = @_;
593		659
594	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
595
596	delete $WIDGET{$self+0};
597		661
598	eval { $self->destroy };	662	eval { $self->destroy };
599	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
600	}	666	}
601		667
602	#############################################################################	668	#############################################################################
603		669
604	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
605		671
606	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
607		673
608	use strict;	674	use strict;
609	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
610		676
611	sub new {	677	sub new {
612	my $class = shift;	678	my $class = shift;
613		679
614	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
645	}	711	}
646	}	712	}
647		713
648	#############################################################################	714	#############################################################################
649		715
650	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
651		717
652	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
653		719
654	sub new {	720	sub new {
655	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
656	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
657	}	723	}
…		…
664		730
665	sub draw { }	731	sub draw { }
666		732
667	#############################################################################	733	#############################################################################
668		734
669	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
670		736
671	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
672		738
673	sub new {	739	sub new {
674	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
675		741
676	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
685	if $children;	751	if $children;
686		752
687	$self	753	$self
688	}	754	}
689		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
690	sub add {	764	sub add {
691	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
692		766
693	$_->set_parent ($self)	767	$_->set_parent ($self)
694	for @widgets;	768	for @widgets;
…		…
754	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
755	}	829	}
756		830
757	#############################################################################	831	#############################################################################
758		832
759	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
760		834
761	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
762		836
763	sub new {	837	sub new {
764	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
765		839
766	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767		841
768	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
769	}	843	}
770		844
771	sub add {	845	sub add {
…		…
778	sub remove {	852	sub remove {
779	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
780		854
781	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
782		856
783	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
784	unless @{$self->{children}};	858	unless @{$self->{children}};
785	}	859	}
786		860
787	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
788		862
…		…
800		874
801	#############################################################################	875	#############################################################################
802		876
803	# back-buffered drawing area	877	# back-buffered drawing area
804		878
805	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
806		880
807	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
808		882
809	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
810		884
811	sub new {	885	sub new {
812	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
813		887
814	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
836	}	910	}
837		911
838	sub render_child {	912	sub render_child {
839	my ($self) = @_;	913	my ($self) = @_;
840		914
841	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
843	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
844		918
845	{	919	{
846	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
847		921
848	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
849	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
850	}	926	}
851
852	$self->_render;
853	};	927	};
854	}	928	}
855		929
856	sub _draw {	930	sub _draw {
857	my ($self) = @_;	931	my ($self) = @_;
858
859	my ($w, $h) = @$self{qw(w h)};
860		932
861	my $tex = $self->{texture}	933	my $tex = $self->{texture}
862	or return;	934	or return;
863		935
864	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
865	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
867		939
868	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
869		941
870	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
871	}	943	}
872		944
873	#############################################################################	945	#############################################################################
874		946
875	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
876		948
		949	use List::Util qw(min max);
		950
877	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
878		952
879	sub new {	953	sub new {
880	my $class = shift;	954	my $class = shift;
881		955
882	$class->SUPER::new (	956	$class->SUPER::new (
…		…
912	}	986	}
913		987
914	sub set_offset {	988	sub set_offset {
915	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
916		990
917	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
918	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
919		993
920	$self->update;	994	$self->update;
921	}	995	}
922		996
923	# hmm, this does not work for topleft of $self... but we should not ask for that	997	# hmm, this does not work for topleft of $self... but we should not ask for that
…		…
942	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
944	) {	1018	) {
945	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1019	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946	} else {	1020	} else {
947	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
948	}	1022	}
949	}	1023	}
950		1024
951	sub _render {	1025	sub _render {
952	my ($self) = @_;	1026	my ($self) = @_;
953		1027
954	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1028	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1029	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956		1030
957	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958		1032
959	$self->SUPER::_render;	1033	$self->SUPER::_render;
960	}	1034	}
961		1035
962	#############################################################################	1036	#############################################################################
963		1037
964	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
965		1039
966	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
967		1041
968	sub new {	1042	sub new {
969	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
970		1044
971	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
972		1046
973	my $self;	1047	my $self;
974		1048
975	my $slider = new CFClient::UI::Slider	1049	my $hslider = new CFPlus::UI::Slider
		1050	vertical => 0,
		1051	range => [0, 0, 1, 0.01], # HACK fix
		1052	on_changed => sub {
		1053	$self->{hpos} = $_[1];
		1054	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1055	},
		1056	;
		1057
		1058	my $vslider = new CFPlus::UI::Slider
976	vertical => 1,	1059	vertical => 1,
977	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
978	on_changed => sub {	1061	on_changed => sub {
979	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980	},	1064	},
981	;	1065	;
982		1066
983	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
984	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
		1070	can_events => 1,
985	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
986	%arg,	1075	%arg,
987	);	1076	);
988		1077
		1078	$self->{vp} = new CFPlus::UI::ViewPort
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	;
		1083
989	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
990	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
991		1087
992	$self	1088	$self
993	}	1089	}
994		1090
…		…
998	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
999		1095
1000	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1001	}	1097	}
1002		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1105	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1106
		1107	my $visible = $w1 > $w2;
		1108	if ($visible != $self->{hslider}{visible}) {
		1109	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1110	: $self->{hslider}->hide;
		1111	}
		1112
		1113	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1114	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1115
		1116	my $visible = $h1 > $h2;
		1117	if ($visible != $self->{vslider}{visible}) {
		1118	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1119	: $self->{vslider}->hide;
		1120	}
		1121	}
		1122
		1123	sub update {
		1124	my ($self) = @_;
		1125
		1126	$self->SUPER::update;
		1127	$self->update_slider;
		1128	}
		1129
		1130	sub invoke_mouse_wheel {
		1131	my ($self, $ev) = @_;
		1132
		1133	return 0 unless $ev->{dy}; # only vertical movements for now
		1134
		1135	$self->{vslider}->emit (mouse_wheel => $ev);
		1136
		1137	1
		1138	}
		1139
		1140	sub invoke_button_down {
		1141	my ($self, $ev, $x, $y) = @_;
		1142
		1143	if ($ev->{button} == 2) {
		1144	$self->grab_focus;
		1145
		1146	$self->{motion} = sub {
		1147	my ($ev, $x, $y) = @_;
		1148
		1149	$self->{vp}->set_offset (
		1150	$self->{vp}{view_x} - $ev->{xrel},
		1151	$self->{vp}{view_y} - $ev->{yrel},
		1152	);
		1153	};
		1154
		1155	return 1;
		1156	}
		1157
		1158	0
		1159	}
		1160
1003	sub invoke_button_up {	1161	sub invoke_button_up {
1004	my ($self, $ev) = @_;	1162	my ($self, $ev, $x, $y) = @_;
1005		1163
1006	warn "button up $ev->{button}\n";#d#	1164	if (delete $self->{motion}) {
		1165	return 1;
1007		1166	}
		1167
1008	0	1168	0
1009	}	1169	}
1010		1170
1011	sub update_slider {	1171	sub invoke_mouse_motion {
1012	my ($self) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1013		1173
1014	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1174	if ($self->{motion}) {
1015	}	1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
1016		1178
1017	sub update {	1179	0
1018	my ($self) = @_;
1019
1020	$self->SUPER::update;
1021
1022	$self->update_slider;
1023	}	1180	}
1024		1181
1025	sub invoke_size_allocate {	1182	sub invoke_size_allocate {
1026	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1027		1184
1028	$self->update_slider;	1185	$self->update_slider;
1029
1030	$self->SUPER::invoke_size_allocate ($w, $h)	1186	$self->SUPER::invoke_size_allocate ($w, $h)
1031	}	1187	}
1032		1188
1033	#############################################################################	1189	#############################################################################
1034		1190
1035	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1036		1192
1037	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1038		1194
1039	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1040		1196
1041	sub new {	1197	sub new {
1042	my $class = shift;	1198	my $class = shift;
1043		1199
1044	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1070	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1071	}	1227	}
1072		1228
1073	#############################################################################	1229	#############################################################################
1074		1230
1075	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1076		1232
1077	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1078		1234
1079	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1080		1336
1081	my $bg =	1337	my $bg =
1082	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1084		1340
1085	my @border =	1341	my @border =
1086	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1088		1344
1089	sub new {	1345	sub new {
1090	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1091		1347
…		…
1097	min_w => 64,	1353	min_w => 64,
1098	min_h => 32,	1354	min_h => 32,
1099	%arg,	1355	%arg,
1100	);	1356	);
1101		1357
1102	$self->{title_widget} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1103	align => 0,	1359	align => 0,
1104	valign => 1,	1360	valign => 1,
1105	text => $self->{title},	1361	text => $self->{title},
1106	fontsize => $self->{border},	1362	fontsize => $self->{border},
1107	if exists $self->{title};	1363	if exists $self->{title};
1108		1364
1109	if ($self->{has_close_button}) {	1365	if ($self->{has_close_button}) {
1110	$self->{close_button} =	1366	$self->{close_button} =
1111	new CFClient::UI::ImageButton	1367	new CFPlus::UI::ImageButton
1112	path => 'x1_close.png',	1368	path => 'x1_close.png',
1113	on_activate => sub { $self->emit ("delete") };	1369	on_activate => sub { $self->emit ("delete") };
1114		1370
1115	$self->CFClient::UI::Container::add ($self->{close_button});	1371	$self->CFPlus::UI::Container::add ($self->{close_button});
1116	}	1372	}
1117		1373
1118	$self	1374	$self
1119	}	1375	}
1120		1376
1121	sub add {	1377	sub add {
1122	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1123		1379
1124	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
1125	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1381	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1382	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127	}	1383	}
1128		1384
1129	sub border {	1385	sub border {
1130	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1131	}	1387	}
…		…
1239	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1240		1496
1241	! ! $self->{motion}	1497	! ! $self->{motion}
1242	}	1498	}
1243		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
		1506	}
		1507
1244	sub _draw {	1508	sub _draw {
1245	my ($self) = @_;	1509	my ($self) = @_;
1246		1510
1247	my $child = $self->{children}[0];	1511	my $child = $self->{children}[0];
1248		1512
…		…
1285	if $self->{close_button};	1549	if $self->{close_button};
1286	}	1550	}
1287		1551
1288	#############################################################################	1552	#############################################################################
1289		1553
1290	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1291		1555
1292	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1293		1557
1294	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1295		1559
1296	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1297		1561
1298	sub new {	1562	sub new {
1299	my $class = shift;	1563	my $class = shift;
1300		1564
1301	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1302	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1303	@_,	1569	@_,
1304	)	1570	)
1305	}	1571	}
1306		1572
1307	sub children {	1573	sub children {
1308	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309	}	1575	}
1310		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1311	sub add {	1578	sub add {
1312	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1313		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1314	$child->set_parent ($self);	1583	$child->set_parent ($self);
1315	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1316		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1317	$self->realloc;	1589	$self->realloc;
1318	}	1590	}
1319		1591
1320	sub remove {	1592	sub remove {
1321	my ($self, $child) = @_;	1593	my ($self, $child) = @_;
1322		1594
1323	# TODO: not yet implemented	1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1324	}	1600	}
1325		1601
1326	# TODO: move to container class maybe? send children a signal on removal?	1602	# TODO: move to container class maybe? send children a signal on removal?
1327	sub clear {	1603	sub clear {
1328	my ($self) = @_;	1604	my ($self) = @_;
…		…
1377	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1378		1654
1379	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1380	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1381		1657
1382	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1383	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1384	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1385	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1386		1662
1387	# linearly scale sizes
1388	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390		1664
1391	CFClient::UI::harmonize $ws;	1665	CFPlus::UI::harmonize $ws;
		1666
		1667	my @row_expand = @{$self->{row_expand}};
		1668	@row_expand = (1) x @$ws unless @row_expand;
		1669	my $row_expand = (sum @row_expand) || 1;
		1670
		1671	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1672
1392	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1393		1674
1394	my $y;	1675	my $y;
1395		1676
1396	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1397	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1440	}	1721	}
1441	}	1722	}
1442		1723
1443	#############################################################################	1724	#############################################################################
1444		1725
1445	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1446		1727
		1728	use List::Util qw(min max);
		1729
1447	our @ISA = CFClient::UI::Container::;	1730	our @ISA = CFPlus::UI::Container::;
		1731
		1732	sub add {
		1733	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1734
		1735	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1736	$self->SUPER::add ($child);
		1737	}
		1738
		1739	sub _scale($$$) {
		1740	my ($mode, $val, $max) = @_;
		1741
		1742	$mode eq "abs" ? $val
		1743	: $mode eq "rel" ? $val * $max
		1744	: 0
		1745	}
		1746
		1747	sub size_request {
		1748	my ($self) = @_;
		1749
		1750	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1751
		1752	# determine overall size by querying abs widgets
		1753	for my $child ($self->visible_children) {
		1754	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1755
		1756	if ($pos eq "abs") {
		1757	$w = _scale $size, $w, $child->{req_w};
		1758	$h = _scale $size, $h, $child->{req_h};
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	# now layout remaining widgets
		1769	for my $child ($self->visible_children) {
		1770	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1771
		1772	if ($pos ne "abs") {
		1773	$x = _scale $pos, $x, $W;
		1774	$y = _scale $pos, $x, $H;
		1775	$w = _scale $size, $w, $child->{req_w};
		1776	$h = _scale $size, $h, $child->{req_h};
		1777
		1778	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1779	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1780	}
		1781	}
		1782
		1783	my $W = $x2 - $x1;
		1784	my $H = $y2 - $y1;
		1785
		1786	($W, $H)
		1787	}
		1788
		1789	sub invoke_size_allocate {
		1790	my ($self, $W, $H) = @_;
		1791
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	$x = _scale $pos, $x, $W;
		1796	$y = _scale $pos, $x, $H;
		1797	$w = _scale $size, $w, $child->{req_w};
		1798	$h = _scale $size, $h, $child->{req_h};
		1799
		1800	$child->configure ($x, $y, $w, $h);
		1801	}
		1802
		1803	1
		1804	}
		1805
		1806	#############################################################################
		1807
		1808	package CFPlus::UI::Box;
		1809
		1810	our @ISA = CFPlus::UI::Container::;
1448		1811
1449	sub size_request {	1812	sub size_request {
1450	my ($self) = @_;	1813	my ($self) = @_;
1451		1814
1452	$self->{vertical}	1815	$self->{vertical}
…		…
1485	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1486	for 0 .. $#children;	1849	for 0 .. $#children;
1487	}	1850	}
1488	}	1851	}
1489		1852
1490	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1491		1854
1492	my $pos = 0;	1855	my $pos = 0;
1493	for (0 .. $#children) {	1856	for (0 .. $#children) {
1494	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1495	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1500	1	1863	1
1501	}	1864	}
1502		1865
1503	#############################################################################	1866	#############################################################################
1504		1867
1505	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1506		1869
1507	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1508		1871
1509	sub new {	1872	sub new {
1510	my $class = shift;	1873	my $class = shift;
1511		1874
1512	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1515	)	1878	)
1516	}	1879	}
1517		1880
1518	#############################################################################	1881	#############################################################################
1519		1882
1520	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1521		1884
1522	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1523		1886
1524	sub new {	1887	sub new {
1525	my $class = shift;	1888	my $class = shift;
1526		1889
1527	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1530	)	1893	)
1531	}	1894	}
1532		1895
1533	#############################################################################	1896	#############################################################################
1534		1897
1535	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1536		1899
1537	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1538		1901
1539	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1540		1903
1541	sub new {	1904	sub new {
1542	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1543		1906
1544	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1547	#active_bg => none	1910	#active_bg => none
1548	#font => default_font	1911	#font => default_font
1549	#text => initial text	1912	#text => initial text
1550	#markup => initial narkup	1913	#markup => initial narkup
1551	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1552	ellipsise => 3, # end	1916	ellipsise => 3, # end
1553	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1554	fontsize => 1,	1918	fontsize => 1,
1555	align => -1,	1919	align => -1,
1556	valign => -1,	1920	valign => -1,
1557	padding_x => 2,	1921	padding_x => 2,
1558	padding_y => 2,	1922	padding_y => 2,
1559	can_events => 0,	1923	can_events => 0,
1560	%arg	1924	%arg
1561	);	1925	);
1562		1926
1563	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1564	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1565	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1566	$self->{template} = $layout;	1930	$self->{template} = $layout;
1567	}	1931	}
1568		1932
1569	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1571	} else {	1935	} else {
1572	$self->set_text (delete $self->{text});	1936	$self->set_text (delete $self->{text});
1573	}	1937	}
1574		1938
1575	$self	1939	$self
1576	}
1577
1578	sub escape($) {
1579	local $_ = $_[0];
1580
1581	s/&/&amp;/g;
1582	s/>/&gt;/g;
1583	s/</&lt;/g;
1584
1585	$_
1586	}	1940	}
1587		1941
1588	sub update {	1942	sub update {
1589	my ($self) = @_;	1943	my ($self) = @_;
1590		1944
…		…
1717	};	2071	};
1718		2072
1719	my $w = List::Util::min $self->{w} + 4, $size->[0];	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1720	my $h = List::Util::min $self->{h} + 2, $size->[1];	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1721		2075
1722	$self->{layout}->render ($self->{ox}, $self->{oy});	2076	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723	}	2077	}
1724		2078
1725	#############################################################################	2079	#############################################################################
1726		2080
1727	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1728		2082
1729	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1730		2084
1731	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1732		2086
1733	sub new {	2087	sub new {
1734	my $class = shift;	2088	my $class = shift;
1735		2089
1736	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1740	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1741	can_hover => 1,	2095	can_hover => 1,
1742	can_focus => 1,	2096	can_focus => 1,
1743	valign => 0,	2097	valign => 0,
1744	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1745	#text => ...	2100	#text => ...
1746	#hidden => "*",	2101	#hidden => "*",
1747	@_	2102	@_
1748	)	2103	)
1749	}	2104	}
…		…
1794	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1795	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1796		2151
1797	my $text = $self->get_text;	2152	my $text = $self->get_text;
1798		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2155
1799	if ($uni == 8) {	2156	if ($uni == 8) {
1800	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1802	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1803	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1804	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1805	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1806	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1807	} elsif ($sym == CFClient::SDLK_HOME) {	2164	} elsif ($sym == CFPlus::SDLK_HOME) {
		2165	# what a hack
		2166	$self->{cursor} =
		2167	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2168	? length $1
		2169	: 0;
		2170	} elsif ($sym == CFPlus::SDLK_END) {
		2171	# uh, again
		2172	$self->{cursor} =
		2173	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2174	? $self->{cursor} + length $1
		2175	: length $self->{text};
		2176	} elsif ($uni == 21) { # ctrl-u
		2177	$text = "";
1808	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1809	} elsif ($sym == CFClient::SDLK_END) {
1810	$self->{cursor} = length $text;
1811	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1812	$self->emit ('escape');	2180	$self->emit ('escape');
1813	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1814	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1815	} else {	2185	} else {
1816	return 0;	2186	return 0;
1817	}	2187	}
1818		2188
1819	$self->_set_text ($text);	2189	$self->_set_text ($text);
1820		2190
1821	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1822		2193
1823	1	2194	1
1824	}	2195	}
1825		2196
1826	sub invoke_focus_in {	2197	sub invoke_focus_in {
…		…
1888	utf8::encode $text;	2259	utf8::encode $text;
1889		2260
1890	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2261	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891	}	2262	}
1892		2263
1893	glColor @{$self->{fg}};
1894	glBegin GL_LINES;	2264	glBegin GL_LINES;
1895	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2265	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2266	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897	glEnd;	2267	glEnd;
1898	}	2268	}
1899	}	2269	}
1900		2270
		2271	#############################################################################
		2272
1901	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1902		2274
1903	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1904		2276
1905	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1906		2278
1907	sub invoke_key_down {	2279	sub invoke_key_down {
1908	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1909		2281
1910	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1911		2283
1912	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1913	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1914	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
1915		2287
1916	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1917	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1918	$self->emit (activate => $txt);	2290	$self->emit (activate => $txt);
1919	$self->update;	2291	$self->update;
1920		2292
1921	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1922	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1923	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1924	}	2296	}
1925	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1926	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1928	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1929	}	2301	}
1930	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1931	}	2303	}
1932		2304
1933	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1934	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1935	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936		2308
1937	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1938	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1947	1	2319	1
1948	}	2320	}
1949		2321
1950	#############################################################################	2322	#############################################################################
1951		2323
		2324	package CFPlus::UI::TextEdit;
		2325
		2326	our @ISA = CFPlus::UI::EntryBase::;
		2327
		2328	use CFPlus::OpenGL;
		2329
		2330	sub move_cursor_ver {
		2331	my ($self, $dy) = @_;
		2332
		2333	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2334
		2335	$y += $dy;
		2336
		2337	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2338	$self->{cursor} = $index;
		2339	delete $self->{cur_h};
		2340	$self->update;
		2341	return;
		2342	}
		2343	}
		2344
		2345	sub invoke_key_down {
		2346	my ($self, $ev) = @_;
		2347
		2348	my $sym = $ev->{sym};
		2349
		2350	if ($sym == CFPlus::SDLK_UP) {
		2351	$self->move_cursor_ver (-1);
		2352	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2353	$self->move_cursor_ver (+1);
		2354	} else {
		2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
		2358	1
		2359	}
		2360
		2361	#############################################################################
		2362
1952	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1953		2364
1954	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1955		2366
1956	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1957		2368
1958	my @tex =	2369	my @tex =
1959	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1961		2372
1962	sub new {	2373	sub new {
1963	my $class = shift;	2374	my $class = shift;
1964		2375
…		…
2001	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
2002	}	2413	}
2003		2414
2004	#############################################################################	2415	#############################################################################
2005		2416
		2417	package CFPlus::UI::CheckBox;
		2418
		2419	our @ISA = CFPlus::UI::DrawBG::;
		2420
		2421	my @tex =
		2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	$class->SUPER::new (
		2431	padding_x => 2,
		2432	padding_y => 2,
		2433	fg => [1, 1, 1],
		2434	active_fg => [1, 1, 0],
		2435	bg => [0, 0, 0, 0.2],
		2436	active_bg => [1, 1, 1, 0.5],
		2437	state => 0,
		2438	can_hover => 1,
		2439	@_
		2440	)
		2441	}
		2442
		2443	sub size_request {
		2444	my ($self) = @_;
		2445
		2446	(6) x 2
		2447	}
		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
		2457	sub invoke_button_down {
		2458	my ($self, $ev, $x, $y) = @_;
		2459
		2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2462	$self->toggle;
		2463	} else {
		2464	return 0
		2465	}
		2466
		2467	1
		2468	}
		2469
		2470	sub _draw {
		2471	my ($self) = @_;
		2472
		2473	$self->SUPER::_draw;
		2474
		2475	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2476
		2477	my ($w, $h) = @$self{qw(w h)};
		2478
		2479	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2480
		2481	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2482
		2483	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2484
		2485	glEnable GL_TEXTURE_2D;
		2486	$tex->draw_quad_alpha (0, 0, $s, $s);
		2487	glDisable GL_TEXTURE_2D;
		2488	}
		2489
		2490	#############################################################################
		2491
		2492	package CFPlus::UI::Image;
		2493
		2494	our @ISA = CFPlus::UI::Base::;
		2495
		2496	use CFPlus::OpenGL;
		2497
		2498	our %texture_cache;
		2499
		2500	sub new {
		2501	my $class = shift;
		2502
		2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
		2507
		2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
		2510
		2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2513
		2514	CFPlus::weaken $texture_cache{$self->{path}};
		2515
		2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2517
		2518	$self
		2519	}
		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
		2536	sub size_request {
		2537	my ($self) = @_;
		2538
		2539	($self->{tex}{w}, $self->{tex}{h})
		2540	}
		2541
		2542	sub _draw {
		2543	my ($self) = @_;
		2544
		2545	my $tex = $self->{tex};
		2546
		2547	my ($w, $h) = ($self->{w}, $self->{h});
		2548
		2549	if ($self->{rot90}) {
		2550	glRotate 90, 0, 0, 1;
		2551	glTranslate 0, -$self->{w}, 0;
		2552
		2553	($w, $h) = ($h, $w);
		2554	}
		2555
		2556	glEnable GL_TEXTURE_2D;
		2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2558
		2559	$tex->draw_quad (0, 0, $w, $h);
		2560
		2561	glDisable GL_TEXTURE_2D;
		2562	}
		2563
		2564	#############################################################################
		2565
2006	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
2007		2567
2008	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
2009		2569
2010	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
2011		2571
2012	my %textures;	2572	my %textures;
2013		2573
2014	sub new {	2574	sub new {
2015	my $class = shift;	2575	my $class = shift;
…		…
2037	1	2597	1
2038	}	2598	}
2039		2599
2040	#############################################################################	2600	#############################################################################
2041		2601
2042	package CFClient::UI::CheckBox;
2043
2044	our @ISA = CFClient::UI::DrawBG::;
2045
2046	my @tex =
2047	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050	use CFClient::OpenGL;
2051
2052	sub new {
2053	my $class = shift;
2054
2055	$class->SUPER::new (
2056	padding_x => 2,
2057	padding_y => 2,
2058	fg => [1, 1, 1],
2059	active_fg => [1, 1, 0],
2060	bg => [0, 0, 0, 0.2],
2061	active_bg => [1, 1, 1, 0.5],
2062	state => 0,
2063	can_hover => 1,
2064	@_
2065	)
2066	}
2067
2068	sub size_request {
2069	my ($self) = @_;
2070
2071	(6) x 2
2072	}
2073
2074	sub toggle {
2075	my ($self) = @_;
2076
2077	$self->{state} = !$self->{state};
2078	$self->emit (changed => $self->{state});
2079	$self->update;
2080	}
2081
2082	sub invoke_button_down {
2083	my ($self, $ev, $x, $y) = @_;
2084
2085	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087	$self->toggle;
2088	} else {
2089	return 0
2090	}
2091
2092	1
2093	}
2094
2095	sub _draw {
2096	my ($self) = @_;
2097
2098	$self->SUPER::_draw;
2099
2100	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102	my ($w, $h) = @$self{qw(w h)};
2103
2104	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108	my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110	glEnable GL_TEXTURE_2D;
2111	$tex->draw_quad_alpha (0, 0, $s, $s);
2112	glDisable GL_TEXTURE_2D;
2113	}
2114
2115	#############################################################################
2116
2117	package CFClient::UI::Image;	2602	package CFPlus::UI::VGauge;
2118		2603
2119	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2120
2121	use CFClient::OpenGL;
2122
2123	our %texture_cache;
2124
2125	sub new {
2126	my $class = shift;
2127
2128	my $self = $class->SUPER::new (
2129	can_events => 0,
2130	@_,
2131	);
2132
2133	$self->{path} || $self->{tex}
2134	or Carp::croak "'path' or 'tex' attributes required";
2135
2136	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2137	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139	Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143	$self
2144	}
2145
2146	sub size_request {
2147	my ($self) = @_;
2148
2149	($self->{tex}{w}, $self->{tex}{h})
2150	}
2151
2152	sub _draw {
2153	my ($self) = @_;
2154
2155	my $tex = $self->{tex};
2156
2157	my ($w, $h) = ($self->{w}, $self->{h});
2158
2159	if ($self->{rot90}) {
2160	glRotate 90, 0, 0, 1;
2161	glTranslate 0, -$self->{w}, 0;
2162
2163	($w, $h) = ($h, $w);
2164	}
2165
2166	glEnable GL_TEXTURE_2D;
2167	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169	$tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171	glDisable GL_TEXTURE_2D;
2172	}
2173
2174	#############################################################################
2175
2176	package CFClient::UI::VGauge;
2177
2178	our @ISA = CFClient::UI::Base::;
2179		2605
2180	use List::Util qw(min max);	2606	use List::Util qw(min max);
2181		2607
2182	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2183		2609
2184	my %tex = (	2610	my %tex = (
2185	food => [	2611	food => [
2186	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188	],	2614	],
2189	grace => [	2615	grace => [
2190	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192	],	2618	],
2193	hp => [	2619	hp => [
2194	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196	],	2622	],
2197	mana => [	2623	mana => [
2198	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200	],	2626	],
2201	);	2627	);
2202		2628
2203	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2306	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2307	}	2733	}
2308		2734
2309	#############################################################################	2735	#############################################################################
2310		2736
2311	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2312		2738
2313	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2314		2740
2315	sub new {	2741	sub new {
2316	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2317		2743
2318	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2320	can_hover => 1,	2746	can_hover => 1,
2321	can_events => 1,	2747	can_events => 1,
2322	%arg,	2748	%arg,
2323	);	2749	);
2324		2750
2325	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2752	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328		2754
2329	$self	2755	$self
2330	}	2756	}
2331		2757
2332	sub set_fontsize {	2758	sub set_fontsize {
…		…
2353	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2354	}	2780	}
2355		2781
2356	#############################################################################	2782	#############################################################################
2357		2783
2358	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2359		2785
2360	use strict;	2786	use strict;
2361		2787
2362	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2363		2789
2364	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2365		2791
2366	my @tex =	2792	my @tex =
2367	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2369		2795
2370	sub new {	2796	sub new {
2371	my $class = shift;	2797	my $class = shift;
2372		2798
…		…
2461	}	2887	}
2462		2888
2463	1	2889	1
2464	}	2890	}
2465		2891
		2892	sub invoke_mouse_wheel {
		2893	my ($self, $ev) = @_;
		2894
		2895	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2896
		2897	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2898
		2899	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2900
		2901	! ! $delta
		2902	}
		2903
2466	sub update {	2904	sub update {
2467	my ($self) = @_;	2905	my ($self) = @_;
2468		2906
2469	delete $self->{knob_w};	2907	delete $self->{knob_w};
2470	$self->SUPER::update;	2908	$self->SUPER::update;
…		…
2517	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2518	}	2956	}
2519		2957
2520	#############################################################################	2958	#############################################################################
2521		2959
2522	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2523		2961
2524	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2525		2963
2526	sub new {	2964	sub new {
2527	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2528		2966
2529	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2530		2968
2531	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2532	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534	to_value => sub { shift },	2972	to_value => sub { shift },
2535	from_value => sub { shift },	2973	from_value => sub { shift },
2536	%arg,	2974	%arg,
2537	);	2975	);
2538		2976
…		…
2558	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2559	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2560		2998
2561	#############################################################################	2999	#############################################################################
2562		3000
2563	package CFClient::UI::TextScroller;	3001	package CFPlus::UI::TextScroller;
2564		3002
2565	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2566		3004
2567	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2568		3006
2569	sub new {	3007	sub new {
2570	my $class = shift;	3008	my $class = shift;
2571		3009
2572	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
2573	fontsize => 1,	3011	fontsize => 1,
2574	can_events => 0,	3012	can_events => 1,
2575	indent => 0,	3013	indent => 0,
2576	#font => default_font	3014	#font => default_font
2577	@_,	3015	@_,
2578		3016
2579	layout => (new CFClient::Layout),	3017	layout => (new CFPlus::Layout),
2580	par => [],	3018	par => [],
		3019	max_par => 0,
2581	height => 0,	3020	height => 0,
2582	children => [	3021	children => [
2583	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2584	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2585	],	3024	],
2586	);	3025	);
2587		3026
2588	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2589		3028
…		…
2619		3058
2620	$self->reflow;	3059	$self->reflow;
2621		3060
2622	local $self->{children} = [$empty, $slider];	3061	local $self->{children} = [$empty, $slider];
2623	$self->SUPER::invoke_size_allocate ($w, $h)	3062	$self->SUPER::invoke_size_allocate ($w, $h)
		3063	}
		3064
		3065	sub invoke_mouse_wheel {
		3066	my ($self, $ev) = @_;
		3067
		3068	return 0 unless $ev->{dy}; # only vertical movements
		3069
		3070	$self->{children}[1]->emit (mouse_wheel => $ev);
		3071
		3072	1
2624	}	3073	}
2625		3074
2626	sub get_layout {	3075	sub get_layout {
2627	my ($self, $para) = @_;	3076	my ($self, $para) = @_;
2628		3077
…		…
2656		3105
2657	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2658	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2659	}	3108	}
2660		3109
		3110	sub current_paragraph {
		3111	my ($self) = @_;
		3112
		3113	$self->{top_paragraph} - 1
		3114	}
		3115
		3116	sub scroll_to {
		3117	my ($self, $para) = @_;
		3118
		3119	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3120
		3121	$self->{scroll_to} = $para;
		3122	$self->update;
		3123	}
		3124
2661	sub clear {	3125	sub clear {
2662	my ($self) = @_;	3126	my ($self) = @_;
2663		3127
2664	my (undef, undef, @other) = @{ $self->{children} };	3128	my (undef, undef, @other) = @{ $self->{children} };
2665	$self->remove ($_) for @other;	3129	$self->remove ($_) for @other;
…		…
2668	$self->{height} = 0;	3132	$self->{height} = 0;
2669	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670	}	3134	}
2671		3135
2672	sub add_paragraph {	3136	sub add_paragraph {
2673	my ($self, $color, $para, $indent) = @_;	3137	my $self = shift;
2674		3138
2675	my ($text, @w) = ref $para ? @$para : $para;	3139	for my $para (@_) {
2676
2677	$para = {	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
2678	w => 1e10,	3146	w => 1e10,
2679	wrapped => 1,	3147	wrapped => 1,
2680	fg => $color,
2681	indent => $indent,
2682	markup => $text,
2683	widget => \@w,
2684	};	3148	};
2685		3149
2686	$self->add (@w) if @w;	3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687	push @{$self->{par}}, $para;	3151	push @{$self->{par}}, $para;
		3152	}
		3153
		3154	if (my $max = $self->{max_par}) {
		3155	shift @{$self->{par}} while @{$self->{par}} > $max;
		3156	}
2688		3157
2689	$self->{need_reflow}++;	3158	$self->{need_reflow}++;
2690	$self->update;	3159	$self->update;
2691	}	3160	}
2692		3161
2693	sub scroll_to_bottom {	3162	sub scroll_to_bottom {
2694	my ($self) = @_;	3163	my ($self) = @_;
2695		3164
2696	$self->{scroll_to_bottom} = 1;	3165	$self->{scroll_to} = $#{$self->{par}};
2697	$self->update;	3166	$self->update;
2698	}	3167	}
2699		3168
		3169	sub force_uptodate {
		3170	my ($self) = @_;
		3171
		3172	if (delete $self->{need_reflow}) {
		3173	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3174
		3175	my $height = 0;
		3176
		3177	for my $para (@{$self->{par}}) {
		3178	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3179	my $layout = $self->get_layout ($para);
		3180	my ($w, $h) = $layout->size;
		3181
		3182	$para->{w} = $w + $para->{indent};
		3183	$para->{h} = $h;
		3184	$para->{wrapped} = $layout->has_wrapped;
		3185	}
		3186
		3187	$para->{y} = $height;
		3188	$height += $para->{h};
		3189	}
		3190
		3191	$self->{height} = $height;
		3192	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3193
		3194	delete $self->{texture};
		3195	}
		3196
		3197	if (my $paridx = delete $self->{scroll_to}) {
		3198	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3199	}
		3200	}
		3201
2700	sub update {	3202	sub update {
2701	my ($self) = @_;	3203	my ($self) = @_;
2702		3204
2703	$self->SUPER::update;	3205	$self->SUPER::update;
2704		3206
2705	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2706		3208
2707	delete $self->{texture};	3209	delete $self->{texture};
2708		3210
2709	$ROOT->on_post_alloc ($self => sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2710	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711		3215
2712	if (delete $self->{need_reflow}) {
2713	my $height = 0;
2714
2715	for my $para (@{$self->{par}}) {
2716	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717	my $layout = $self->get_layout ($para);
2718	my ($w, $h) = $layout->size;
2719
2720	$para->{w} = $w + $para->{indent};
2721	$para->{h} = $h;
2722	$para->{wrapped} = $layout->has_wrapped;
2723	}
2724
2725	$height += $para->{h};
2726	}
2727
2728	$self->{height} = $height;
2729
2730	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732	delete $self->{texture};
2733	}
2734
2735	if (delete $self->{scroll_to_bottom}) {
2736	$self->{children}[1]->set_value (1e10);
2737	}
2738
2739	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740	glClearColor 0, 0, 0, 0;	3217	glClearColor 0, 0, 0, 0;
2741	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2742		3219
		3220	package CFPlus::UI::Base;
		3221	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3222	(0, 0, $self->{w}, $self->{h});
		3223
		3224	my $top = int $self->{children}[1]{range}[0];
		3225
		3226	my $paridx = 0;
		3227	my $top_paragraph;
2743	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2744		3229
2745	my $y0 = $top;	3230	my $y0 = $top;
2746	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2747		3232
2748	my $y = 0;
2749
2750	for my $para (@{$self->{par}}) {	3233	for my $para (@{$self->{par}}) {
2751	my $h = $para->{h};	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2752		3236
2753	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2754
2755	my $layout = $self->get_layout ($para);	3238	my $layout = $self->get_layout ($para);
2756		3239
2757	$layout->render ($para->{indent}, $y - $y0);	3240	$layout->render ($para->{indent}, $y - $y0);
2758		3241
2759	if (my @w = @{ $para->{widget} }) {	3242	if (my @w = @{ $para->{widget} }) {
…		…
2768	$_->draw;	3251	$_->draw;
2769	}	3252	}
2770	}	3253	}
2771	}	3254	}
2772		3255
2773	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2774	}	3258	}
		3259
		3260	$self->{top_paragraph} = $top_paragraph;
2775	};	3261	};
2776	});	3262	});
2777	}	3263	}
2778		3264
2779	sub reconfigure {	3265	sub reconfigure {
…		…
2797	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2798	}	3284	}
2799		3285
2800	#############################################################################	3286	#############################################################################
2801		3287
2802	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2803		3289
2804	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2805		3291
2806	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2807		3293
2808	sub moveto {	3294	sub moveto {
2809	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2810		3296
2811	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2839	glPopMatrix;	3325	glPopMatrix;
2840	}	3326	}
2841		3327
2842	#############################################################################	3328	#############################################################################
2843		3329
2844	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2845		3331
2846	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2847		3333
2848	sub new {	3334	sub new {
2849	my $class = shift;	3335	my $class = shift;
2850		3336
2851	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2863	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2864	}	3350	}
2865		3351
2866	#############################################################################	3352	#############################################################################
2867		3353
2868	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2869		3355
2870	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2871		3357
2872	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2873		3359
2874	sub new {	3360	sub new {
2875	my $class = shift;	3361	my $class = shift;
2876		3362
2877	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2880	)	3366	)
2881	}	3367	}
2882		3368
2883	sub set_tooltip_from {	3369	sub set_tooltip_from {
2884	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2885		3374
2886	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2887		3376
2888	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2889	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2893	}	3382	}
2894		3383
2895	$tooltip =~ s/^\n+//;	3384	$tooltip =~ s/^\n+//;
2896	$tooltip =~ s/\n+$//;	3385	$tooltip =~ s/\n+$//;
2897		3386
2898	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2899	markup => $tooltip,	3388	markup => $tooltip,
2900	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901	fontsize => 0.8,	3390	fontsize => 0.8,
2902	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2903	ellipsise => 0,	3392	ellipsise => 0,
2904	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2905	);	3394	);
2906	}	3395	}
2907		3396
…		…
2926		3415
2927	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2928	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2929	or return;	3418	or return;
2930		3419
		3420	if ($widget->{visible}) {
2931	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932		3422
2933	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934	if $x + $self->{w} > $self->{root}{w};	3424	if $x + $self->{w} > $self->{root}{w};
2935		3425
2936	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2937	});	3430	});
2938	}	3431	}
2939		3432
2940	sub _draw {	3433	sub _draw {
2941	my ($self) = @_;	3434	my ($self) = @_;
…		…
2965	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
2966	}	3459	}
2967		3460
2968	#############################################################################	3461	#############################################################################
2969		3462
2970	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
2971		3464
2972	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
2973		3466
2974	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
2975		3468
2976	sub new {	3469	sub new {
2977	my $class = shift;	3470	my $class = shift;
2978		3471
2979	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
2980	aspect => 1,	3475	aspect => 1,
2981	can_events => 0,	3476	can_events => 0,
2982	@_,	3477	@_,
2983	);	3478	);
2984		3479
2985	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
2986	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
2987		3482
2988	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
2989	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990	hard => 1,	3485	hard => 1,
2991	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
2992	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
2993	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
2994	$widget->update;	3492	$self->update;
2995	},	3493	},
2996	);	3494	);
		3495
		3496	$self->update_face;
2997	}	3497	}
2998		3498
2999	$self	3499	$self
3000	}	3500	}
3001		3501
		3502	sub update_face {
		3503	my ($self) = @_;
		3504
		3505	return unless $::CONN;
		3506
		3507	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3508	if ($anim && @$anim) {
		3509	delete $self->{wait_face};
		3510	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3511	}
		3512	}
		3513	}
		3514
3002	sub size_request {	3515	sub size_request {
3003	(32, 8)	3516	my ($self) = @_;
		3517
		3518	if ($::CONN) {
		3519	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3520	if (my $tex = $::CONN->{texture}[$faceid]) {
		3521	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3522	} else {
		3523	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3524	$self->realloc;
		3525	});
		3526	}
		3527	}
		3528	}
		3529
		3530	($self->{size_w} || 8, $self->{size_h} || 8)
3004	}	3531	}
3005		3532
3006	sub update {	3533	sub update {
3007	my ($self) = @_;	3534	my ($self) = @_;
3008		3535
…		…
3014	sub _draw {	3541	sub _draw {
3015	my ($self) = @_;	3542	my ($self) = @_;
3016		3543
3017	return unless $::CONN;	3544	return unless $::CONN;
3018		3545
3019	my $face;	3546	$self->SUPER::_draw;
3020		3547
3021	if ($self->{frame}) {
3022	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
3023		3549	or return;
3024	$face = $anim->[ $self->{frame} % @$anim ]
3025	if $anim && @$anim;
3026	}
3027		3550
3028	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
3029		3552
3030	if ($tex) {	3553	if ($tex) {
3031	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
3032	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033	glColor 0, 0, 0, 1;	3556	glColor 0, 0, 0, 1;
…		…
3045	$self->SUPER::destroy;	3568	$self->SUPER::destroy;
3046	}	3569	}
3047		3570
3048	#############################################################################	3571	#############################################################################
3049		3572
3050	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
3051		3574
3052	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
3053		3576
3054	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
3055		3578
3056	#############################################################################	3579	#############################################################################
3057		3580
3058	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
3059		3582
3060	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
3061		3584
3062	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
3063		3586
3064	sub new {	3587	sub new {
3065	my $class = shift;	3588	my $class = shift;
3066		3589
3067	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
3068	items => [],	3591	items => [],
3069	z => 100,	3592	z => 100,
3070	@_,	3593	@_,
3071	);	3594	);
3072		3595
3073	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074		3597
3075	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
3076	my ($widget, $cb, $tooltip) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
3077		3600
3078	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
3079	if (!ref $widget) {	3602	if (!ref $widget) {
3080	if ($widget =~ /\t/) {	3603	if ($widget =~ /\t/) {
3081	my ($left, $right) = split /\t/, $widget, 2;	3604	my ($left, $right) = split /\t/, $widget, 2;
3082		3605
3083	$widget = new CFClient::UI::HBox	3606	$widget = new CFPlus::UI::HBox
3084	can_hover => 1,	3607	can_hover => 1,
3085	can_events => 1,	3608	can_events => 1,
3086	tooltip => $tooltip,	3609	tooltip => $tooltip,
3087	children => [	3610	children => [
3088	(new CFClient::UI::Label markup => $left, expand => 1),	3611	(new CFPlus::UI::Label markup => $left, expand => 1),
3089	(new CFClient::UI::Label markup => $right, align => +1),	3612	(new CFPlus::UI::Label markup => $right, align => +1),
3090	],	3613	],
3091	;	3614	;
3092		3615
3093	} else {	3616	} else {
3094	$widget = new CFClient::UI::Label	3617	$widget = new CFPlus::UI::Label
3095	can_hover => 1,	3618	can_hover => 1,
3096	can_events => 1,	3619	can_events => 1,
3097	markup => $widget,	3620	markup => $widget,
3098	tooltip => $tooltip;	3621	tooltip => $tooltip;
3099	}	3622	}
…		…
3147	1	3670	1
3148	}	3671	}
3149		3672
3150	#############################################################################	3673	#############################################################################
3151		3674
3152	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
3153		3676
3154	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
3155		3678
3156	sub new {	3679	sub new {
3157	my $class = shift;	3680	my $class = shift;
3158		3681
3159	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
3220	$self->{current}->draw;	3743	$self->{current}->draw;
3221	}	3744	}
3222		3745
3223	#############################################################################	3746	#############################################################################
3224		3747
3225	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3226		3749
3227	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3228		3751
3229	sub new {	3752	sub new {
3230	my $class = shift;	3753	my $class = shift;
3231		3754
3232	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3233	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3234	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3236	@_,	3759	@_,
3237	);	3760	);
3238		3761
3239	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3243	}	3766	}
3244		3767
3245	sub add {	3768	sub add {
3246	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3247		3770
3248	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3249		3772
3250	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3251	markup => $title,	3774	markup => $title,
3252	tooltip => $tooltip,	3775	tooltip => $tooltip,
3253	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3254	);	3777	);
3255		3778
…		…
3269	$self->emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3270	}	3793	}
3271		3794
3272	#############################################################################	3795	#############################################################################
3273		3796
3274	package CFClient::UI::Combobox;	3797	package CFPlus::UI::Selector;
3275		3798
3276	use utf8;	3799	use utf8;
3277		3800
3278	our @ISA = CFClient::UI::Button::;	3801	our @ISA = CFPlus::UI::Button::;
3279		3802
3280	sub new {	3803	sub new {
3281	my $class = shift;	3804	my $class = shift;
3282		3805
3283	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
…		…
3300	my ($value, $title, $tooltip) = @$_;	3823	my ($value, $title, $tooltip) = @$_;
3301		3824
3302	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303	}	3826	}
3304		3827
3305	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306	}	3829	}
3307		3830
3308	sub _set_value {	3831	sub _set_value {
3309	my ($self, $value) = @_;	3832	my ($self, $value) = @_;
3310		3833
…		…
3325	$self->emit (changed => $value);	3848	$self->emit (changed => $value);
3326	}	3849	}
3327		3850
3328	#############################################################################	3851	#############################################################################
3329		3852
3330	package CFClient::UI::Statusbox;	3853	package CFPlus::UI::Statusbox;
3331		3854
3332	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3333		3856
3334	sub new {	3857	sub new {
3335	my $class = shift;	3858	my $class = shift;
3336		3859
3337	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3338	fontsize => 0.8,	3861	fontsize => 0.8,
3339	@_,	3862	@_,
3340	);	3863	);
3341		3864
3342	Scalar::Util::weaken (my $this = $self);	3865	CFPlus::weaken (my $this = $self);
3343		3866
3344	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3867	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345		3868
3346	$self	3869	$self
3347	}	3870	}
…		…
3349	sub reorder {	3872	sub reorder {
3350	my ($self) = @_;	3873	my ($self) = @_;
3351	my $NOW = Time::HiRes::time;	3874	my $NOW = Time::HiRes::time;
3352		3875
3353	# freeze display when hovering over any label	3876	# freeze display when hovering over any label
3354	return if $CFClient::UI::TOOLTIP->{owner}	3877	return if $CFPlus::UI::TOOLTIP->{owner}
3355	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356	values %{ $self->{item} };	3879	values %{ $self->{item} };
3357		3880
3358	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3359	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360	}	3883	}
…		…
3381	for ($short) {	3904	for ($short) {
3382	s/^\s+//;	3905	s/^\s+//;
3383	s/\s+/ /g;	3906	s/\s+/ /g;
3384	}	3907	}
3385		3908
3386	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3387	markup => $short,	3910	markup => $short,
3388	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3389	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3390	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3391	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3470	$self->SUPER::destroy;	3993	$self->SUPER::destroy;
3471	}	3994	}
3472		3995
3473	#############################################################################	3996	#############################################################################
3474		3997
3475	package CFClient::UI::Inventory;
3476
3477	our @ISA = CFClient::UI::Table::;
3478
3479	sub new {
3480	my $class = shift;
3481
3482	my $self = $class->SUPER::new (
3483	col_expand => [0, 1, 0],
3484	@_,
3485	);
3486
3487	$self
3488	}
3489
3490	sub set_items {
3491	my ($self, $items) = @_;
3492
3493	$self->clear;
3494	return unless $items;
3495
3496	my @items = sort {
3497	($a->{type} <=> $b->{type})
3498	or ($a->{name} cmp $b->{name})
3499	} values %$items;
3500
3501	$self->{real_items} = \@items;
3502
3503	my $row = 0;
3504	for my $item (@items) {
3505	CFClient::Item::update_widgets $item;
3506
3507	$self->add (0, $row, $item->{face_widget});
3508	$self->add (1, $row, $item->{desc_widget});
3509	$self->add (2, $row, $item->{weight_widget});
3510
3511	$row++;
3512	}
3513	}
3514
3515	#############################################################################
3516
3517	package CFClient::UI::SpellList;
3518
3519	our @ISA = CFClient::UI::Table::;
3520
3521	sub new {
3522	my $class = shift;
3523
3524	my $self = $class->SUPER::new (
3525	binding => [],
3526	commands => [],
3527	@_,
3528	)
3529	}
3530
3531	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544	sub rebuild_spell_list {
3545	my ($self) = @_;
3546
3547	$CFClient::UI::ROOT->on_refresh ($self => sub {
3548	$self->clear;
3549
3550	return unless $::CONN;
3551
3552	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558	my $row = 0;
3559
3560	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561	my $spell = $self->{spell}{$_};
3562
3563	$row++;
3564
3565	my $spell_cb = sub {
3566	my ($widget, $ev) = @_;
3567
3568	if ($ev->{button} == 1) {
3569	$::CONN->user_send ("cast $spell->{name}");
3570	} elsif ($ev->{button} == 2) {
3571	$::CONN->user_send ("invoke $spell->{name}");
3572	} elsif ($ev->{button} == 3) {
3573	(new CFClient::UI::Menu
3574	items => [
3575	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577	],
3578	)->popup ($ev);
3579	} else {
3580	return 0;
3581	}
3582
3583	1
3584	};
3585
3586	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588	#TODO: add path info to tooltip
3589	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591	$self->add (0, $row, new CFClient::UI::Face
3592	face => $spell->{face},
3593	can_hover => 1,
3594	can_events => 1,
3595	tooltip => $tooltip,
3596	on_button_down => $spell_cb,
3597	);
3598
3599	$self->add (1, $row, new CFClient::UI::Label
3600	expand => 1,
3601	text => $spell->{name},
3602	can_hover => 1,
3603	can_events => 1,
3604	tooltip => $tooltip,
3605	on_button_down => $spell_cb,
3606	);
3607
3608	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612	}
3613	});
3614	}
3615
3616	sub add_spell {
3617	my ($self, $spell) = @_;
3618
3619	$self->{spell}->{$spell->{name}} = $spell;
3620	$self->rebuild_spell_list;
3621	}
3622
3623	sub remove_spell {
3624	my ($self, $spell) = @_;
3625
3626	delete $self->{spell}->{$spell->{name}};
3627	$self->rebuild_spell_list;
3628	}
3629
3630	sub clear_spells {
3631	my ($self) = @_;
3632
3633	$self->{spell} = {};
3634	$self->rebuild_spell_list;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::Root;	3998	package CFPlus::UI::Root;
3640		3999
3641	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3642		4001
3643	use List::Util qw(min max);	4002	use List::Util qw(min max);
3644		4003
3645	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3646		4005
3647	sub new {	4006	sub new {
3648	my $class = shift;	4007	my $class = shift;
3649		4008
3650	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3651	visible => 1,	4010	visible => 1,
3652	@_,	4011	@_,
3653	);	4012	);
3654		4013
3655	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3656		4015
3657	$self	4016	$self
3658	}	4017	}
3659		4018
3660	sub size_request {	4019	sub size_request {
…		…
3829	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
3830		4189
3831	$w = max $widget->{min_w}, $w;	4190	$w = max $widget->{min_w}, $w;
3832	$h = max $widget->{min_h}, $h;	4191	$h = max $widget->{min_h}, $h;
3833		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
3834	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836		4198
3837	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3838	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
…		…
3864	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
3866	glLoadIdentity;	4228	glLoadIdentity;
3867		4229
3868	{	4230	{
3869	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
3870		4232
3871	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
3873	}
3874		4235
3875	$self->_draw;	4236	$self->_draw;
		4237	}
3876	}	4238	}
3877		4239
3878	#############################################################################	4240	#############################################################################
3879		4241
3880	package CFClient::UI;	4242	package CFPlus::UI;
3881		4243
3882	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
3883	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884		4246
3885	1	4247	1
3886		4248

Diff Legend

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