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.326 by root, Sun Jul 16 20:04:08 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) = @_;
418		450
		451	Carp::confess unless $self->{parent};#d#
		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 {
423	my ($self) = @_;	457	my ($self) = @_;
…		…
452		486
453	$FOCUS->emit ("focus_out") if $FOCUS;	487	$FOCUS->emit ("focus_out") if $FOCUS;
454	$self->emit ("focus_in");	488	$self->emit ("focus_in");
455	}	489	}
456		490
457	sub invoke_mouse_motion { 1 }	491	sub invoke_mouse_motion { 0 }
458	sub invoke_button_up { 1 }	492	sub invoke_button_up { 0 }
459	sub invoke_key_down { 1 }	493	sub invoke_key_down { 0 }
460	sub invoke_key_up { 1 }	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;
466		501
467	1	502	0
468	}	503	}
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
479	#d##TODO# stop propagating at first true, do not use sum	532	# I do not really like this solution, but I do not like duplication
480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before	533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
481	|| ($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
482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
483	}	550	}
484		551
485	sub find_widget {	552	sub find_widget {
486	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
487		554
…		…
495	}	562	}
496		563
497	sub set_parent {	564	sub set_parent {
498	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
499		566
500	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
501	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
502	}	569	}
503		570
504	sub realloc {	571	sub realloc {
505	my ($self) = @_;	572	my ($self) = @_;
…		…
571	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
572	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
573	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
574	glEnd;	641	glEnd;
575	glPopMatrix;	642	glPopMatrix;
576	#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;
577	}	644	}
578		645
579	$self->_draw;	646	$self->_draw;
580	glPopMatrix;	647	glPopMatrix;
581	}	648	}
…		…
584	my ($self) = @_;	651	my ($self) = @_;
585		652
586	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
587	}	654	}
588		655
		656	my $cntx;#d#
589	sub DESTROY {	657	sub DESTROY {
590	my ($self) = @_;	658	my ($self) = @_;
591		659
592	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
593
594	delete $WIDGET{$self+0};
595		661
596	eval { $self->destroy };	662	eval { $self->destroy };
597	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};
598	}	666	}
599		667
600	#############################################################################	668	#############################################################################
601		669
602	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
603		671
604	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
605		673
606	use strict;	674	use strict;
607	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
608		676
609	sub new {	677	sub new {
610	my $class = shift;	678	my $class = shift;
611		679
612	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
643	}	711	}
644	}	712	}
645		713
646	#############################################################################	714	#############################################################################
647		715
648	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
649		717
650	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
651		719
652	sub new {	720	sub new {
653	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
654	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
655	}	723	}
…		…
662		730
663	sub draw { }	731	sub draw { }
664		732
665	#############################################################################	733	#############################################################################
666		734
667	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
668		736
669	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
670		738
671	sub new {	739	sub new {
672	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
673		741
674	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
683	if $children;	751	if $children;
684		752
685	$self	753	$self
686	}	754	}
687		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
688	sub add {	764	sub add {
689	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
690		766
691	$_->set_parent ($self)	767	$_->set_parent ($self)
692	for @widgets;	768	for @widgets;
…		…
752	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
753	}	829	}
754		830
755	#############################################################################	831	#############################################################################
756		832
757	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
758		834
759	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
760		836
761	sub new {	837	sub new {
762	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
763		839
764	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765		841
766	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
767	}	843	}
768		844
769	sub add {	845	sub add {
…		…
776	sub remove {	852	sub remove {
777	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
778		854
779	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
780		856
781	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
782	unless @{$self->{children}};	858	unless @{$self->{children}};
783	}	859	}
784		860
785	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
786		862
…		…
798		874
799	#############################################################################	875	#############################################################################
800		876
801	# back-buffered drawing area	877	# back-buffered drawing area
802		878
803	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
804		880
805	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
806		882
807	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
808		884
809	sub new {	885	sub new {
810	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
811		887
812	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
834	}	910	}
835		911
836	sub render_child {	912	sub render_child {
837	my ($self) = @_;	913	my ($self) = @_;
838		914
839	$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 {
840	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
841	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
842		918
843	{	919	{
844	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
845		921
846	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
847	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
848	}	926	}
849
850	$self->_render;
851	};	927	};
852	}	928	}
853		929
854	sub _draw {	930	sub _draw {
855	my ($self) = @_;	931	my ($self) = @_;
856
857	my ($w, $h) = @$self{qw(w h)};
858		932
859	my $tex = $self->{texture}	933	my $tex = $self->{texture}
860	or return;	934	or return;
861		935
862	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
865		939
866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
867		941
868	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
869	}	943	}
870		944
871	#############################################################################	945	#############################################################################
872		946
873	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
874		948
		949	use List::Util qw(min max);
		950
875	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
876		952
877	sub new {	953	sub new {
878	my $class = shift;	954	my $class = shift;
879		955
880	$class->SUPER::new (	956	$class->SUPER::new (
…		…
910	}	986	}
911		987
912	sub set_offset {	988	sub set_offset {
913	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
914		990
915	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
916	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
917		993
918	$self->update;	994	$self->update;
919	}	995	}
920		996
921	# 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
…		…
940	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
942	) {	1018	) {
943	$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})
944	} else {	1020	} else {
945	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
946	}	1022	}
947	}	1023	}
948		1024
949	sub _render {	1025	sub _render {
950	my ($self) = @_;	1026	my ($self) = @_;
951		1027
952	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};
953	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};
954		1030
955	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956		1032
957	$self->SUPER::_render;	1033	$self->SUPER::_render;
958	}	1034	}
959		1035
960	#############################################################################	1036	#############################################################################
961		1037
962	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
963		1039
964	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
965		1041
966	sub new {	1042	sub new {
967	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
968		1044
969	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
970		1046
971	my $self;	1047	my $self;
972		1048
973	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
974	vertical => 1,	1059	vertical => 1,
975	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
976	on_changed => sub {	1061	on_changed => sub {
977	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978	},	1064	},
979	;	1065	;
980		1066
981	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
982	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
		1070	can_events => 1,
983	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
984	%arg,	1075	%arg,
985	);	1076	);
986		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
987	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
988	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
989		1087
990	$self	1088	$self
991	}	1089	}
992		1090
…		…
999	}	1097	}
1000		1098
1001	sub update_slider {	1099	sub update_slider {
1002	my ($self) = @_;	1100	my ($self) = @_;
1003		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	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	}
1005	}	1121	}
1006		1122
1007	sub update {	1123	sub update {
1008	my ($self) = @_;	1124	my ($self) = @_;
1009		1125
1010	$self->SUPER::update;	1126	$self->SUPER::update;
1011
1012	$self->update_slider;	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
		1161	sub invoke_button_up {
		1162	my ($self, $ev, $x, $y) = @_;
		1163
		1164	if (delete $self->{motion}) {
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_mouse_motion {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if ($self->{motion}) {
		1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
		1178
		1179	0
1013	}	1180	}
1014		1181
1015	sub invoke_size_allocate {	1182	sub invoke_size_allocate {
1016	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1017		1184
1018	$self->update_slider;	1185	$self->update_slider;
1019
1020	$self->SUPER::invoke_size_allocate ($w, $h)	1186	$self->SUPER::invoke_size_allocate ($w, $h)
1021	}	1187	}
1022		1188
1023	#############################################################################	1189	#############################################################################
1024		1190
1025	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1026		1192
1027	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1028		1194
1029	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1030		1196
1031	sub new {	1197	sub new {
1032	my $class = shift;	1198	my $class = shift;
1033		1199
1034	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1060	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1061	}	1227	}
1062		1228
1063	#############################################################################	1229	#############################################################################
1064		1230
1065	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1066		1232
1067	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1068		1234
1069	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;
1070		1336
1071	my $bg =	1337	my $bg =
1072	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1073	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1074		1340
1075	my @border =	1341	my @border =
1076	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1077	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);
1078		1344
1079	sub new {	1345	sub new {
1080	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1081		1347
…		…
1087	min_w => 64,	1353	min_w => 64,
1088	min_h => 32,	1354	min_h => 32,
1089	%arg,	1355	%arg,
1090	);	1356	);
1091		1357
1092	$self->{title_widget} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1093	align => 0,	1359	align => 0,
1094	valign => 1,	1360	valign => 1,
1095	text => $self->{title},	1361	text => $self->{title},
1096	fontsize => $self->{border},	1362	fontsize => $self->{border},
1097	if exists $self->{title};	1363	if exists $self->{title};
1098		1364
1099	if ($self->{has_close_button}) {	1365	if ($self->{has_close_button}) {
1100	$self->{close_button} =	1366	$self->{close_button} =
1101	new CFClient::UI::ImageButton	1367	new CFPlus::UI::ImageButton
1102	path => 'x1_close.png',	1368	path => 'x1_close.png',
1103	on_activate => sub { $self->emit ("delete") };	1369	on_activate => sub { $self->emit ("delete") };
1104		1370
1105	$self->CFClient::UI::Container::add ($self->{close_button});	1371	$self->CFPlus::UI::Container::add ($self->{close_button});
1106	}	1372	}
1107		1373
1108	$self	1374	$self
1109	}	1375	}
1110		1376
1111	sub add {	1377	sub add {
1112	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1113		1379
1114	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
1115	$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};
1116	$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};
1117	}	1383	}
1118		1384
1119	sub border {	1385	sub border {
1120	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1121	}	1387	}
…		…
1229	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1230		1496
1231	! ! $self->{motion}	1497	! ! $self->{motion}
1232	}	1498	}
1233		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
		1506	}
		1507
1234	sub _draw {	1508	sub _draw {
1235	my ($self) = @_;	1509	my ($self) = @_;
1236		1510
1237	my $child = $self->{children}[0];	1511	my $child = $self->{children}[0];
1238		1512
…		…
1275	if $self->{close_button};	1549	if $self->{close_button};
1276	}	1550	}
1277		1551
1278	#############################################################################	1552	#############################################################################
1279		1553
1280	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1281		1555
1282	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1283		1557
1284	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1285		1559
1286	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1287		1561
1288	sub new {	1562	sub new {
1289	my $class = shift;	1563	my $class = shift;
1290		1564
1291	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1292	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1293	@_,	1569	@_,
1294	)	1570	)
1295	}	1571	}
1296		1572
1297	sub children {	1573	sub children {
1298	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1299	}	1575	}
1300		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1301	sub add {	1578	sub add {
1302	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1303		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1304	$child->set_parent ($self);	1583	$child->set_parent ($self);
1305	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1306		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1307	$self->realloc;	1589	$self->realloc;
1308	}	1590	}
1309		1591
1310	sub remove {	1592	sub remove {
1311	my ($self, $child) = @_;	1593	my ($self, $child) = @_;
1312		1594
1313	# TODO: not yet implemented	1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1314	}	1600	}
1315		1601
1316	# 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?
1317	sub clear {	1603	sub clear {
1318	my ($self) = @_;	1604	my ($self) = @_;
…		…
1367	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1368		1654
1369	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1370	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1371		1657
1372	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1373	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1374	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1375	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1376		1662
1377	# linearly scale sizes
1378	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1379	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1380		1664
1381	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
1382	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1383		1674
1384	my $y;	1675	my $y;
1385		1676
1386	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1430	}	1721	}
1431	}	1722	}
1432		1723
1433	#############################################################################	1724	#############################################################################
1434		1725
1435	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1436		1727
		1728	use List::Util qw(min max);
		1729
1437	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::;
1438		1811
1439	sub size_request {	1812	sub size_request {
1440	my ($self) = @_;	1813	my ($self) = @_;
1441		1814
1442	$self->{vertical}	1815	$self->{vertical}
…		…
1475	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1476	for 0 .. $#children;	1849	for 0 .. $#children;
1477	}	1850	}
1478	}	1851	}
1479		1852
1480	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1481		1854
1482	my $pos = 0;	1855	my $pos = 0;
1483	for (0 .. $#children) {	1856	for (0 .. $#children) {
1484	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1485	$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));
…		…
1490	1	1863	1
1491	}	1864	}
1492		1865
1493	#############################################################################	1866	#############################################################################
1494		1867
1495	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1496		1869
1497	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1498		1871
1499	sub new {	1872	sub new {
1500	my $class = shift;	1873	my $class = shift;
1501		1874
1502	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1505	)	1878	)
1506	}	1879	}
1507		1880
1508	#############################################################################	1881	#############################################################################
1509		1882
1510	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1511		1884
1512	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1513		1886
1514	sub new {	1887	sub new {
1515	my $class = shift;	1888	my $class = shift;
1516		1889
1517	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1520	)	1893	)
1521	}	1894	}
1522		1895
1523	#############################################################################	1896	#############################################################################
1524		1897
1525	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1526		1899
1527	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1528		1901
1529	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1530		1903
1531	sub new {	1904	sub new {
1532	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1533		1906
1534	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1537	#active_bg => none	1910	#active_bg => none
1538	#font => default_font	1911	#font => default_font
1539	#text => initial text	1912	#text => initial text
1540	#markup => initial narkup	1913	#markup => initial narkup
1541	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1542	ellipsise => 3, # end	1916	ellipsise => 3, # end
1543	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1544	fontsize => 1,	1918	fontsize => 1,
1545	align => -1,	1919	align => -1,
1546	valign => -1,	1920	valign => -1,
1547	padding_x => 2,	1921	padding_x => 2,
1548	padding_y => 2,	1922	padding_y => 2,
1549	can_events => 0,	1923	can_events => 0,
1550	%arg	1924	%arg
1551	);	1925	);
1552		1926
1553	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1554	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1555	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1556	$self->{template} = $layout;	1930	$self->{template} = $layout;
1557	}	1931	}
1558		1932
1559	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1561	} else {	1935	} else {
1562	$self->set_text (delete $self->{text});	1936	$self->set_text (delete $self->{text});
1563	}	1937	}
1564		1938
1565	$self	1939	$self
1566	}
1567
1568	sub escape($) {
1569	local $_ = $_[0];
1570
1571	s/&/&amp;/g;
1572	s/>/&gt;/g;
1573	s/</&lt;/g;
1574
1575	$_
1576	}	1940	}
1577		1941
1578	sub update {	1942	sub update {
1579	my ($self) = @_;	1943	my ($self) = @_;
1580		1944
…		…
1707	};	2071	};
1708		2072
1709	my $w = List::Util::min $self->{w} + 4, $size->[0];	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1710	my $h = List::Util::min $self->{h} + 2, $size->[1];	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1711		2075
1712	$self->{layout}->render ($self->{ox}, $self->{oy});	2076	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713	}	2077	}
1714		2078
1715	#############################################################################	2079	#############################################################################
1716		2080
1717	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1718		2082
1719	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1720		2084
1721	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1722		2086
1723	sub new {	2087	sub new {
1724	my $class = shift;	2088	my $class = shift;
1725		2089
1726	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1730	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1731	can_hover => 1,	2095	can_hover => 1,
1732	can_focus => 1,	2096	can_focus => 1,
1733	valign => 0,	2097	valign => 0,
1734	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1735	#text => ...	2100	#text => ...
1736	#hidden => "*",	2101	#hidden => "*",
1737	@_	2102	@_
1738	)	2103	)
1739	}	2104	}
…		…
1784	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1785	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1786		2151
1787	my $text = $self->get_text;	2152	my $text = $self->get_text;
1788		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2155
1789	if ($uni == 8) {	2156	if ($uni == 8) {
1790	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1792	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1793	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1794	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1795	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1796	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1797	} 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 = "";
1798	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1799	} elsif ($sym == CFClient::SDLK_END) {
1800	$self->{cursor} = length $text;
1801	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1802	$self->emit ('escape');	2180	$self->emit ('escape');
1803	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1804	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1805	} else {	2185	} else {
1806	return 0;	2186	return 0;
1807	}	2187	}
1808		2188
1809	$self->_set_text ($text);	2189	$self->_set_text ($text);
1810		2190
1811	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1812		2193
1813	1	2194	1
1814	}	2195	}
1815		2196
1816	sub invoke_focus_in {	2197	sub invoke_focus_in {
…		…
1878	utf8::encode $text;	2259	utf8::encode $text;
1879		2260
1880	@$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)
1881	}	2262	}
1882		2263
1883	glColor @{$self->{fg}};
1884	glBegin GL_LINES;	2264	glBegin GL_LINES;
1885	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};
1886	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};
1887	glEnd;	2267	glEnd;
1888	}	2268	}
1889	}	2269	}
1890		2270
		2271	#############################################################################
		2272
1891	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1892		2274
1893	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1894		2276
1895	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1896		2278
1897	sub invoke_key_down {	2279	sub invoke_key_down {
1898	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1899		2281
1900	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1901		2283
1902	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1903	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1904	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
1905		2287
1906	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1907	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1908	$self->emit (activate => $txt);	2290	$self->emit (activate => $txt);
1909	$self->update;	2291	$self->update;
1910		2292
1911	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1912	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1913	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1914	}	2296	}
1915	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1916	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1918	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1919	}	2301	}
1920	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1921	}	2303	}
1922		2304
1923	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1924	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1925	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926		2308
1927	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1928	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1937	1	2319	1
1938	}	2320	}
1939		2321
1940	#############################################################################	2322	#############################################################################
1941		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
1942	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1943		2364
1944	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1945		2366
1946	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1947		2368
1948	my @tex =	2369	my @tex =
1949	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1951		2372
1952	sub new {	2373	sub new {
1953	my $class = shift;	2374	my $class = shift;
1954		2375
…		…
1991	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
1992	}	2413	}
1993		2414
1994	#############################################################################	2415	#############################################################################
1995		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
1996	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
1997		2567
1998	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
1999		2569
2000	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
2001		2571
2002	my %textures;	2572	my %textures;
2003		2573
2004	sub new {	2574	sub new {
2005	my $class = shift;	2575	my $class = shift;
…		…
2027	1	2597	1
2028	}	2598	}
2029		2599
2030	#############################################################################	2600	#############################################################################
2031		2601
2032	package CFClient::UI::CheckBox;
2033
2034	our @ISA = CFClient::UI::DrawBG::;
2035
2036	my @tex =
2037	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040	use CFClient::OpenGL;
2041
2042	sub new {
2043	my $class = shift;
2044
2045	$class->SUPER::new (
2046	padding_x => 2,
2047	padding_y => 2,
2048	fg => [1, 1, 1],
2049	active_fg => [1, 1, 0],
2050	bg => [0, 0, 0, 0.2],
2051	active_bg => [1, 1, 1, 0.5],
2052	state => 0,
2053	can_hover => 1,
2054	@_
2055	)
2056	}
2057
2058	sub size_request {
2059	my ($self) = @_;
2060
2061	(6) x 2
2062	}
2063
2064	sub toggle {
2065	my ($self) = @_;
2066
2067	$self->{state} = !$self->{state};
2068	$self->emit (changed => $self->{state});
2069	$self->update;
2070	}
2071
2072	sub invoke_button_down {
2073	my ($self, $ev, $x, $y) = @_;
2074
2075	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2076	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2077	$self->toggle;
2078	} else {
2079	return 0
2080	}
2081
2082	1
2083	}
2084
2085	sub _draw {
2086	my ($self) = @_;
2087
2088	$self->SUPER::_draw;
2089
2090	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2091
2092	my ($w, $h) = @$self{qw(w h)};
2093
2094	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2095
2096	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2097
2098	my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
2100	glEnable GL_TEXTURE_2D;
2101	$tex->draw_quad_alpha (0, 0, $s, $s);
2102	glDisable GL_TEXTURE_2D;
2103	}
2104
2105	#############################################################################
2106
2107	package CFClient::UI::Image;	2602	package CFPlus::UI::VGauge;
2108		2603
2109	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2110
2111	use CFClient::OpenGL;
2112
2113	our %texture_cache;
2114
2115	sub new {
2116	my $class = shift;
2117
2118	my $self = $class->SUPER::new (
2119	can_events => 0,
2120	@_,
2121	);
2122
2123	$self->{path}
2124	or Carp::croak "required attribute 'path' not set";
2125
2126	$self->{tex} = $texture_cache{$self->{path}} ||=
2127	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2128
2129	Scalar::Util::weaken $texture_cache{$self->{path}};
2130
2131	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2132
2133	$self
2134	}
2135
2136	sub size_request {
2137	my ($self) = @_;
2138
2139	($self->{tex}{w}, $self->{tex}{h})
2140	}
2141
2142	sub _draw {
2143	my ($self) = @_;
2144
2145	my $tex = $self->{tex};
2146
2147	my ($w, $h) = ($self->{w}, $self->{h});
2148
2149	if ($self->{rot90}) {
2150	glRotate 90, 0, 0, 1;
2151	glTranslate 0, -$self->{w}, 0;
2152
2153	($w, $h) = ($h, $w);
2154	}
2155
2156	glEnable GL_TEXTURE_2D;
2157	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158
2159	$tex->draw_quad_alpha (0, 0, $w, $h);
2160
2161	glDisable GL_TEXTURE_2D;
2162	}
2163
2164	#############################################################################
2165
2166	package CFClient::UI::VGauge;
2167
2168	our @ISA = CFClient::UI::Base::;
2169		2605
2170	use List::Util qw(min max);	2606	use List::Util qw(min max);
2171		2607
2172	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2173		2609
2174	my %tex = (	2610	my %tex = (
2175	food => [	2611	food => [
2176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2177	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2178	],	2614	],
2179	grace => [	2615	grace => [
2180	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2181	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/
2182	],	2618	],
2183	hp => [	2619	hp => [
2184	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2185	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2186	],	2622	],
2187	mana => [	2623	mana => [
2188	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189	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/
2190	],	2626	],
2191	);	2627	);
2192		2628
2193	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2296	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2297	}	2733	}
2298		2734
2299	#############################################################################	2735	#############################################################################
2300		2736
2301	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2302		2738
2303	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2304		2740
2305	sub new {	2741	sub new {
2306	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2307		2743
2308	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2310	can_hover => 1,	2746	can_hover => 1,
2311	can_events => 1,	2747	can_events => 1,
2312	%arg,	2748	%arg,
2313	);	2749	);
2314		2750
2315	$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");
2316	$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);
2317	$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");
2318		2754
2319	$self	2755	$self
2320	}	2756	}
2321		2757
2322	sub set_fontsize {	2758	sub set_fontsize {
…		…
2343	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2344	}	2780	}
2345		2781
2346	#############################################################################	2782	#############################################################################
2347		2783
2348	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2349		2785
2350	use strict;	2786	use strict;
2351		2787
2352	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2353		2789
2354	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2355		2791
2356	my @tex =	2792	my @tex =
2357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2358	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2359		2795
2360	sub new {	2796	sub new {
2361	my $class = shift;	2797	my $class = shift;
2362		2798
…		…
2451	}	2887	}
2452		2888
2453	1	2889	1
2454	}	2890	}
2455		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
2456	sub update {	2904	sub update {
2457	my ($self) = @_;	2905	my ($self) = @_;
2458		2906
2459	delete $self->{knob_w};	2907	delete $self->{knob_w};
2460	$self->SUPER::update;	2908	$self->SUPER::update;
…		…
2507	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2508	}	2956	}
2509		2957
2510	#############################################################################	2958	#############################################################################
2511		2959
2512	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2513		2961
2514	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2515		2963
2516	sub new {	2964	sub new {
2517	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2518		2966
2519	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2520		2968
2521	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2522	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2523	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2524	to_value => sub { shift },	2972	to_value => sub { shift },
2525	from_value => sub { shift },	2973	from_value => sub { shift },
2526	%arg,	2974	%arg,
2527	);	2975	);
2528		2976
…		…
2548	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2549	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2550		2998
2551	#############################################################################	2999	#############################################################################
2552		3000
2553	package CFClient::UI::TextScroller;	3001	package CFPlus::UI::TextScroller;
2554		3002
2555	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2556		3004
2557	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2558		3006
2559	sub new {	3007	sub new {
2560	my $class = shift;	3008	my $class = shift;
2561		3009
2562	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
2563	fontsize => 1,	3011	fontsize => 1,
2564	can_events => 0,	3012	can_events => 1,
2565	indent => 0,	3013	indent => 0,
2566	#font => default_font	3014	#font => default_font
2567	@_,	3015	@_,
2568		3016
2569	layout => (new CFClient::Layout),	3017	layout => (new CFPlus::Layout),
2570	par => [],	3018	par => [],
		3019	max_par => 0,
2571	height => 0,	3020	height => 0,
2572	children => [	3021	children => [
2573	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2574	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2575	],	3024	],
2576	);	3025	);
2577		3026
2578	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2579		3028
…		…
2609		3058
2610	$self->reflow;	3059	$self->reflow;
2611		3060
2612	local $self->{children} = [$empty, $slider];	3061	local $self->{children} = [$empty, $slider];
2613	$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
2614	}	3073	}
2615		3074
2616	sub get_layout {	3075	sub get_layout {
2617	my ($self, $para) = @_;	3076	my ($self, $para) = @_;
2618		3077
…		…
2646		3105
2647	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2648	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2649	}	3108	}
2650		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
2651	sub clear {	3125	sub clear {
2652	my ($self) = @_;	3126	my ($self) = @_;
2653		3127
2654	my (undef, undef, @other) = @{ $self->{children} };	3128	my (undef, undef, @other) = @{ $self->{children} };
2655	$self->remove ($_) for @other;	3129	$self->remove ($_) for @other;
…		…
2658	$self->{height} = 0;	3132	$self->{height} = 0;
2659	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2660	}	3134	}
2661		3135
2662	sub add_paragraph {	3136	sub add_paragraph {
2663	my ($self, $color, $para, $indent) = @_;	3137	my $self = shift;
2664		3138
2665	my ($text, @w) = ref $para ? @$para : $para;	3139	for my $para (@_) {
2666
2667	$para = {	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
2668	w => 1e10,	3146	w => 1e10,
2669	wrapped => 1,	3147	wrapped => 1,
2670	fg => $color,
2671	indent => $indent,
2672	markup => $text,
2673	widget => \@w,
2674	};	3148	};
2675		3149
2676	$self->add (@w) if @w;	3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2677	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	}
2678		3157
2679	$self->{need_reflow}++;	3158	$self->{need_reflow}++;
2680	$self->update;	3159	$self->update;
2681	}	3160	}
2682		3161
2683	sub scroll_to_bottom {	3162	sub scroll_to_bottom {
2684	my ($self) = @_;	3163	my ($self) = @_;
2685		3164
2686	$self->{scroll_to_bottom} = 1;	3165	$self->{scroll_to} = $#{$self->{par}};
2687	$self->update;	3166	$self->update;
2688	}	3167	}
2689		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
2690	sub update {	3202	sub update {
2691	my ($self) = @_;	3203	my ($self) = @_;
2692		3204
2693	$self->SUPER::update;	3205	$self->SUPER::update;
2694		3206
2695	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2696		3208
2697	delete $self->{texture};	3209	delete $self->{texture};
2698		3210
2699	$ROOT->on_post_alloc ($self => sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2700	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701		3215
2702	if (delete $self->{need_reflow}) {
2703	my $height = 0;
2704
2705	for my $para (@{$self->{par}}) {
2706	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707	my $layout = $self->get_layout ($para);
2708	my ($w, $h) = $layout->size;
2709
2710	$para->{w} = $w + $para->{indent};
2711	$para->{h} = $h;
2712	$para->{wrapped} = $layout->has_wrapped;
2713	}
2714
2715	$height += $para->{h};
2716	}
2717
2718	$self->{height} = $height;
2719
2720	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2721
2722	delete $self->{texture};
2723	}
2724
2725	if (delete $self->{scroll_to_bottom}) {
2726	$self->{children}[1]->set_value (1e10);
2727	}
2728
2729	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2730	glClearColor 0, 0, 0, 0;	3217	glClearColor 0, 0, 0, 0;
2731	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2732		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;
2733	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2734		3229
2735	my $y0 = $top;	3230	my $y0 = $top;
2736	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2737		3232
2738	my $y = 0;
2739
2740	for my $para (@{$self->{par}}) {	3233	for my $para (@{$self->{par}}) {
2741	my $h = $para->{h};	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2742		3236
2743	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2744
2745	my $layout = $self->get_layout ($para);	3238	my $layout = $self->get_layout ($para);
2746		3239
2747	$layout->render ($para->{indent}, $y - $y0);	3240	$layout->render ($para->{indent}, $y - $y0);
2748		3241
2749	if (my @w = @{ $para->{widget} }) {	3242	if (my @w = @{ $para->{widget} }) {
…		…
2758	$_->draw;	3251	$_->draw;
2759	}	3252	}
2760	}	3253	}
2761	}	3254	}
2762		3255
2763	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2764	}	3258	}
		3259
		3260	$self->{top_paragraph} = $top_paragraph;
2765	};	3261	};
2766	});	3262	});
2767	}	3263	}
2768		3264
2769	sub reconfigure {	3265	sub reconfigure {
…		…
2787	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2788	}	3284	}
2789		3285
2790	#############################################################################	3286	#############################################################################
2791		3287
2792	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2793		3289
2794	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2795		3291
2796	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2797		3293
2798	sub moveto {	3294	sub moveto {
2799	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2800		3296
2801	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2829	glPopMatrix;	3325	glPopMatrix;
2830	}	3326	}
2831		3327
2832	#############################################################################	3328	#############################################################################
2833		3329
2834	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2835		3331
2836	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2837		3333
2838	sub new {	3334	sub new {
2839	my $class = shift;	3335	my $class = shift;
2840		3336
2841	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2853	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2854	}	3350	}
2855		3351
2856	#############################################################################	3352	#############################################################################
2857		3353
2858	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2859		3355
2860	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2861		3357
2862	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2863		3359
2864	sub new {	3360	sub new {
2865	my $class = shift;	3361	my $class = shift;
2866		3362
2867	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2870	)	3366	)
2871	}	3367	}
2872		3368
2873	sub set_tooltip_from {	3369	sub set_tooltip_from {
2874	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2875		3374
2876	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2877		3376
2878	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2879	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2883	}	3382	}
2884		3383
2885	$tooltip =~ s/^\n+//;	3384	$tooltip =~ s/^\n+//;
2886	$tooltip =~ s/\n+$//;	3385	$tooltip =~ s/\n+$//;
2887		3386
2888	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2889	markup => $tooltip,	3388	markup => $tooltip,
2890	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891	fontsize => 0.8,	3390	fontsize => 0.8,
2892	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2893	ellipsise => 0,	3392	ellipsise => 0,
2894	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2895	);	3394	);
2896	}	3395	}
2897		3396
…		…
2916		3415
2917	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2918	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2919	or return;	3418	or return;
2920		3419
		3420	if ($widget->{visible}) {
2921	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922		3422
2923	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924	if $x + $self->{w} > $self->{root}{w};	3424	if $x + $self->{w} > $self->{root}{w};
2925		3425
2926	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2927	});	3430	});
2928	}	3431	}
2929		3432
2930	sub _draw {	3433	sub _draw {
2931	my ($self) = @_;	3434	my ($self) = @_;
…		…
2955	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
2956	}	3459	}
2957		3460
2958	#############################################################################	3461	#############################################################################
2959		3462
2960	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
2961		3464
2962	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
2963		3466
2964	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
2965		3468
2966	sub new {	3469	sub new {
2967	my $class = shift;	3470	my $class = shift;
2968		3471
2969	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
2970	aspect => 1,	3475	aspect => 1,
2971	can_events => 0,	3476	can_events => 0,
2972	@_,	3477	@_,
2973	);	3478	);
2974		3479
2975	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
2976	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
2977		3482
2978	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
2979	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980	hard => 1,	3485	hard => 1,
2981	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
2982	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
2983	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
2984	$widget->update;	3492	$self->update;
2985	},	3493	},
2986	);	3494	);
		3495
		3496	$self->update_face;
2987	}	3497	}
2988		3498
2989	$self	3499	$self
2990	}	3500	}
2991		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
2992	sub size_request {	3515	sub size_request {
2993	(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)
2994	}	3531	}
2995		3532
2996	sub update {	3533	sub update {
2997	my ($self) = @_;	3534	my ($self) = @_;
2998		3535
…		…
3004	sub _draw {	3541	sub _draw {
3005	my ($self) = @_;	3542	my ($self) = @_;
3006		3543
3007	return unless $::CONN;	3544	return unless $::CONN;
3008		3545
3009	my $face;	3546	$self->SUPER::_draw;
3010		3547
3011	if ($self->{frame}) {
3012	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
3013		3549	or return;
3014	$face = $anim->[ $self->{frame} % @$anim ]
3015	if $anim && @$anim;
3016	}
3017		3550
3018	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
3019		3552
3020	if ($tex) {	3553	if ($tex) {
3021	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
3022	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023	glColor 0, 0, 0, 1;	3556	glColor 0, 0, 0, 1;
…		…
3035	$self->SUPER::destroy;	3568	$self->SUPER::destroy;
3036	}	3569	}
3037		3570
3038	#############################################################################	3571	#############################################################################
3039		3572
3040	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
3041		3574
3042	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
3043		3576
3044	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
3045		3578
3046	#############################################################################	3579	#############################################################################
3047		3580
3048	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
3049		3582
3050	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
3051		3584
3052	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
3053		3586
3054	sub new {	3587	sub new {
3055	my $class = shift;	3588	my $class = shift;
3056		3589
3057	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
3058	items => [],	3591	items => [],
3059	z => 100,	3592	z => 100,
3060	@_,	3593	@_,
3061	);	3594	);
3062		3595
3063	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064		3597
3065	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
3066	my ($widget, $cb, $tooltip) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
3067		3600
3068	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
3069	if (!ref $widget) {	3602	if (!ref $widget) {
3070	if ($widget =~ /\t/) {	3603	if ($widget =~ /\t/) {
3071	my ($left, $right) = split /\t/, $widget, 2;	3604	my ($left, $right) = split /\t/, $widget, 2;
3072		3605
3073	$widget = new CFClient::UI::HBox	3606	$widget = new CFPlus::UI::HBox
3074	can_hover => 1,	3607	can_hover => 1,
3075	can_events => 1,	3608	can_events => 1,
3076	tooltip => $tooltip,	3609	tooltip => $tooltip,
3077	children => [	3610	children => [
3078	(new CFClient::UI::Label markup => $left, expand => 1),	3611	(new CFPlus::UI::Label markup => $left, expand => 1),
3079	(new CFClient::UI::Label markup => $right, align => +1),	3612	(new CFPlus::UI::Label markup => $right, align => +1),
3080	],	3613	],
3081	;	3614	;
3082		3615
3083	} else {	3616	} else {
3084	$widget = new CFClient::UI::Label	3617	$widget = new CFPlus::UI::Label
3085	can_hover => 1,	3618	can_hover => 1,
3086	can_events => 1,	3619	can_events => 1,
3087	markup => $widget,	3620	markup => $widget,
3088	tooltip => $tooltip;	3621	tooltip => $tooltip;
3089	}	3622	}
…		…
3137	1	3670	1
3138	}	3671	}
3139		3672
3140	#############################################################################	3673	#############################################################################
3141		3674
3142	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
3143		3676
3144	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
3145		3678
3146	sub new {	3679	sub new {
3147	my $class = shift;	3680	my $class = shift;
3148		3681
3149	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
3210	$self->{current}->draw;	3743	$self->{current}->draw;
3211	}	3744	}
3212		3745
3213	#############################################################################	3746	#############################################################################
3214		3747
3215	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3216		3749
3217	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3218		3751
3219	sub new {	3752	sub new {
3220	my $class = shift;	3753	my $class = shift;
3221		3754
3222	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3223	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3224	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3225	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3226	@_,	3759	@_,
3227	);	3760	);
3228		3761
3229	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3233	}	3766	}
3234		3767
3235	sub add {	3768	sub add {
3236	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3237		3770
3238	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3239		3772
3240	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3241	markup => $title,	3774	markup => $title,
3242	tooltip => $tooltip,	3775	tooltip => $tooltip,
3243	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3244	);	3777	);
3245		3778
…		…
3259	$self->emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3260	}	3793	}
3261		3794
3262	#############################################################################	3795	#############################################################################
3263		3796
3264	package CFClient::UI::Combobox;	3797	package CFPlus::UI::Selector;
3265		3798
3266	use utf8;	3799	use utf8;
3267		3800
3268	our @ISA = CFClient::UI::Button::;	3801	our @ISA = CFPlus::UI::Button::;
3269		3802
3270	sub new {	3803	sub new {
3271	my $class = shift;	3804	my $class = shift;
3272		3805
3273	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
…		…
3290	my ($value, $title, $tooltip) = @$_;	3823	my ($value, $title, $tooltip) = @$_;
3291		3824
3292	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293	}	3826	}
3294		3827
3295	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296	}	3829	}
3297		3830
3298	sub _set_value {	3831	sub _set_value {
3299	my ($self, $value) = @_;	3832	my ($self, $value) = @_;
3300		3833
…		…
3315	$self->emit (changed => $value);	3848	$self->emit (changed => $value);
3316	}	3849	}
3317		3850
3318	#############################################################################	3851	#############################################################################
3319		3852
3320	package CFClient::UI::Statusbox;	3853	package CFPlus::UI::Statusbox;
3321		3854
3322	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3323		3856
3324	sub new {	3857	sub new {
3325	my $class = shift;	3858	my $class = shift;
3326		3859
3327	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3328	fontsize => 0.8,	3861	fontsize => 0.8,
3329	@_,	3862	@_,
3330	);	3863	);
3331		3864
3332	Scalar::Util::weaken (my $this = $self);	3865	CFPlus::weaken (my $this = $self);
3333		3866
3334	$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 });
3335		3868
3336	$self	3869	$self
3337	}	3870	}
…		…
3339	sub reorder {	3872	sub reorder {
3340	my ($self) = @_;	3873	my ($self) = @_;
3341	my $NOW = Time::HiRes::time;	3874	my $NOW = Time::HiRes::time;
3342		3875
3343	# freeze display when hovering over any label	3876	# freeze display when hovering over any label
3344	return if $CFClient::UI::TOOLTIP->{owner}	3877	return if $CFPlus::UI::TOOLTIP->{owner}
3345	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3346	values %{ $self->{item} };	3879	values %{ $self->{item} };
3347		3880
3348	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3349	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350	}	3883	}
…		…
3371	for ($short) {	3904	for ($short) {
3372	s/^\s+//;	3905	s/^\s+//;
3373	s/\s+/ /g;	3906	s/\s+/ /g;
3374	}	3907	}
3375		3908
3376	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3377	markup => $short,	3910	markup => $short,
3378	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3379	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3380	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3381	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3460	$self->SUPER::destroy;	3993	$self->SUPER::destroy;
3461	}	3994	}
3462		3995
3463	#############################################################################	3996	#############################################################################
3464		3997
3465	package CFClient::UI::Inventory;
3466
3467	our @ISA = CFClient::UI::Table::;
3468
3469	sub new {
3470	my $class = shift;
3471
3472	my $self = $class->SUPER::new (
3473	col_expand => [0, 1, 0],
3474	@_,
3475	);
3476
3477	$self
3478	}
3479
3480	sub set_items {
3481	my ($self, $items) = @_;
3482
3483	$self->clear;
3484	return unless $items;
3485
3486	my @items = sort {
3487	($a->{type} <=> $b->{type})
3488	or ($a->{name} cmp $b->{name})
3489	} values %$items;
3490
3491	$self->{real_items} = \@items;
3492
3493	my $row = 0;
3494	for my $item (@items) {
3495	CFClient::Item::update_widgets $item;
3496
3497	$self->add (0, $row, $item->{face_widget});
3498	$self->add (1, $row, $item->{desc_widget});
3499	$self->add (2, $row, $item->{weight_widget});
3500
3501	$row++;
3502	}
3503	}
3504
3505	#############################################################################
3506
3507	package CFClient::UI::SpellList;
3508
3509	our @ISA = CFClient::UI::Table::;
3510
3511	sub new {
3512	my $class = shift;
3513
3514	my $self = $class->SUPER::new (
3515	binding => [],
3516	commands => [],
3517	@_,
3518	)
3519	}
3520
3521	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534	sub rebuild_spell_list {
3535	my ($self) = @_;
3536
3537	$CFClient::UI::ROOT->on_refresh ($self => sub {
3538	$self->clear;
3539
3540	return unless $::CONN;
3541
3542	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548	my $row = 0;
3549
3550	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551	my $spell = $self->{spell}{$_};
3552
3553	$row++;
3554
3555	my $spell_cb = sub {
3556	my ($widget, $ev) = @_;
3557
3558	if ($ev->{button} == 1) {
3559	$::CONN->user_send ("cast $spell->{name}");
3560	} elsif ($ev->{button} == 2) {
3561	$::CONN->user_send ("invoke $spell->{name}");
3562	} elsif ($ev->{button} == 3) {
3563	(new CFClient::UI::Menu
3564	items => [
3565	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567	],
3568	)->popup ($ev);
3569	} else {
3570	return 0;
3571	}
3572
3573	1
3574	};
3575
3576	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578	#TODO: add path info to tooltip
3579	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581	$self->add (0, $row, new CFClient::UI::Face
3582	face => $spell->{face},
3583	can_hover => 1,
3584	can_events => 1,
3585	tooltip => $tooltip,
3586	on_button_down => $spell_cb,
3587	);
3588
3589	$self->add (1, $row, new CFClient::UI::Label
3590	expand => 1,
3591	text => $spell->{name},
3592	can_hover => 1,
3593	can_events => 1,
3594	tooltip => $tooltip,
3595	on_button_down => $spell_cb,
3596	);
3597
3598	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602	}
3603	});
3604	}
3605
3606	sub add_spell {
3607	my ($self, $spell) = @_;
3608
3609	$self->{spell}->{$spell->{name}} = $spell;
3610	$self->rebuild_spell_list;
3611	}
3612
3613	sub remove_spell {
3614	my ($self, $spell) = @_;
3615
3616	delete $self->{spell}->{$spell->{name}};
3617	$self->rebuild_spell_list;
3618	}
3619
3620	sub clear_spells {
3621	my ($self) = @_;
3622
3623	$self->{spell} = {};
3624	$self->rebuild_spell_list;
3625	}
3626
3627	#############################################################################
3628
3629	package CFClient::UI::Root;	3998	package CFPlus::UI::Root;
3630		3999
3631	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3632		4001
3633	use List::Util qw(min max);	4002	use List::Util qw(min max);
3634		4003
3635	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3636		4005
3637	sub new {	4006	sub new {
3638	my $class = shift;	4007	my $class = shift;
3639		4008
3640	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3641	visible => 1,	4010	visible => 1,
3642	@_,	4011	@_,
3643	);	4012	);
3644		4013
3645	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3646		4015
3647	$self	4016	$self
3648	}	4017	}
3649		4018
3650	sub size_request {	4019	sub size_request {
…		…
3819	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
3820		4189
3821	$w = max $widget->{min_w}, $w;	4190	$w = max $widget->{min_w}, $w;
3822	$h = max $widget->{min_h}, $h;	4191	$h = max $widget->{min_h}, $h;
3823		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
3824	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826		4198
3827	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3828	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
…		…
3854	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
3856	glLoadIdentity;	4228	glLoadIdentity;
3857		4229
3858	{	4230	{
3859	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
3860		4232
3861	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
3863	}
3864		4235
3865	$self->_draw;	4236	$self->_draw;
		4237	}
3866	}	4238	}
3867		4239
3868	#############################################################################	4240	#############################################################################
3869		4241
3870	package CFClient::UI;	4242	package CFPlus::UI;
3871		4243
3872	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
3873	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874		4246
3875	1	4247	1
3876		4248

Diff Legend

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