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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
122		133
123	for (@$vals) {	134	for (@$vals) {
124	my $i = int $_ + $rem;	135	my $i = int $_ + $rem;
125	$rem += $_ - $i;	136	$rem += $_ - $i;
126	$_ = $i;	137	$_ = $i;
		138	}
		139	}
		140
		141	sub full_refresh {
		142	# make a copy, otherwise for complains about freed values.
		143	my @widgets = values %WIDGET;
		144
		145	$_->update
		146	for @widgets;
		147	}
		148
		149	# call when resolution changes etc.
		150	sub rescale_widgets {
		151	my ($sx, $sy) = @_;
		152
		153	# make a copy, otherwise for complains about freed values.
		154	my @widgets = values %WIDGET;
		155
		156	for my $widget (@widgets) {
		157	if ($widget->{toplevel}) {
		158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		166	}
		167
		168	$widget->reconfigure;
127	}	169	}
128	}	170	}
129		171
130	#############################################################################	172	#############################################################################
131		173
…		…
150	if (/^connect_(.*)$/) {	192	if (/^connect_(.*)$/) {
151	$self->connect ($1 => delete $self->{$_});	193	$self->connect ($1 => delete $self->{$_});
152	}	194	}
153	}	195	}
154		196
		197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		198
155	$self	199	$self
156	}	200	}
157		201
158	sub destroy {	202	sub destroy {
159	my ($self) = @_;	203	my ($self) = @_;
…		…
162	%$self = ();	206	%$self = ();
163	}	207	}
164		208
165	sub show {	209	sub show {
166	my ($self) = @_;	210	my ($self) = @_;
167
168	return if $self->{parent};	211	return if $self->{parent};
169		212
170	$CFClient::UI::ROOT->add ($self);	213	$CFClient::UI::ROOT->add ($self);
		214	}
		215
		216	sub show_centered {
		217	my ($self) = @_;
		218	return if $self->{parent};
		219
		220	$self->show;
		221
		222	$CFClient::UI::ROOT->on_post_alloc (
		223	"centered $self" => sub {
		224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		225	},
		226	);
171	}	227	}
172		228
173	sub hide {	229	sub hide {
174	my ($self) = @_;	230	my ($self) = @_;
175		231
…		…
224	$self->{y} = $y;	280	$self->{y} = $y;
225	$self->update;	281	$self->update;
226	}	282	}
227		283
228	if ($self->{w} != $w || $self->{h} != $h) {	284	if ($self->{w} != $w || $self->{h} != $h) {
229	$self->{w} = $w;	285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
230	$self->{h} = $h;
231
232	$self->size_allocate ($w, $h);
233	$self->update;
234	}	286	}
235	}	287	}
236		288
237	sub size_allocate {	289	sub size_allocate {
238	# nothing to be done	290	# nothing to be done
239	}	291	}
240		292
		293	sub reconfigure {
		294	my ($self) = @_;
		295
		296	$self->check_size (1);
		297	$self->update;
		298	}
		299
241	sub children {	300	sub children {
242	}	301	}
243		302
244	sub set_max_size {	303	sub set_max_size {
245	my ($self, $w, $h) = @_;	304	my ($self, $w, $h) = @_;
246		305
247	delete $self->{max_w}; $self->{max_w} = $w if $w;	306	delete $self->{max_w}; $self->{max_w} = $w if $w;
248	delete $self->{max_h}; $self->{max_h} = $h if $h;	307	delete $self->{max_h}; $self->{max_h} = $h if $h;
249	}	308	}
250		309
251	# return top left coordinates	310	sub set_tooltip {
252	sub _topleft {
253	my ($self, $x, $y) = @_;	311	my ($self, $tooltip) = @_;
254		312
255	$self->{parent}	313	$self->{tooltip} = $tooltip;
256	or Carp::confess "no parent widget in _topleft\n";#d#
257		314
258	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		316	delete $CFClient::UI::TOOLTIP->{owner};
		317	CFClient::UI::check_tooltip;
		318	}
259	}	319	}
260		320
261	# translate global coordinates to local coordinate system	321	# translate global coordinates to local coordinate system
262	sub coord2local {	322	sub coord2local {
263	my ($self, $x, $y) = @_;	323	my ($self, $x, $y) = @_;
264		324
265	my ($X, $Y) = $self->_topleft;	325	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
266	($x - $X, $y - $Y)
267	}	326	}
268		327
269	# translate local coordinates to global coordinate system	328	# translate local coordinates to global coordinate system
270	sub coord2global {	329	sub coord2global {
271	my ($self, $x, $y) = @_;	330	my ($self, $x, $y) = @_;
272		331
273	my ($X, $Y) = $self->_topleft;	332	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
274	($x + $X, $y + $Y)
275	}	333	}
276		334
277	sub focus_in {	335	sub focus_in {
278	my ($self) = @_;	336	my ($self) = @_;
279		337
…		…
351	glVertex $self->{w}, 0;	409	glVertex $self->{w}, 0;
352	glVertex $self->{w}, $self->{h};	410	glVertex $self->{w}, $self->{h};
353	glVertex 0 , $self->{h};	411	glVertex 0 , $self->{h};
354	glEnd;	412	glEnd;
355	glPopMatrix;	413	glPopMatrix;
356	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357	}	415	}
358	}	416	}
359		417
360	sub _draw {	418	sub _draw {
361	my ($self) = @_;	419	my ($self) = @_;
…		…
377		435
378	sub set_parent {	436	sub set_parent {
379	my ($self, $parent) = @_;	437	my ($self, $parent) = @_;
380		438
381	Scalar::Util::weaken ($self->{parent} = $parent);	439	Scalar::Util::weaken ($self->{parent} = $parent);
		440
		441	# TODO: req_w _does_change after ->reconfigure
		442	$self->check_size
		443	unless exists $self->{req_w};
		444
		445	$self->show;
382	}	446	}
383		447
384	sub check_size {	448	sub check_size {
385	my ($self) = @_;	449	my ($self, $forced) = @_;
386		450
387	$self->{parent}	451	$self->{force_alloc} = 1 if $forced;
388	or return 1;	452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
389
390	my ($w, $h) = $self->{user_w} && $self->{user_h}
391	? @$self{qw(user_w user_h)}
392	: $self->size_request;
393
394	if ($w != $self->{req_w} || $h != $self->{req_h}) {
395	$self->{req_w} = $w;
396	$self->{req_h} = $h;
397
398	$self->{parent}->check_size
399	or $self->size_allocate (
400	(List::Util::max $self->{w}, $w),
401	(List::Util::max $self->{h}, $h),
402	);
403
404	1
405	} else {
406	0
407	}
408	}	453	}
409		454
410	sub update {	455	sub update {
411	my ($self) = @_;	456	my ($self) = @_;
412		457
…		…
427	}	472	}
428		473
429	sub DESTROY {	474	sub DESTROY {
430	my ($self) = @_;	475	my ($self) = @_;
431		476
		477	delete $WIDGET{$self+0};
432	#$self->deactivate;	478	#$self->deactivate;
433	}	479	}
434		480
435	#############################################################################	481	#############################################################################
436		482
…		…
445	my $class = shift;	491	my $class = shift;
446		492
447	# range [value, low, high, page]	493	# range [value, low, high, page]
448		494
449	$class->SUPER::new (	495	$class->SUPER::new (
450	bg => [0, 0, 0, 0.2],	496	#bg => [0, 0, 0, 0.2],
451	active_bg => [1, 1, 1, 0.5],	497	#active_bg => [1, 1, 1, 0.5],
452	@_	498	@_
453	)	499	)
454	}	500	}
455		501
456	sub _draw {	502	sub _draw {
457	my ($self) = @_;	503	my ($self) = @_;
458		504
		505	my $color = $FOCUS == $self && $self->{active_bg}
		506	? $self->{active_bg}
		507	: $self->{bg};
		508
		509	if ($color && (@$color < 4 || $color->[3])) {
459	my ($w, $h) = @$self{qw(w h)};	510	my ($w, $h) = @$self{qw(w h)};
460		511
461	glEnable GL_BLEND;	512	glEnable GL_BLEND;
462	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	513	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
463	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	514	glColor @$color;
464		515
465	glBegin GL_QUADS;	516	glBegin GL_QUADS;
466	glVertex 0 , 0;	517	glVertex 0 , 0;
467	glVertex 0 , $h;	518	glVertex 0 , $h;
468	glVertex $w, $h;	519	glVertex $w, $h;
469	glVertex $w, 0;	520	glVertex $w, 0;
470	glEnd;	521	glEnd;
471		522
472	glDisable GL_BLEND;	523	glDisable GL_BLEND;
		524	}
473	}	525	}
474		526
475	#############################################################################	527	#############################################################################
476		528
477	package CFClient::UI::Empty;	529	package CFClient::UI::Empty;
…		…
509		561
510	$self	562	$self
511	}	563	}
512		564
513	sub add {	565	sub add {
514	my ($self, $child) = @_;	566	my ($self, @widgets) = @_;
515		567
516	$child->set_parent ($self);	568	$_->set_parent ($self)
		569	for @widgets;
517		570
518	use sort 'stable';	571	use sort 'stable';
519		572
520	$self->{children} = [	573	$self->{children} = [
521	sort { $a->{z} <=> $b->{z} }	574	sort { $a->{z} <=> $b->{z} }
522	@{$self->{children}}, $child	575	@{$self->{children}}, @widgets
523	];	576	];
524		577
525	$child->check_size;	578	$self->check_size (1);
		579	$self->update;
526	}	580	}
527		581
528	sub children {	582	sub children {
529	@{ $_[0]{children} }	583	@{ $_[0]{children} }
530	}	584	}
…		…
549		603
550	for (@$children) {	604	for (@$children) {
551	delete $_->{parent};	605	delete $_->{parent};
552	$_->hide;	606	$_->hide;
553	}	607	}
		608
		609	$self->check_size;
		610	$self->update;
554	}	611	}
555		612
556	sub find_widget {	613	sub find_widget {
557	my ($self, $x, $y) = @_;	614	my ($self, $x, $y) = @_;
558		615
…		…
633	}	690	}
634		691
635	sub update {	692	sub update {
636	my ($self) = @_;	693	my ($self) = @_;
637		694
638	# we want to do this delayed...	695	$ROOT->on_post_alloc ($self => sub { $self->render_child });
639	$self->render_chld;
640	$self->SUPER::update;	696	$self->SUPER::update;
641	}
642
643	sub render_chld {
644	my ($self) = @_;
645
646	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647	glClearColor 0, 0, 0, 1;
648	glClear GL_COLOR_BUFFER_BIT;
649	$self->child->draw;
650	};
651	}	697	}
652		698
653	sub size_allocate {	699	sub size_allocate {
654	my ($self, $w, $h) = @_;	700	my ($self, $w, $h) = @_;
655		701
656	$self->child->configure (0, 0, $w, $h);	702	$self->SUPER::size_allocate ($w, $h);
		703	$self->update;
		704	}
657		705
		706	sub _render {
		707	$_[0]{children}[0]->draw;
		708	}
		709
		710	sub render_child {
		711	my ($self) = @_;
		712
		713	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		714	glClearColor 0, 0, 0, 0;
		715	glClear GL_COLOR_BUFFER_BIT;
		716
658	$self->render_chld;	717	$self->_render;
		718	};
659	}	719	}
660		720
661	sub _draw {	721	sub _draw {
662	my ($self) = @_;	722	my ($self) = @_;
663		723
664	my ($w, $h) = ($self->w, $self->h);	724	my ($w, $h) = ($self->w, $self->h);
665		725
666	my $tex = $self->{texture}	726	my $tex = $self->{texture}
667	or return;	727	or return;
668		728
669	glEnable GL_BLEND;
670	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
671	glEnable GL_TEXTURE_2D;	729	glEnable GL_TEXTURE_2D;
672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	730	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		731	glColor 1, 1, 1, 1;
673		732
674	$tex->draw_quad (0, 0, $w, $h);	733	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
675		734
676	glDisable GL_BLEND;
677	glDisable GL_TEXTURE_2D;	735	glDisable GL_TEXTURE_2D;
678	}	736	}
679		737
680	#############################################################################	738	#############################################################################
681		739
682	package CFClient::UI::ViewPort;	740	package CFClient::UI::ViewPort;
683		741
684	our @ISA = CFClient::UI::Window::;	742	our @ISA = CFClient::UI::Window::;
685		743
686	sub new { die }
687
688	sub size_request {	744	sub size_request {
689	my ($self) = @_;	745	my ($self) = @_;
690		746
691	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693		748
694	@$self{qw(child_w child_h)}	749	@$self{qw(child_w child_h)}
695	}	750	}
696		751
697	sub _draw {	752	sub size_allocate {
698	my ($self) = @_;	753	my ($self, $w, $h) = @_;
699		754
700	$self->{children}[1]->draw;	755	my ($cw, $ch) = @$self{qw(child_w child_h)};
		756	# $w = $self->{w};
		757	$self->child->configure (0, 0, $cw, $ch);
		758	$self->update;
701	}	759	}
702		760
		761	sub set_offset {
		762	my ($self, $x, $y) = @_;
		763
		764	$self->{view_x} = int $x;
		765	$self->{view_y} = int $y;
		766
		767	$self->update;
		768	}
		769
		770	# hmm, this does not work for topleft of $self... but we should not ask for that
		771	sub coord2local {
		772	my ($self, $x, $y) = @_;
		773
		774	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		775	}
		776
		777	sub coord2global {
		778	my ($self, $x, $y) = @_;
		779
		780	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		781	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		782
		783	$self->SUPER::coord2global ($x, $y)
		784	}
		785
		786	sub find_widget {
		787	my ($self, $x, $y) = @_;
		788
		789	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		790	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		791	) {
		792	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		793	} else {
		794	$self->CFClient::UI::Base::find_widget ($x, $y)
		795	}
		796	}
		797
		798	sub _render {
		799	my ($self) = @_;
		800
		801	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		802
		803	$self->SUPER::_render;
		804	}
703		805
704	#############################################################################	806	#############################################################################
705		807
706	package CFClient::UI::Frame;	808	package CFClient::UI::ScrolledWindow;
707		809
708	our @ISA = CFClient::UI::Bin::;	810	our @ISA = CFClient::UI::HBox::;
709
710	use CFClient::OpenGL;
711		811
712	sub new {	812	sub new {
713	my $class = shift;	813	my $class = shift;
714		814
		815	my $self;
		816
		817	my $slider = new CFClient::UI::Slider
		818	vertical => 1,
		819	range => [0, 0, 1, 0.01], # HACK fix
		820	connect_changed => sub {
		821	$self->{vp}->set_offset (0, $_[1]);
		822	},
		823	;
		824
715	my $self = $class->SUPER::new (	825	$self = $class->SUPER::new (
716	bg => [1, 1, 1, 1],	826	vp => (new CFClient::UI::ViewPort expand => 1),
717	border_bg => [1, 1, 1, 1],	827	slider => $slider,
718	border => 0.8,
719	@_	828	@_,
720	);	829	);
721		830
		831	$self->{vp}->add ($self->{scrolled});
		832	$self->add ($self->{vp});
		833	$self->add ($self->{slider});
		834
722	$self	835	$self
723	}	836	}
724		837
		838	sub size_allocate {
		839	my ($self, $w, $h) = @_;
		840
		841	$self->SUPER::size_allocate ($w, $h);
		842
		843	my $child = $self->{vp}->child;
		844	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		845	}
		846
		847	#TODO# update range on size_allocate depending on child
		848	# update viewport offset on scroll
		849
		850	#############################################################################
		851
		852	package CFClient::UI::Frame;
		853
		854	our @ISA = CFClient::UI::Bin::;
		855
		856	use CFClient::OpenGL;
		857
		858	sub new {
		859	my $class = shift;
		860
		861	$class->SUPER::new (
		862	bg => undef,
		863	@_,
		864	)
		865	}
		866
725	sub _draw {	867	sub _draw {
726	my ($self) = @_;	868	my ($self) = @_;
727		869
728	my ($w, $h) = ($self->{w}, $self->{h});	870	if ($self->{bg}) {
		871	my ($w, $h) = @$self{qw(w h)};
729		872
730	glEnable GL_BLEND;	873	glEnable GL_BLEND;
731	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	874	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732	glEnable GL_TEXTURE_2D;	875	glColor @{ $self->{bg} };
733	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734		876
735	# glBegin GL_QUADS;	877	glBegin GL_QUADS;
736	# glColor 0, 0, 0, 0;
737	# glVertex 0 , 0;	878	glVertex 0 , 0;
738	# glVertex 0 , $h;	879	glVertex 0 , $h;
739	# glVertex $w, $h;	880	glVertex $w, $h;
740	# glVertex $w, 0;	881	glVertex $w, 0;
741	# glEnd;	882	glEnd;
742		883
743
744	$self->child->draw;
745	glDisable GL_BLEND;	884	glDisable GL_BLEND;
746	glDisable GL_TEXTURE_2D;	885	}
		886
		887	$self->SUPER::_draw;
747	}	888	}
748		889
749	#############################################################################	890	#############################################################################
750		891
751	package CFClient::UI::FancyFrame;	892	package CFClient::UI::FancyFrame;
…		…
764	# TODO: user_x, user_y, overwrite moveto?	905	# TODO: user_x, user_y, overwrite moveto?
765		906
766	my $self = $class->SUPER::new (	907	my $self = $class->SUPER::new (
767	bg => [1, 1, 1, 1],	908	bg => [1, 1, 1, 1],
768	border_bg => [1, 1, 1, 1],	909	border_bg => [1, 1, 1, 1],
769	border => 0.8,	910	border => 0.6,
		911	toplevel => 1,
770	can_events => 1,	912	can_events => 1,
771	@_	913	@_
772	);	914	);
773		915
774	$self->{title} &&= new CFClient::UI::Label	916	$self->{title} &&= new CFClient::UI::Label
775	align => 0,	917	align => 0,
776	valign => 1,	918	valign => 1,
777	text => $self->{title},	919	text => $self->{title},
778	fontsize => 1;	920	fontsize => $self->{border};
779		921
780	$self	922	$self
781	}	923	}
782		924
783	sub border {	925	sub border {
…		…
799	my ($self, $w, $h) = @_;	941	my ($self, $w, $h) = @_;
800		942
801	$h -= List::Util::max 0, $self->border * 2;	943	$h -= List::Util::max 0, $self->border * 2;
802	$w -= List::Util::max 0, $self->border * 2;	944	$w -= List::Util::max 0, $self->border * 2;
803		945
804	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	946	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
805	if $self->{title};	947	if $self->{title};
806		948
807	$self->child->configure ($self->border, $self->border, $w, $h);	949	$self->child->configure ($self->border, $self->border, $w, $h);
808	}	950	}
809		951
810	sub button_down {	952	sub button_down {
811	my ($self, $ev, $x, $y) = @_;	953	my ($self, $ev, $x, $y) = @_;
812		954
		955	my ($w, $h) = @$self{qw(w h)};
813	my $border = $self->border;	956	my $border = $self->border;
814		957
815	if ($x < $self->{w} && $x >= $self->{w} - $border	958	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
816	&& $y < $self->{h} && $y >= $self->{h} - $border) {	959	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
817		960
		961	if ($lr & $td) {
		962	my ($wx, $wy) = ($self->{x}, $self->{y});
818	my ($ox, $oy) = ($ev->{x}, $ev->{y});	963	my ($ox, $oy) = ($ev->{x}, $ev->{y});
819	my ($bw, $bh) = ($self->{w}, $self->{h});	964	my ($bw, $bh) = ($self->{w}, $self->{h});
820		965
		966	my $mx = $x < $border;
		967	my $my = $y < $border;
		968
821	$self->{motion} = sub {	969	$self->{motion} = sub {
822	my ($ev, $x, $y) = @_;	970	my ($ev, $x, $y) = @_;
823		971
824	($x, $y) = ($ev->{x}, $ev->{y});	972	my $dx = $ev->{x} - $ox;
		973	my $dy = $ev->{y} - $oy;
825		974
826	$self->{user_w} = $bw + $x - $ox;	975	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
827	$self->{user_h} = $bh + $y - $oy;	976	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		977	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
828	$self->check_size;	978	$self->check_size;
829	};	979	};
830		980
831	} elsif ($x >= 0 && $x < $self->{w}	981	} elsif ($lr ^ $td) {
832	&& $y >= 0 && $y < $border) {
833
834	my ($ox, $oy) = ($ev->{x}, $ev->{y});	982	my ($ox, $oy) = ($ev->{x}, $ev->{y});
835	my ($bx, $by) = ($self->{x}, $self->{y});	983	my ($bx, $by) = ($self->{x}, $self->{y});
836		984
837	$self->{motion} = sub {	985	$self->{motion} = sub {
838	my ($ev, $x, $y) = @_;	986	my ($ev, $x, $y) = @_;
…		…
861	my ($self) = @_;	1009	my ($self) = @_;
862		1010
863	my ($w, $h ) = ($self->{w}, $self->{h});	1011	my ($w, $h ) = ($self->{w}, $self->{h});
864	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1012	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
865		1013
866	glEnable GL_BLEND;
867	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
868	glEnable GL_TEXTURE_2D;	1014	glEnable GL_TEXTURE_2D;
869	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1015	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
870		1016
871	my $border = $self->border;	1017	my $border = $self->border;
872		1018
873	glColor @{ $self->{border_bg} };	1019	glColor @{ $self->{border_bg} };
874	$tex[1]->draw_quad (0, 0, $w, $border);	1020	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
875	$tex[3]->draw_quad (0, $border, $border, $ch);	1021	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
876	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1022	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
877	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1023	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
878		1024
		1025	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
879	my $bg = $tex[0];	1026	my $bg = $tex[0];
880		1027
881	# TODO: repeat texture not scale	1028	# TODO: repeat texture not scale
882	my $rep_x = $cw / $bg->{w};	1029	my $rep_x = $cw / $bg->{w};
883	my $rep_y = $ch / $bg->{h};	1030	my $rep_y = $ch / $bg->{h};
884		1031
885	glColor @{ $self->{bg} };	1032	glColor @{ $self->{bg} };
886		1033
887	$bg->{s} = $rep_x;	1034	$bg->{s} = $rep_x;
888	$bg->{t} = $rep_y;	1035	$bg->{t} = $rep_y;
889	$bg->{wrap_mode} = 1;	1036	$bg->{wrap_mode} = 1;
890	$bg->draw_quad ($border, $border, $cw, $ch);	1037	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1038	}
891		1039
892	glDisable GL_TEXTURE_2D;	1040	glDisable GL_TEXTURE_2D;
893	glDisable GL_BLEND;
894		1041
895	$self->{title}->draw if $self->{title};	1042	$self->{title}->draw if $self->{title};
		1043
896	$self->child->draw;	1044	$self->child->draw;
897	}	1045	}
898		1046
899	#############################################################################	1047	#############################################################################
900		1048
…		…
1124	}	1272	}
1125		1273
1126	sub size_allocate {	1274	sub size_allocate {
1127	my ($self, $w, $h) = @_;	1275	my ($self, $w, $h) = @_;
1128		1276
		1277	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1278
1129	my $children = $self->{children};	1279	my $children = $self->{children};
1130		1280
1131	my @h = map $_->{req_h}, @$children;	1281	my @h = map $_->{req_h}, @$children;
1132		1282
1133	my $req_h = List::Util::sum @h;	1283	my $req_h = List::Util::sum @h;
…		…
1162		1312
1163	#############################################################################	1313	#############################################################################
1164		1314
1165	package CFClient::UI::Label;	1315	package CFClient::UI::Label;
1166		1316
1167	our @ISA = CFClient::UI::Base::;	1317	our @ISA = CFClient::UI::DrawBG::;
1168		1318
1169	use CFClient::OpenGL;	1319	use CFClient::OpenGL;
1170		1320
1171	sub new {	1321	sub new {
1172	my ($class, %arg) = @_;	1322	my ($class, %arg) = @_;
1173		1323
1174	my $self = $class->SUPER::new (	1324	my $self = $class->SUPER::new (
1175	fg => [1, 1, 1],	1325	fg => [1, 1, 1],
		1326	#bg => none
		1327	#active_bg => none
1176	#font => default_font	1328	#font => default_font
		1329	#text => initial text
		1330	#markup => initial narkup
		1331	#max_w => maximum pixel width
		1332	ellipsise => 3, # end
		1333	layout => (new CFClient::Layout),
1177	fontsize => 1,	1334	fontsize => 1,
1178	text => "",
1179	align => -1,	1335	align => -1,
1180	valign => -1,	1336	valign => -1,
1181	padding => 2,	1337	padding => 2,
1182	layout => new CFClient::Layout,
1183	can_events => 0,	1338	can_events => 0,
1184	%arg	1339	%arg
1185	);	1340	);
1186		1341
1187	if (exists $self->{template}) {	1342	if (exists $self->{template}) {
1188	my $layout = new CFClient::Layout;	1343	my $layout = new CFClient::Layout;
1189	$layout->set_text (delete $self->{template});	1344	$layout->set_text (delete $self->{template});
1190	$self->{template} = $layout;	1345	$self->{template} = $layout;
1191	}	1346	}
1192		1347
1193	$self->set_text (delete $self->{text}) if exists $self->{text};	1348	if (exists $self->{markup}) {
1194	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1349	$self->set_markup (delete $self->{markup});
		1350	} else {
		1351	$self->set_text (delete $self->{text});
		1352	}
1195		1353
1196	$self	1354	$self
1197	}	1355	}
1198		1356
1199	sub escape {	1357	sub escape($) {
1200	local $_ = $_[1];	1358	local $_ = $_[0];
1201		1359
1202	s/&/&amp;/g;	1360	s/&/&amp;/g;
1203	s/>/&gt;/g;	1361	s/>/&gt;/g;
1204	s/</&lt;/g;	1362	s/</&lt;/g;
1205		1363
1206	$_[1]	1364	$_
		1365	}
		1366
		1367	sub update {
		1368	my ($self) = @_;
		1369
		1370	delete $self->{texture};
		1371	$self->SUPER::update;
1207	}	1372	}
1208		1373
1209	sub set_text {	1374	sub set_text {
1210	my ($self, $text) = @_;	1375	my ($self, $text) = @_;
1211		1376
		1377	return if $self->{text} eq "T$text";
		1378	$self->{text} = "T$text";
		1379
		1380	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1212	$self->{layout}->set_text ($text);	1381	$self->{layout}->set_text ($text);
1213		1382
1214	delete $self->{texture};	1383	$self->update;
1215	$self->check_size;	1384	$self->check_size;
1216	$self->update;
1217	}	1385	}
1218		1386
1219	sub set_markup {	1387	sub set_markup {
1220	my ($self, $markup) = @_;	1388	my ($self, $markup) = @_;
1221		1389
		1390	return if $self->{text} eq "M$markup";
		1391	$self->{text} = "M$markup";
		1392
		1393	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1394
		1395	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1222	$self->{layout}->set_markup ($markup);	1396	$self->{layout}->set_markup ($markup);
1223		1397
1224	delete $self->{texture};	1398	$self->update;
1225	$self->check_size;	1399	$self->check_size;
1226	$self->update;
1227	}	1400	}
1228		1401
1229	sub size_request {	1402	sub size_request {
1230	my ($self) = @_;	1403	my ($self) = @_;
1231		1404
1232	$self->{layout}->set_font ($self->{font}) if $self->{font};	1405	$self->{layout}->set_font ($self->{font}) if $self->{font};
1233	$self->{layout}->set_width ($self->{max_w} || -1);	1406	$self->{layout}->set_width ($self->{max_w} || -1);
		1407	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1408	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1234	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1409	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1235		1410
1236	my ($w, $h) = $self->{layout}->size;	1411	my ($w, $h) = $self->{layout}->size;
1237		1412
1238	if (exists $self->{template}) {	1413	if (exists $self->{template}) {
…		…
1260	sub set_fontsize {	1435	sub set_fontsize {
1261	my ($self, $fontsize) = @_;	1436	my ($self, $fontsize) = @_;
1262		1437
1263	$self->{fontsize} = $fontsize;	1438	$self->{fontsize} = $fontsize;
1264	delete $self->{texture};	1439	delete $self->{texture};
		1440
		1441	$self->update;
1265	$self->check_size;	1442	$self->check_size;
1266	$self->update;
1267	}	1443	}
1268		1444
1269	sub _draw {	1445	sub _draw {
1270	my ($self) = @_;	1446	my ($self) = @_;
1271		1447
		1448	$self->SUPER::_draw; # draw background, if applicable
		1449
1272	my $tex = $self->{texture} ||= do {	1450	my $tex = $self->{texture} ||= do {
		1451	$self->{layout}->set_foreground (@{$self->{fg}});
1273	$self->{layout}->set_font ($self->{font}) if $self->{font};	1452	$self->{layout}->set_font ($self->{font}) if $self->{font};
1274	$self->{layout}->set_width ($self->{w});	1453	$self->{layout}->set_width ($self->{w});
		1454	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1455	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1275	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1456	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1457
1276	new_from_layout CFClient::Texture $self->{layout}	1458	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1459
		1460	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1461	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1462	: ($self->{w} - $tex->{w}) * 0.5);
		1463
		1464	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1465	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1466	: ($self->{h} - $tex->{h}) * 0.5);
		1467
		1468	$tex
1277	};	1469	};
1278		1470
1279	glEnable GL_BLEND;
1280	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1281	glEnable GL_TEXTURE_2D;	1471	glEnable GL_TEXTURE_2D;
1282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1472	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1283		1473
		1474	if ($tex->{format} == GL_ALPHA) {
1284	glColor @{$self->{fg}};	1475	glColor @{$self->{fg}};
1285
1286	$self->{ox} = int (
1287	$self->{align} < 0 ? $self->{padding}
1288	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1289	: ($self->{w} - $tex->{w}) * 0.5
1290	);
1291
1292	$self->{oy} = int (
1293	$self->{valign} < 0 ? $self->{padding}
1294	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1295	: ($self->{h} - $tex->{h}) * 0.5
1296	);
1297
1298	$tex->draw_quad ($self->{ox}, $self->{oy});	1476	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1477	} else {
		1478	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1479	}
1299		1480
1300	glDisable GL_TEXTURE_2D;	1481	glDisable GL_TEXTURE_2D;
1301	glDisable GL_BLEND;
1302	}	1482	}
1303		1483
1304	#############################################################################	1484	#############################################################################
1305		1485
1306	package CFClient::UI::EntryBase;	1486	package CFClient::UI::EntryBase;
…		…
1319	active_fg => [0, 0, 0],	1499	active_fg => [0, 0, 0],
1320	can_hover => 1,	1500	can_hover => 1,
1321	can_focus => 1,	1501	can_focus => 1,
1322	valign => 0,	1502	valign => 0,
1323	can_events => 1,	1503	can_events => 1,
		1504	#text => ...
1324	@_	1505	@_
1325	)	1506	)
1326	}	1507	}
1327		1508
1328	sub _set_text {	1509	sub _set_text {
…		…
1339		1520
1340	$text =~ s/./*/g if $self->{hidden};	1521	$text =~ s/./*/g if $self->{hidden};
1341	$self->{layout}->set_text ("$text ");	1522	$self->{layout}->set_text ("$text ");
1342		1523
1343	$self->emit (changed => $self->{text});	1524	$self->emit (changed => $self->{text});
1344	}
1345
1346	sub get_text {
1347	$_[0]{text}
1348	}
1349
1350	sub size_request {
1351	my ($self) = @_;
1352
1353	my ($w, $h) = $self->SUPER::size_request;
1354
1355	($w + 1, $h) # add 1 for cursor
1356	}
1357
1358	sub size_allocate {
1359	my ($self, $w, $h) = @_;
1360
1361	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1362	}	1525	}
1363		1526
1364	sub set_text {	1527	sub set_text {
1365	my ($self, $text) = @_;	1528	my ($self, $text) = @_;
1366		1529
1367	$self->{cursor} = length $text;	1530	$self->{cursor} = length $text;
1368	$self->_set_text ($text);	1531	$self->_set_text ($text);
1369	$self->update;	1532	$self->update;
		1533	$self->check_size;
		1534	}
		1535
		1536	sub get_text {
		1537	$_[0]{text}
		1538	}
		1539
		1540	sub size_request {
		1541	my ($self) = @_;
		1542
		1543	my ($w, $h) = $self->SUPER::size_request;
		1544
		1545	($w + 1, $h) # add 1 for cursor
		1546	}
		1547
		1548	sub size_allocate {
		1549	my ($self, $w, $h) = @_;
		1550
		1551	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1370	}	1552	}
1371		1553
1372	sub key_down {	1554	sub key_down {
1373	my ($self, $ev) = @_;	1555	my ($self, $ev) = @_;
1374		1556
…		…
1376	my $sym = $ev->{sym};	1558	my $sym = $ev->{sym};
1377	my $uni = $ev->{unicode};	1559	my $uni = $ev->{unicode};
1378		1560
1379	my $text = $self->get_text;	1561	my $text = $self->get_text;
1380		1562
1381	if ($sym == 8) {	1563	if ($uni == 8) {
1382	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1564	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1383	} elsif ($sym == 127) {	1565	} elsif ($uni == 127) {
1384	substr $text, $self->{cursor}, 1, "";	1566	substr $text, $self->{cursor}, 1, "";
1385	} elsif ($sym == CFClient::SDLK_LEFT) {	1567	} elsif ($sym == CFClient::SDLK_LEFT) {
1386	--$self->{cursor} if $self->{cursor};	1568	--$self->{cursor} if $self->{cursor};
1387	} elsif ($sym == CFClient::SDLK_RIGHT) {	1569	} elsif ($sym == CFClient::SDLK_RIGHT) {
1388	++$self->{cursor} if $self->{cursor} < length $self->{text};	1570	++$self->{cursor} if $self->{cursor} < length $self->{text};
1389	} elsif ($sym == CFClient::SDLK_HOME) {	1571	} elsif ($sym == CFClient::SDLK_HOME) {
1390	$self->{cursor} = 0;	1572	$self->{cursor} = 0;
1391	} elsif ($sym == CFClient::SDLK_END) {	1573	} elsif ($sym == CFClient::SDLK_END) {
1392	$self->{cursor} = length $text;	1574	$self->{cursor} = length $text;
1393	} elsif ($sym == 27) {	1575	} elsif ($uni == 27) {
1394	$self->emit ('escape');	1576	$self->emit ('escape');
1395	} elsif ($uni) {	1577	} elsif ($uni) {
1396	substr $text, $self->{cursor}++, 0, chr $uni;	1578	substr $text, $self->{cursor}++, 0, chr $uni;
1397	}	1579	}
1398		1580
1399	$self->_set_text ($text);	1581	$self->_set_text ($text);
1400	$self->update;	1582	$self->update;
		1583	$self->check_size;
1401	}	1584	}
1402		1585
1403	sub focus_in {	1586	sub focus_in {
1404	my ($self) = @_;	1587	my ($self) = @_;
1405		1588
…		…
1534	my $class = shift;	1717	my $class = shift;
1535		1718
1536	$class->SUPER::new (	1719	$class->SUPER::new (
1537	padding => 4,	1720	padding => 4,
1538	fg => [1, 1, 1],	1721	fg => [1, 1, 1],
1539	bg => [1, 1, 1, 0.2],
1540	active_fg => [0, 0, 1],	1722	active_fg => [0, 0, 1],
1541	can_hover => 1,	1723	can_hover => 1,
1542	align => 0,	1724	align => 0,
1543	valign => 0,	1725	valign => 0,
1544	can_events => 1,	1726	can_events => 1,
…		…
1562		1744
1563	if ($GRAB == $self) {	1745	if ($GRAB == $self) {
1564	$self->{fg} = $self->{active_fg};	1746	$self->{fg} = $self->{active_fg};
1565	}	1747	}
1566		1748
1567	glEnable GL_BLEND;
1568	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1569	glEnable GL_TEXTURE_2D;	1749	glEnable GL_TEXTURE_2D;
1570	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1571	glColor 0, 0, 0, 1;	1751	glColor 0, 0, 0, 1;
1572		1752
1573	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1753	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1574		1754
1575	glDisable GL_TEXTURE_2D;	1755	glDisable GL_TEXTURE_2D;
1576	glDisable GL_BLEND;
1577		1756
1578	$self->SUPER::_draw;	1757	$self->SUPER::_draw;
1579	}	1758	}
1580		1759
1581	#############################################################################	1760	#############################################################################
…		…
1595		1774
1596	$class->SUPER::new (	1775	$class->SUPER::new (
1597	padding => 2,	1776	padding => 2,
1598	fg => [1, 1, 1],	1777	fg => [1, 1, 1],
1599	active_fg => [1, 1, 0],	1778	active_fg => [1, 1, 0],
		1779	bg => [0, 0, 0, 0.2],
		1780	active_bg => [1, 1, 1, 0.5],
1600	state => 0,	1781	state => 0,
1601	can_hover => 1,	1782	can_hover => 1,
1602	@_	1783	@_
1603	)	1784	)
1604	}	1785	}
…		…
1628		1809
1629	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1810	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1630		1811
1631	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1812	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1632		1813
1633	glEnable GL_BLEND;	1814	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1815
1634	glEnable GL_TEXTURE_2D;	1816	glEnable GL_TEXTURE_2D;
1635	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1636
1637	my $tex = $self->{state} ? $tex[1] : $tex[0];
1638
1639	$tex->draw_quad (0, 0, $s, $s);	1817	$tex->draw_quad_alpha (0, 0, $s, $s);
1640
1641	glDisable GL_TEXTURE_2D;	1818	glDisable GL_TEXTURE_2D;
1642	glDisable GL_BLEND;
1643	}	1819	}
1644		1820
1645	#############################################################################	1821	#############################################################################
1646		1822
1647	package CFClient::UI::Image;	1823	package CFClient::UI::Image;
…		…
1690	glTranslate 0, -$self->{w}, 0;	1866	glTranslate 0, -$self->{w}, 0;
1691		1867
1692	($w, $h) = ($h, $w);	1868	($w, $h) = ($h, $w);
1693	}	1869	}
1694		1870
1695	glEnable GL_BLEND;
1696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697	glEnable GL_TEXTURE_2D;	1871	glEnable GL_TEXTURE_2D;
1698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1872	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699		1873
1700	$tex->draw_quad (0, 0, $w, $h);	1874	$tex->draw_quad_alpha (0, 0, $w, $h);
1701		1875
1702	glDisable GL_BLEND;
1703	glDisable GL_TEXTURE_2D;	1876	glDisable GL_TEXTURE_2D;
1704	}	1877	}
1705		1878
1706	#############################################################################	1879	#############################################################################
1707		1880
…		…
1755	}	1928	}
1756		1929
1757	sub set_max {	1930	sub set_max {
1758	my ($self, $max) = @_;	1931	my ($self, $max) = @_;
1759		1932
		1933	return if $self->{max_val} == $max;
		1934
1760	$self->{max_val} = $max;	1935	$self->{max_val} = $max;
		1936	$self->update;
1761	}	1937	}
1762		1938
1763	sub set_value {	1939	sub set_value {
1764	my ($self, $val, $max) = @_;	1940	my ($self, $val, $max) = @_;
1765		1941
1766	$self->set_max ($max)	1942	$self->set_max ($max)
1767	if defined $max;	1943	if defined $max;
1768		1944
1769	$max = $self->{max_val};	1945	return if $self->{val} == $val;
		1946
1770	$self->{val} = $val;	1947	$self->{val} = $val;
1771
1772	$self->update;	1948	$self->update;
1773	}	1949	}
1774		1950
1775	sub _draw {	1951	sub _draw {
1776	my ($self) = @_;	1952	my ($self) = @_;
…		…
1859		2035
1860	$self->{value}->set_fontsize ($fsize);	2036	$self->{value}->set_fontsize ($fsize);
1861	$self->{max} ->set_fontsize ($fsize);	2037	$self->{max} ->set_fontsize ($fsize);
1862	}	2038	}
1863		2039
		2040	sub set_max {
		2041	my ($self, $max) = @_;
		2042
		2043	$self->{gauge}->set_max ($max);
		2044	$self->{max}->set_text ($max);
		2045	}
		2046
1864	sub set_value {	2047	sub set_value {
1865	my ($self, $val, $max) = @_;	2048	my ($self, $val, $max) = @_;
1866		2049
1867	$self->set_max ($max)	2050	$self->set_max ($max)
1868	if defined $max;	2051	if defined $max;
1869		2052
1870	$self->{gauge}->set_value ($val, $max);	2053	$self->{gauge}->set_value ($val, $max);
1871	$self->{value}->set_text ($val);	2054	$self->{value}->set_text ($val);
1872	}
1873
1874	sub set_max {
1875	my ($self, $max) = @_;
1876
1877	$self->{gauge}->set_max ($max);
1878	$self->{max}->set_text ($max);
1879	}	2055	}
1880		2056
1881	#############################################################################	2057	#############################################################################
1882		2058
1883	package CFClient::UI::Slider;	2059	package CFClient::UI::Slider;
…		…
1893	qw(s1_slider.png s1_slider_bg.png);	2069	qw(s1_slider.png s1_slider_bg.png);
1894		2070
1895	sub new {	2071	sub new {
1896	my $class = shift;	2072	my $class = shift;
1897		2073
1898	# range [value, low, high, page]	2074	# range [value, low, high, page, unit]
1899		2075
1900	# TODO: 0-width page	2076	# TODO: 0-width page
1901	# TODO: req_w/h are wrong with vertical	2077	# TODO: req_w/h are wrong with vertical
1902	# TODO: calculations are off	2078	# TODO: calculations are off
1903	my $self = $class->SUPER::new (	2079	my $self = $class->SUPER::new (
1904	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
1905	active_fg => [0, 0, 0],	2081	active_fg => [0, 0, 0],
		2082	bg => [0, 0, 0, 0.2],
		2083	active_bg => [1, 1, 1, 0.5],
1906	range => [0, 0, 100, 10],	2084	range => [0, 0, 100, 10, 0],
1907	req_w => 20,	2085	req_w => $::WIDTH / 80,
1908	req_h => 20,	2086	req_h => $::WIDTH / 80,
1909	vertical => 0,	2087	vertical => 0,
1910	can_hover => 1,	2088	can_hover => 1,
1911	inner_pad => 5,	2089	inner_pad => 0.02,
1912	@_	2090	@_
1913	);	2091	);
1914		2092
		2093	$self->set_value ($self->{range}[0]);
		2094	$self->update;
		2095
1915	$self	2096	$self
		2097	}
		2098
		2099	sub set_range {
		2100	my ($self, $range) = @_;
		2101
		2102	$self->{range} = $range;
		2103
		2104	$self->update;
		2105	}
		2106
		2107	sub set_value {
		2108	my ($self, $value) = @_;
		2109
		2110	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2111
		2112	$hi = $lo + 1 if $hi <= $lo;
		2113
		2114	$page = $hi - $lo if $page > $hi - $lo;
		2115
		2116	$value = $lo if $value < $lo;
		2117	$value = $hi - $page if $value > $hi - $page;
		2118
		2119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2120	if $unit;
		2121
		2122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2123
		2124	if ($value != $old_value) {
		2125	$self->emit (changed => $value);
		2126	$self->update;
		2127	}
1916	}	2128	}
1917		2129
1918	sub size_request {	2130	sub size_request {
1919	my ($self) = @_;	2131	my ($self) = @_;
1920		2132
…		…
1926		2138
1927	sub button_down {	2139	sub button_down {
1928	my ($self, $ev, $x, $y) = @_;	2140	my ($self, $ev, $x, $y) = @_;
1929		2141
1930	$self->SUPER::button_down ($ev, $x, $y);	2142	$self->SUPER::button_down ($ev, $x, $y);
		2143
		2144	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2145
1931	$self->mouse_motion ($ev, $x, $y);	2146	$self->mouse_motion ($ev, $x, $y);
1932	}	2147	}
1933		2148
1934	sub mouse_motion {	2149	sub mouse_motion {
1935	my ($self, $ev, $x, $y) = @_;	2150	my ($self, $ev, $x, $y) = @_;
1936		2151
1937	if ($GRAB == $self) {	2152	if ($GRAB == $self) {
		2153	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2154
		2155	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2156
		2157	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2158
		2159	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2160	}
		2161	}
		2162
		2163	sub update {
		2164	my ($self) = @_;
		2165
		2166	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2167	$self->set_value ($self->{range}[0]);
		2168
1938	my ($value, $lo, $hi, $page) = @{$self->{range}};	2169	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2170	my $range = ($hi - $page - $lo) || 1e-100;
1939		2171
1940	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2172	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1941		2173
1942	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2174	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1943	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2175	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1944		2176
1945	$x -= $inner_pad_px; # substract the padding	2177	$value = ($value - $lo) / $range;
1946	$x = $x * ($hi - $lo) / $inner_w + $lo;	2178	$value = $value * $self->{scale} + $self->{offset};
1947	$x = $lo if $x < $lo;
1948	$x = $hi - $page if $x > $hi - $page;
1949	$self->{range}[0] = $x;
1950		2179
1951	$self->emit (changed => $x);	2180	$self->{knob_x} = $value - $knob_w * 0.5;
1952	$self->update;	2181	$self->{knob_w} = $knob_w;
1953	}	2182	});
1954	}
1955		2183
1956	# the inner_* stuff is for generating a padding for the slider handle,	2184	$self->SUPER::update;
1957	# so that the handle doesn't leave the texture. This calculation isn't 100%
1958	# correct propably, but it does the job for now
1959	sub _calc_inner_pad_px {
1960	my ($self, $w) = @_;
1961	($w / 100) * $self->{inner_pad} # % to pixels
1962	}	2185	}
1963		2186
1964	sub _draw {	2187	sub _draw {
1965	my ($self) = @_;	2188	my ($self) = @_;
1966		2189
1967	$self->SUPER::_draw ();	2190	$self->SUPER::_draw ();
1968		2191
1969	my ($w, $h) = @$self{qw(w h)};	2192	glScale $self->{w}, $self->{h};
1970		2193
1971	if ($self->{vertical}) {	2194	if ($self->{vertical}) {
1972	# draw a vertical slider like a rotated horizontal slider	2195	# draw a vertical slider like a rotated horizontal slider
1973		2196
		2197	glTranslate 1, 0, 0;
1974	glRotate 90, 0, 0, 1;	2198	glRotate 90, 0, 0, 1;
1975	glTranslate 0, -$self->{w}, 0;
1976
1977	($w, $h) = ($h, $w);
1978	}	2199	}
1979		2200
1980	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2201	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1981	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2202	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1982		2203
1983	my ($value, $lo, $hi, $page) = @{$self->{range}};
1984
1985	$hi = $value + 1 if $lo == $hi;
1986
1987	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1988	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1989
1990	$page = int $page * $inner_w / ($hi - $lo);
1991	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1992
1993	$w -= $page;
1994	$page &= ~1;
1995	glTranslate $page * 0.5, 0, 0;
1996	$page ||= 2;
1997
1998	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1999	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2000
2001	glEnable GL_BLEND;
2002	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2003	glEnable GL_TEXTURE_2D;	2204	glEnable GL_TEXTURE_2D;
2004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2005		2206
2006	# draw background	2207	# draw background
2007	$tex[1]->draw_quad (0, 0, $w, $h);	2208	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2008		2209
2009	# draw handle	2210	# draw handle
2010	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2211	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2011		2212
2012	glDisable GL_BLEND;
2013	glDisable GL_TEXTURE_2D;	2213	glDisable GL_TEXTURE_2D;
2014	}	2214	}
		2215
		2216	#############################################################################
		2217
		2218	package CFClient::UI::ValSlider;
		2219
		2220	our @ISA = CFClient::UI::HBox::;
		2221
		2222	sub new {
		2223	my ($class, %arg) = @_;
		2224
		2225	my $range = delete $arg{range};
		2226
		2227	my $self = $class->SUPER::new (
		2228	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2229	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2230	to_value => sub { shift },
		2231	from_value => sub { shift },
		2232	%arg,
		2233	);
		2234
		2235	$self->{slider}->connect (changed => sub {
		2236	my ($self, $value) = @_;
		2237	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2238	$self->{parent}->emit (changed => $value);
		2239	});
		2240
		2241	# $self->{entry}->connect (changed => sub {
		2242	# my ($self, $value) = @_;
		2243	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2244	# $self->{parent}->emit (changed => $value);
		2245	# });
		2246
		2247	$self->add ($self->{slider}, $self->{entry});
		2248
		2249	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2250
		2251	$self
		2252	}
		2253
		2254	sub set_range { shift->{slider}->set_range (@_) }
		2255	sub set_value { shift->{slider}->set_value (@_) }
2015		2256
2016	#############################################################################	2257	#############################################################################
2017		2258
2018	package CFClient::UI::TextView;	2259	package CFClient::UI::TextView;
2019		2260
…		…
2028	fontsize => 1,	2269	fontsize => 1,
2029	can_events => 0,	2270	can_events => 0,
2030	#font => default_font	2271	#font => default_font
2031	@_,	2272	@_,
2032		2273
2033	layout => (new CFClient::Layout),	2274	layout => (new CFClient::Layout 1),
2034	par => [],	2275	par => [],
2035	height => 0,	2276	height => 0,
2036	children => [	2277	children => [
2037	(new CFClient::UI::Empty expand => 1),	2278	(new CFClient::UI::Empty expand => 1),
2038	(new CFClient::UI::Slider vertical => 1),	2279	(new CFClient::UI::Slider vertical => 1),
2039	],	2280	],
2040	);	2281	);
2041		2282
2042	$self->{children}[1]->connect (changed => sub {	2283	$self->{children}[1]->connect (changed => sub { $self->update });
2043	$self->update;
2044	});
2045		2284
2046	$self	2285	$self
2047	}	2286	}
2048		2287
2049	sub set_fontsize {	2288	sub set_fontsize {
2050	my ($self, $fontsize) = @_;	2289	my ($self, $fontsize) = @_;
2051		2290
2052	$self->{fontsize} = $fontsize;	2291	$self->{fontsize} = $fontsize;
2053	$self->reflow;	2292	$self->reflow;
2054	}
2055
2056	sub text_height {
2057	my ($self, $text) = @_;
2058
2059	my $layout = $self->{layout};
2060
2061	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2062	$layout->set_width ($self->{w});
2063	$layout->set_text ($text);
2064
2065	($layout->size)[1]
2066	}
2067
2068	sub reflow {
2069	my ($self) = @_;
2070
2071	$self->{need_reflow}++;
2072	$self->update;
2073	}	2293	}
2074		2294
2075	sub size_allocate {	2295	sub size_allocate {
2076	my ($self, $w, $h) = @_;	2296	my ($self, $w, $h) = @_;
2077		2297
…		…
2082	$self->{layout}->set_width ($self->{children}[0]{w});	2302	$self->{layout}->set_width ($self->{children}[0]{w});
2083		2303
2084	$self->reflow;	2304	$self->reflow;
2085	}	2305	}
2086		2306
		2307	sub text_size {
		2308	my ($self, $text, $indent) = @_;
		2309
		2310	my $layout = $self->{layout};
		2311
		2312	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2313	$layout->set_width ($self->{children}[0]{w} - $indent);
		2314	$layout->set_markup ($text);
		2315
		2316	$layout->size
		2317	}
		2318
		2319	sub reflow {
		2320	my ($self) = @_;
		2321
		2322	$self->{need_reflow}++;
		2323	$self->update;
		2324	}
		2325
		2326	sub set_offset {
		2327	my ($self, $offset) = @_;
		2328
		2329	# todo: base offset on lines or so, not on pixels
		2330	$self->{children}[1]->set_value ($offset);
		2331	}
		2332
		2333	sub clear {
		2334	my ($self) = @_;
		2335
		2336	$self->{par} = [];
		2337	$self->{height} = 0;
		2338	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2339	}
		2340
2087	sub add_paragraph {	2341	sub add_paragraph {
2088	my ($self, $color, $text) = @_;	2342	my ($self, $color, $text, $indent) = @_;
2089		2343
2090	#TODO: intelligently "reformat" paragraph	2344	for my $line (split /\n/, $text) {
2091		2345	my ($w, $h) = $self->text_size ($line);
2092	my $height = $self->text_height ($text);
2093
2094	$self->{height} += $height;	2346	$self->{height} += $h;
		2347	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2348	}
2095		2349
2096	push @{$self->{par}}, [$height, $color, $text];
2097
2098	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2350	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2099	$self->{children}[1]->update;
2100	}	2351	}
2101		2352
2102	sub update {	2353	sub update {
2103	my ($self) = @_;	2354	my ($self) = @_;
2104		2355
…		…
2106		2357
2107	return unless $self->{h} > 0;	2358	return unless $self->{h} > 0;
2108		2359
2109	delete $self->{texture};	2360	delete $self->{texture};
2110		2361
2111	$ROOT->on_refresh ($self, sub {	2362	$ROOT->on_post_alloc ($self, sub {
		2363	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2364
2112	if (delete $self->{need_reflow}) {	2365	if (delete $self->{need_reflow}) {
2113	my $height = 0;	2366	my $height = 0;
2114		2367
2115	$height += $_->[0] = $self->text_height ($_->[2])	2368	my $layout = $self->{layout};
		2369
		2370	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2371
2116	for @{$self->{par}};	2372	for (@{$self->{par}}) {
		2373	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2374	$layout->set_width ($W - $_->[3]);
		2375	$layout->set_markup ($_->[4]);
		2376	my ($w, $h) = $layout->size;
		2377	$_->[0] = $w + $_->[3];
		2378	$_->[1] = $h;
		2379	}
		2380
		2381	$height += $_->[1];
		2382	}
2117		2383
2118	$self->{height} = $height;	2384	$self->{height} = $height;
2119		2385
2120	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2386	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2121		2387
2122	delete $self->{texture};	2388	delete $self->{texture};
2123	}	2389	}
2124		2390
2125	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2391	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2126	glClearColor 0, 0, 0, 1;	2392	glClearColor 0.5, 0.5, 0.5, 0;
2127	glClear GL_COLOR_BUFFER_BIT;	2393	glClear GL_COLOR_BUFFER_BIT;
2128		2394
		2395	my $top = int $self->{children}[1]{range}[0];
		2396
		2397	my $y0 = $top;
		2398	my $y1 = $top + $H;
		2399
		2400	my $y = 0;
		2401
		2402	my $layout = $self->{layout};
		2403
		2404	$layout->set_font ($self->{font}) if $self->{font};
		2405
2129	glEnable GL_BLEND;	2406	glEnable GL_BLEND;
		2407	#TODO# not correct in windows where rgba is forced off
2130	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2408	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2131	glEnable GL_TEXTURE_2D;
2132	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2133
2134	my $top = int $self->{children}[1]{range}[0];
2135
2136	my $y0 = $top;
2137	my $y1 = $top + $self->{h};
2138
2139	my $y = 0;
2140
2141	my $layout = $self->{layout};
2142
2143	$layout->set_font ($self->{font}) if $self->{font};
2144		2409
2145	for my $par (@{$self->{par}}) {	2410	for my $par (@{$self->{par}}) {
2146	my $h = $par->[0];	2411	my $h = $par->[1];
2147		2412
2148	if ($y0 < $y + $h && $y < $y1) {	2413	if ($y0 < $y + $h && $y < $y1) {
		2414	$layout->set_foreground (@{ $par->[2] });
		2415	$layout->set_width ($W - $par->[3]);
2149	$layout->set_text ($par->[2]);	2416	$layout->set_markup ($par->[4]);
2150		2417
2151	glColor @{ $par->[1] };	2418	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2152	my ($W, $H) = $layout->size;	2419
2153	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2420	glRasterPos $par->[3], $y - $y0;
		2421	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2154	}	2422	}
2155		2423
2156	$y += $h;	2424	$y += $h;
2157	}	2425	}
2158		2426
2159	glDisable GL_TEXTURE_2D;
2160	glDisable GL_BLEND;	2427	glDisable GL_BLEND;
2161	};	2428	};
2162	});	2429	});
2163	}	2430	}
2164		2431
2165	sub _draw {	2432	sub _draw {
2166	my ($self) = @_;	2433	my ($self) = @_;
2167		2434
2168	if ($self->{texture}) {
2169	glEnable GL_TEXTURE_2D;	2435	glEnable GL_TEXTURE_2D;
2170	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2436	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171	glColor 1, 1, 1, 1;	2437	glColor 1, 1, 1, 1;
2172	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2438	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2173	glDisable GL_TEXTURE_2D;	2439	glDisable GL_TEXTURE_2D;
2174	}
2175		2440
2176	$self->{children}[1]->draw;	2441	$self->{children}[1]->draw;
2177		2442
2178	}	2443	}
2179		2444
…		…
2273	@_,	2538	@_,
2274	can_events => 0,	2539	can_events => 0,
2275	)	2540	)
2276	}	2541	}
2277		2542
2278	sub set_markup {	2543	sub set_tooltip_from {
2279	my ($self, $text) = @_;	2544	my ($self, $widget) = @_;
2280		2545
2281	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2546	$self->add (new CFClient::UI::Label
2282	$self->{label}->set_markup ($text);	2547	markup => $widget->{tooltip},
2283	$self->add ($self->{label});	2548	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2549	fontsize => 0.8,
		2550	fg => [0, 0, 0, 1],
		2551	ellipsise => 0,
		2552	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2553	);
2284	}	2554	}
2285		2555
2286	sub size_request {	2556	sub size_request {
2287	my ($self) = @_;	2557	my ($self) = @_;
2288
2289	$self->child->set_max_size ($::WIDTH * 0.3);
2290		2558
2291	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2559	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292		2560
2293	($w + 4, $h + 4)	2561	($w + 4, $h + 4)
2294	}	2562	}
…		…
2300	}	2568	}
2301		2569
2302	sub _draw {	2570	sub _draw {
2303	my ($self) = @_;	2571	my ($self) = @_;
2304		2572
2305	glPushMatrix;
2306	glTranslate 0.375, 0.375;	2573	glTranslate 0.375, 0.375;
2307		2574
2308	my ($w, $h) = @$self{qw(w h)};	2575	my ($w, $h) = @$self{qw(w h)};
2309		2576
2310	glColor 1, 0.8, 0.4;	2577	glColor 1, 0.8, 0.4;
…		…
2321	glVertex 0 , $h;	2588	glVertex 0 , $h;
2322	glVertex $w, $h;	2589	glVertex $w, $h;
2323	glVertex $w, 0;	2590	glVertex $w, 0;
2324	glEnd;	2591	glEnd;
2325		2592
2326	glPopMatrix;	2593	glTranslate 2 - 0.375, 2 - 0.375;
2327
2328	glTranslate 2, 2;
2329	$self->SUPER::_draw;	2594	$self->SUPER::_draw;
2330	}	2595	}
2331		2596
2332	#############################################################################	2597	#############################################################################
2333		2598
…		…
2338	use CFClient::OpenGL;	2603	use CFClient::OpenGL;
2339		2604
2340	sub new {	2605	sub new {
2341	my $class = shift;	2606	my $class = shift;
2342		2607
2343	$class->SUPER::new (	2608	my $self = $class->SUPER::new (
2344	aspect => 1,	2609	aspect => 1,
2345	@_,	2610	@_,
2346	)	2611	);
		2612
		2613	if ($self->{anim} && $self->{animspeed}) {
		2614	Scalar::Util::weaken (my $widget = $self);
		2615
		2616	$self->{timer} = Event->timer (
		2617	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2618	hard => 1,
		2619	interval => $self->{animspeed},
		2620	cb => sub {
		2621	++$widget->{frame};
		2622	$widget->update;
		2623	},
		2624	);
		2625	}
		2626
		2627	$self
2347	}	2628	}
2348		2629
2349	sub size_request {	2630	sub size_request {
2350	(32, 8)	2631	(32, 8)
2351	}	2632	}
2352		2633
		2634	sub update {
		2635	my ($self) = @_;
		2636
		2637	return unless $self->{visible};
		2638
		2639	$self->SUPER::update;
		2640	}
		2641
2353	sub draw {	2642	sub _draw {
2354	my ($self) = @_;	2643	my ($self) = @_;
2355		2644
		2645	return unless $::CONN;
		2646
		2647	my $face;
		2648
		2649	if ($self->{frame}) {
		2650	my $anim = $::CONN->{anim}[$self->{anim}];
		2651
		2652	$face = $anim->[ $self->{frame} % @$anim ]
		2653	if $anim && @$anim;
		2654	}
		2655
2356	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2656	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2357		2657
2358	if ($tex) {	2658	if ($tex) {
2359	glEnable GL_BLEND;
2360	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361	glEnable GL_TEXTURE_2D;	2659	glEnable GL_TEXTURE_2D;
2362	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363	glColor 1, 1, 1, 1;	2661	glColor 1, 1, 1, 1;
2364	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365	glDisable GL_TEXTURE_2D;	2663	glDisable GL_TEXTURE_2D;
2366	glDisable GL_BLEND;
2367	}	2664	}
		2665	}
		2666
		2667	sub DESTROY {
		2668	my ($self) = @_;
		2669
		2670	$self->{timer}->cancel
		2671	if $self->{timer};
		2672
		2673	$self->SUPER::DESTROY;
2368	}	2674	}
2369		2675
2370	#############################################################################	2676	#############################################################################
2371		2677
		2678	package CFClient::UI::InventoryItem;
		2679
		2680	our @ISA = CFClient::UI::HBox::;
		2681
		2682	sub _item_to_desc {
		2683	my ($item) = @_;
		2684
		2685	my $desc =
		2686	$item->{nrof} < 2
		2687	? $item->{name}
		2688	: "$item->{nrof} × $item->{name_pl}";
		2689
		2690	$item->{flags} & Crossfire::Protocol::F_OPEN
		2691	and $desc .= " (open)";
		2692	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2693	and $desc .= " (applied)";
		2694	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2695	and $desc .= " (unpaid)";
		2696	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2697	and $desc .= " (magic)";
		2698	$item->{flags} & Crossfire::Protocol::F_CURSED
		2699	and $desc .= " (cursed)";
		2700	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2701	and $desc .= " (damned)";
		2702	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2703	and $desc .= " *";
		2704
		2705	$desc
		2706	}
		2707
		2708	sub new {
		2709	my $class = shift;
		2710
		2711	my %args = @_;
		2712
		2713	my $item = delete $args{item};
		2714
		2715	my $desc = _item_to_desc ($item);
		2716
		2717	my $self = $class->SUPER::new (
		2718	can_hover => 1,
		2719	can_events => 1,
		2720	tooltip => ((CFClient::UI::Label::escape $desc)
		2721	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
		2722	connect_button_down => sub {
		2723	my ($self, $ev, $x, $y) = @_;
		2724
		2725	# todo: maybe put examine on 1? but should just be a tooltip :(
		2726	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		2727	my $targ = $::CONN->{player}{tag};
		2728
		2729	if ($item->{container} == $::CONN->{player}{tag}) {
		2730	$targ = $main::OPENCONT;
		2731	}
		2732
		2733	$::CONN->send ("move $targ $item->{tag} 0");
		2734	} elsif ($ev->{button} == 1) {
		2735	$::CONN->send ("examine $item->{tag}");
		2736	} elsif ($ev->{button} == 2) {
		2737	$::CONN->send ("apply $item->{tag}");
		2738	} elsif ($ev->{button} == 3) {
		2739	my @menu_items = (
		2740	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2741	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
		2742	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2743	(
		2744	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2745	? (
		2746	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
		2747	)
		2748	: (
		2749	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
		2750	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2751	)
		2752	),
		2753	);
		2754
		2755	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2756	}
		2757
		2758	1
		2759	},
		2760	%args
		2761	);
		2762
		2763
		2764	$self->add (new CFClient::UI::Face
		2765	can_events => 0,
		2766	face => $item->{face},
		2767	anim => $item->{anim},
		2768	animspeed => $item->{animspeed},
		2769	);
		2770
		2771	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2772
		2773	$self->{item} = $item;
		2774
		2775	$self->update_item;
		2776
		2777	$self
		2778	}
		2779
		2780	sub update_item {
		2781	my ($self) = @_;
		2782
		2783	my $desc = _item_to_desc ($self->{item});
		2784
		2785	$self->{name_lbl}->set_text ($desc);
		2786	}
		2787
		2788	#############################################################################
		2789
		2790	package CFClient::UI::Inventory;
		2791
		2792	our @ISA = CFClient::UI::ScrolledWindow::;
		2793
		2794	sub new {
		2795	my $class = shift;
		2796
		2797	my $self = $class->SUPER::new (
		2798	scrolled => (new CFClient::UI::Table),
		2799	@_,
		2800	);
		2801
		2802	$self
		2803	}
		2804
		2805	sub set_items {
		2806	my ($self, $items) = @_;
		2807
		2808	$self->{scrolled}->clear;
		2809	return unless $items;
		2810
		2811	my @items = sort {
		2812	($a->{type} <=> $b->{type})
		2813	or ($a->{name} cmp $b->{name})
		2814	} @$items;
		2815
		2816	$self->{real_items} = \@items;
		2817
		2818	for my $item (@items) {
		2819	$item->{item} = $item;
		2820	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2821	$item->update_item ();
		2822	}
		2823
		2824	my $i = 0;
		2825	for (@items) {
		2826	$self->{scrolled}->add (0, $i, $_);
		2827	my $nrof = $_->{item}->{nrof} || 1;
		2828	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
		2829	}
		2830
		2831	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2832	}
		2833
		2834	sub size_request {
		2835	my ($self) = @_;
		2836	($self->{req_w}, $self->{req_h});
		2837	}
		2838
		2839	#############################################################################
		2840
		2841	package CFClient::UI::Menu;
		2842
		2843	our @ISA = CFClient::UI::FancyFrame::;
		2844
		2845	use CFClient::OpenGL;
		2846
		2847	sub new {
		2848	my $class = shift;
		2849
		2850	my $self = $class->SUPER::new (
		2851	items => [],
		2852	z => 100,
		2853	@_,
		2854	);
		2855
		2856	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2857
		2858	for my $item (@{ $self->{items} }) {
		2859	my ($widget, $cb) = @$item;
		2860
		2861	# handle various types of items, only text for now
		2862	if (!ref $widget) {
		2863	$widget = new CFClient::UI::Label
		2864	can_hover => 1,
		2865	can_events => 1,
		2866	text => $widget;
		2867	}
		2868
		2869	$self->{item}{$widget} = $item;
		2870
		2871	$self->{vbox}->add ($widget);
		2872	}
		2873
		2874	$self
		2875	}
		2876
		2877	# popup given the event (must be a mouse button down event currently)
		2878	sub popup {
		2879	my ($self, $ev) = @_;
		2880
		2881	$self->emit ("popdown");
		2882
		2883	# maybe save $GRAB? must be careful about events...
		2884	$GRAB = $self;
		2885	$self->{button} = $ev->{button};
		2886
		2887	$self->show;
		2888	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2889	}
		2890
		2891	sub mouse_motion {
		2892	my ($self, $ev, $x, $y) = @_;
		2893
		2894	# TODO: should use vbox->find_widget or so
		2895	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2896	$self->{hover} = $self->{item}{$HOVER};
		2897	}
		2898
		2899	sub button_up {
		2900	my ($self, $ev, $x, $y) = @_;
		2901
		2902	if ($ev->{button} == $self->{button}) {
		2903	undef $GRAB;
		2904	$self->hide;
		2905
		2906	$self->emit ("popdown");
		2907	$self->{hover}[1]->() if $self->{hover};
		2908	}
		2909	}
		2910
		2911	#############################################################################
		2912
		2913	package CFClient::UI::Statusbox;
		2914
		2915	our @ISA = CFClient::UI::VBox::;
		2916
		2917	sub new {
		2918	my $class = shift;
		2919
		2920	$class->SUPER::new (
		2921	fontsize => 0.8,
		2922	@_,
		2923	)
		2924	}
		2925
		2926	sub reorder {
		2927	my ($self) = @_;
		2928	my $NOW = time;
		2929
		2930	while (my ($k, $v) = each %{ $self->{item} }) {
		2931	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2932	}
		2933
		2934	my @widgets;
		2935
		2936	my @items = sort {
		2937	$a->{pri} <=> $b->{pri}
		2938	or $b->{id} <=> $a->{id}
		2939	} values %{ $self->{item} };
		2940
		2941	my $count = 10 + 1;
		2942	for my $item (@items) {
		2943	last unless --$count;
		2944
		2945	push @widgets, $item->{label} ||= do {
		2946	# TODO: doesn't handle markup well (read as: at all)
		2947	my $short = $item->{count} > 1
		2948	? "<b>$item->{count} ×</b> $item->{text}"
		2949	: $item->{text};
		2950
		2951	for ($short) {
		2952	s/^\s+//;
		2953	s/\s+/ /g;
		2954	}
		2955
		2956	new CFClient::UI::Label
		2957	markup => $short,
		2958	tooltip => $item->{tooltip},
		2959	tooltip_font => $::FONT_PROP,
		2960	tooltip_width => 0.67,
		2961	fontsize => $item->{fontsize} || $self->{fontsize},
		2962	max_w => $::WIDTH * 0.44,
		2963	fg => $item->{fg},
		2964	can_events => 1,
		2965	can_hover => 1
		2966	};
		2967	}
		2968
		2969	$self->clear;
		2970	$self->SUPER::add (reverse @widgets);
		2971	}
		2972
		2973	sub add {
		2974	my ($self, $text, %arg) = @_;
		2975
		2976	$text =~ s/^\s+//;
		2977	$text =~ s/\s+$//;
		2978
		2979	my $timeout = time + ((delete $arg{timeout}) || 60);
		2980
		2981	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2982
		2983	if (my $item = $self->{item}{$group}) {
		2984	if ($item->{text} eq $text) {
		2985	$item->{count}++;
		2986	} else {
		2987	$item->{count} = 1;
		2988	$item->{text} = $item->{tooltip} = $text;
		2989	}
		2990	$item->{id} = ++$self->{id};
		2991	$item->{timeout} = $timeout;
		2992	delete $item->{label};
		2993	} else {
		2994	$self->{item}{$group} = {
		2995	id => ++$self->{id},
		2996	text => $text,
		2997	timeout => $timeout,
		2998	tooltip => $text,
		2999	fg => [0.8, 0.8, 0.8, 0.8],
		3000	pri => 0,
		3001	count => 1,
		3002	%arg,
		3003	};
		3004	}
		3005
		3006	$self->reorder;
		3007	}
		3008
		3009	sub reconfigure {
		3010	my ($self) = @_;
		3011
		3012	delete $_->{label}
		3013	for values %{ $self->{item} || {} };
		3014
		3015	$self->reorder;
		3016	$self->SUPER::reconfigure;
		3017	}
		3018
		3019	#############################################################################
		3020
2372	package CFClient::UI::Root;	3021	package CFClient::UI::Root;
2373		3022
2374	our @ISA = CFClient::UI::Container::;	3023	our @ISA = CFClient::UI::Container::;
2375		3024
2376	use CFClient::OpenGL;	3025	use CFClient::OpenGL;
2377		3026
2378	sub check_size {	3027	sub new {
2379	my ($self) = @_;	3028	my $class = shift;
2380		3029
2381	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3030	$class->SUPER::new (
2382	}	3031	@_,
2383		3032	)
2384	sub size_request {
2385	($::WIDTH, $::HEIGHT)
2386	}	3033	}
2387		3034
2388	sub configure {	3035	sub configure {
2389	my ($self, $x, $y, $w, $h) = @_;	3036	my ($self, $x, $y, $w, $h) = @_;
2390		3037
2391	$self->SUPER::configure ($x, $y, $w, $h);	3038	$self->{w} = $w;
		3039	$self->{h} = $h;
		3040	}
2392		3041
		3042	sub check_size {
		3043	my ($self) = @_;
		3044
		3045	$self->size_allocate ($self->{w}, $self->{h})
		3046	if $self->{w};
		3047	}
		3048
		3049	sub size_request {
		3050	my ($self) = @_;
		3051
		3052	($self->{w}, $self->{h})
		3053	}
		3054
		3055	sub size_allocate {
		3056	my ($self, $w, $h) = @_;
		3057
		3058	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		3059	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		3060
		3061	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		3062	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		3063
2393	for my $child (@{$self->{children}}) {	3064	for my $child ($self->children) {
2394	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3065	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395		3066
		3067	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3068	if exists $child->{req_x};
		3069
		3070	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3071	if exists $child->{req_y};
		3072
2396	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3073	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2397	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3074	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3075
2398	$child->configure ($X, $Y, $W,$H);	3076	$child->configure ($X, $Y, $W, $H);
2399	}	3077	}
2400	}	3078	}
2401		3079
2402	sub _topleft {	3080	sub coord2local {
2403	my ($self, $x, $y) = @_;	3081	my ($self, $x, $y) = @_;
2404		3082
2405	($x, $y)	3083	($x, $y)
2406	}	3084	}
2407		3085
		3086	sub coord2global {
		3087	my ($self, $x, $y) = @_;
		3088
		3089	($x, $y)
		3090	}
		3091
2408	sub update {	3092	sub update {
2409	my ($self) = @_;	3093	my ($self) = @_;
2410		3094
2411	$self->check_size;	3095	$self->check_size;
2412	::refresh ();	3096	$::WANT_REFRESH++;
2413	}	3097	}
2414		3098
2415	sub add {	3099	sub add {
2416	my ($self, $child) = @_;	3100	my ($self, @children) = @_;
2417		3101
		3102	for (my @widgets = @children; my $w = pop @widgets; ) {
		3103	push @widgets, $w->children;
		3104	$w->{root} = $self;
		3105	$w->{visible} = 1;
		3106	}
		3107
		3108	for my $child (@children) {
		3109	$child->{toplevel} = 1;
		3110
2418	# integerize window positions	3111	# integerise window positions
2419	$child->{x} = int $child->{x};	3112	$child->{x} = int $child->{x};
2420	$child->{y} = int $child->{y};	3113	$child->{y} = int $child->{y};
		3114	}
2421		3115
2422	$self->SUPER::add ($child);	3116	$self->SUPER::add (@children);
		3117	}
		3118
		3119	sub remove {
		3120	my ($self, @children) = @_;
		3121
		3122	$self->SUPER::remove (@children);
		3123
		3124	while (@children) {
		3125	my $w = pop @children;
		3126	push @children, $w->children;
		3127	delete $w->{visible};
		3128	}
2423	}	3129	}
2424		3130
2425	sub on_refresh {	3131	sub on_refresh {
2426	my ($self, $id, $cb) = @_;	3132	my ($self, $id, $cb) = @_;
2427		3133
2428	$self->{refresh_hook}{$id} = $cb;	3134	$self->{refresh_hook}{$id} = $cb;
2429	}	3135	}
2430		3136
		3137	sub on_post_alloc {
		3138	my ($self, $id, $cb) = @_;
		3139
		3140	$self->{post_alloc_hook}{$id} = $cb;
		3141	}
		3142
2431	sub draw {	3143	sub draw {
2432	my ($self) = @_;	3144	my ($self) = @_;
2433		3145
2434	while (my $rcb = delete $self->{refresh_hook}) {	3146	while ($self->{refresh_hook}) {
2435	$_->() for values %$rcb;	3147	$_->()
		3148	for values %{delete $self->{refresh_hook}};
		3149	}
		3150
		3151	if ($self->{check_size}) {
		3152	my @queue = ([], []);
		3153
		3154	for (;;) {
		3155	if ($self->{check_size}) {
		3156	# heuristic: check containers last
		3157	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		3158	for values %{delete $self->{check_size}}
		3159	}
		3160
		3161	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		3162
		3163	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		3164	? @$widget{qw(user_w user_h)}
		3165	: $widget->size_request;
		3166
		3167	if (delete $widget->{force_alloc}
		3168	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		3169	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3170
		3171	$widget->{req_w} = $w;
		3172	$widget->{req_h} = $h;
		3173
		3174	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3175
		3176	$widget->{parent}->check_size
		3177	if $widget->{parent};
		3178	}
		3179	}
		3180	}
		3181
		3182	while ($self->{size_alloc}) {
		3183	for (values %{delete $self->{size_alloc}}) {
		3184	my ($widget, $w, $h) = @$_;
		3185
		3186	$w = 0 if $w < 0;
		3187	$h = 0 if $h < 0;
		3188
		3189	$widget->{w} = $w;
		3190	$widget->{h} = $h;
		3191	$widget->size_allocate ($w, $h);
		3192	$widget->emit (size_allocate => $w, $h);
		3193	}
		3194	}
		3195
		3196	while ($self->{post_alloc_hook}) {
		3197	$_->()
		3198	for values %{delete $self->{post_alloc_hook}};
2436	}	3199	}
2437		3200
2438	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3201	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2439	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3202	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2440	glClear GL_COLOR_BUFFER_BIT;	3203	glClear GL_COLOR_BUFFER_BIT;
2441		3204
2442	glMatrixMode GL_PROJECTION;	3205	glMatrixMode GL_PROJECTION;
2443	glLoadIdentity;	3206	glLoadIdentity;
2444	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3207	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2445	glMatrixMode GL_MODELVIEW;	3208	glMatrixMode GL_MODELVIEW;
2446	glLoadIdentity;	3209	glLoadIdentity;
2447		3210
2448	$self->_draw;	3211	$self->_draw;
2449	}	3212	}
…		…
2451	#############################################################################	3214	#############################################################################
2452		3215
2453	package CFClient::UI;	3216	package CFClient::UI;
2454		3217
2455	$ROOT = new CFClient::UI::Root;	3218	$ROOT = new CFClient::UI::Root;
2456	$TOOLTIP = new CFClient::UI::Tooltip;	3219	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2457		3220
2458	1	3221	1
2459		3222

Diff Legend

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