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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.161 by root, Mon Apr 24 03:43:51 2006 UTC

…		…
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (length $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_text ($widget->{tooltip});
		29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
		30	$TOOLTIP->show;
		31	}
		32
		33	return;
		34	}
		35	}
		36	}
		37
		38	$TOOLTIP->hide;
		39	delete $TOOLTIP->{owner};
		40	}
14		41
15	# class methods for events	42	# class methods for events
16	sub feed_sdl_key_down_event {	43	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	44	$FOCUS->key_down ($_[0]) if $FOCUS;
18	}	45	}
…		…
21	$FOCUS->key_up ($_[0]) if $FOCUS;	48	$FOCUS->key_up ($_[0]) if $FOCUS;
22	}	49	}
23		50
24	sub feed_sdl_button_down_event {	51	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	52	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	53	my ($x, $y) = ($ev->{x}, $ev->{y});
27		54
28	if (!$BUTTON_STATE) {	55	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	56	my $widget = $ROOT->find_widget ($x, $y);
30		57
31	$GRAB = $widget;	58	$GRAB = $widget;
32	$GRAB->update if $GRAB;	59	$GRAB->update if $GRAB;
33	}
34		60
		61	check_tooltip;
		62	}
		63
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		65
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
38	}	67	}
39		68
40	sub feed_sdl_button_up_event {	69	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	70	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	71	my ($x, $y) = ($ev->{x}, $ev->{y});
43		72
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		74
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		76
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
49		78
50	if (!$BUTTON_STATE) {	79	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	80	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	81	$grab->update if $grab;
53	$GRAB->update if $GRAB;	82	$GRAB->update if $GRAB;
		83
		84	check_tooltip;
54	}	85	}
55	}	86	}
56		87
57	sub feed_sdl_motion_event {	88	sub feed_sdl_motion_event {
58	my ($ev) = @_;	89	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	90	my ($x, $y) = ($ev->{x}, $ev->{y});
60		91
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	92	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		93
63	if ($widget != $HOVER) {	94	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	95	my $hover = $HOVER; $HOVER = $widget;
65		96
66	$hover->update if $hover && $hover->{can_hover};	97	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	98	$HOVER->update if $HOVER && $HOVER->{can_hover};
		99
		100	check_tooltip;
68	}	101	}
69		102
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
71	}	104	}
72		105
…		…
87		120
88	package CFClient::UI::Base;	121	package CFClient::UI::Base;
89		122
90	use strict;	123	use strict;
91		124
92	use SDL::OpenGL;	125	use CFClient::OpenGL;
93		126
94	sub new {	127	sub new {
95	my $class = shift;	128	my $class = shift;
96		129
97	my $self = bless {	130	my $self = bless {
98	x => 0,	131	x => 0,
99	y => 0,	132	y => 0,
100	z => 0,	133	z => 0,
101	w => -1,	134	can_events => 1,
102	h => -1,
103	@_	135	@_
104	}, $class;	136	}, $class;
105		137
106	for (keys %$self) {	138	for (keys %$self) {
107	if (/^connect_(.*)$/) {	139	if (/^connect_(.*)$/) {
…		…
110	}	142	}
111		143
112	$self	144	$self
113	}	145	}
114		146
		147	sub destroy {
		148	my ($self) = @_;
		149
		150	$self->hide;
		151	%$self = ();
		152	}
		153
		154	sub show {
		155	my ($self) = @_;
		156
		157	return if $self->{parent};
		158
		159	$CFClient::UI::ROOT->add ($self);
		160	}
		161
		162	sub hide {
		163	my ($self) = @_;
		164
		165	return unless $self->{parent};
		166
		167	$self->{parent}->remove ($self);
		168	}
		169
115	sub move {	170	sub move {
116	my ($self, $x, $y, $z) = @_;	171	my ($self, $x, $y, $z) = @_;
117		172
118	$self->{x} = int $x;	173	$self->{x} = int $x;
119	$self->{y} = int $y;	174	$self->{y} = int $y;
120	$self->{z} = $z if defined $z;	175	$self->{z} = $z if defined $z;
121		176
122	$self->update;	177	$self->update;
123	}	178	}
124		179
125	sub needs_redraw {	180	sub set_size {
126	0	181	my ($self, $w, $h) = @_;
		182
		183	$self->{user_w} = $w;
		184	$self->{user_h} = $h;
		185
		186	$self->check_size;
127	}	187	}
128		188
129	sub size_request {	189	sub size_request {
130	require Carp;	190	require Carp;
131	Carp::confess "size_request is abtract";	191	Carp::confess "size_request is abstract";
132	}	192	}
133		193
134	sub configure {	194	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	195	my ($self, $x, $y, $w, $h) = @_;
136		196
		197	if ($self->{aspect}) {
		198	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		199	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		200
		201	# use alignment to adjust x, y
		202
		203	$x += int +($w - $w2) * 0.5;
		204	$y += int +($h - $h2) * 0.5;
		205
		206	($w, $h) = ($w2, $h2);
		207	}
		208
		209	if ($self->{x} != $x || $self->{y} != $y) {
137	$self->{x} = $x;	210	$self->{x} = $x;
138	$self->{y} = $y;	211	$self->{y} = $y;
		212	$self->update;
		213	}
139		214
140	return unless $self->{w} != $w || $self->{h} != $h;	215	if ($self->{w} != $w || $self->{h} != $h) {
141
142	$self->{w} = $w;	216	$self->{w} = $w;
143	$self->{h} = $h;	217	$self->{h} = $h;
144		218
145	$self->size_allocate ($w, $h);	219	$self->size_allocate ($w, $h);
		220	$self->update;
		221	}
146	}	222	}
147		223
148	sub size_allocate {	224	sub size_allocate {
149	# nothing to be done	225	# nothing to be done
		226	}
		227
		228	sub set_max_size {
		229	my ($self, $w, $h) = @_;
		230
		231	delete $self->{max_w}; $self->{max_w} = $w if $w;
		232	delete $self->{max_h}; $self->{max_h} = $h if $h;
150	}	233	}
151		234
152	# return top left coordinates	235	# return top left coordinates
153	sub _topleft {	236	sub _topleft {
154	my ($self, $x, $y) = @_;	237	my ($self, $x, $y) = @_;
…		…
248	}	331	}
249		332
250	sub find_widget {	333	sub find_widget {
251	my ($self, $x, $y) = @_;	334	my ($self, $x, $y) = @_;
252		335
		336	return () unless $self->{can_events};
		337
253	return $self	338	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	339	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	340	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		341
257	()	342	()
…		…
264	}	349	}
265		350
266	sub check_size {	351	sub check_size {
267	my ($self) = @_;	352	my ($self) = @_;
268		353
269	my ($w, $h) = $self->size_request;	354	$self->{parent}
		355	or return 1;
270		356
		357	my ($w, $h) = $self->{user_w} && $self->{user_h}
		358	? @$self{qw(user_w user_h)}
		359	: $self->size_request;
		360
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {	361	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;	362	$self->{req_w} = $w;
273	$self->{req_h} = $h;	363	$self->{req_h} = $h;
274		364
275	$self->{parent}->check_size	365	$self->{parent}->check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);	366	or $self->size_allocate (
279	$self->update;	367	(List::Util::max $self->{w}, $w),
		368	(List::Util::max $self->{h}, $h),
		369	);
		370
		371	1
		372	} else {
		373	0
280	}	374	}
281	}	375	}
282		376
283	sub update {	377	sub update {
284	my ($self) = @_;	378	my ($self) = @_;
…		…
312	package CFClient::UI::DrawBG;	406	package CFClient::UI::DrawBG;
313		407
314	our @ISA = CFClient::UI::Base::;	408	our @ISA = CFClient::UI::Base::;
315		409
316	use strict;	410	use strict;
317	use SDL::OpenGL;	411	use CFClient::OpenGL;
318		412
319	sub new {	413	sub new {
320	my $class = shift;	414	my $class = shift;
321		415
322	# range [value, low, high, page]	416	# range [value, low, high, page]
…		…
351		445
352	package CFClient::UI::Empty;	446	package CFClient::UI::Empty;
353		447
354	our @ISA = CFClient::UI::Base::;	448	our @ISA = CFClient::UI::Base::;
355		449
		450	sub new {
		451	my ($class, %arg) = @_;
		452	$class->SUPER::new (can_events => 0, %arg);
		453	}
		454
356	sub size_request {	455	sub size_request {
357	(0, 0)	456	(0, 0)
358	}	457	}
359		458
360	sub draw { }	459	sub draw { }
…		…
368	sub new {	467	sub new {
369	my ($class, %arg) = @_;	468	my ($class, %arg) = @_;
370		469
371	my $children = delete $arg{children} || [];	470	my $children = delete $arg{children} || [];
372		471
373	my $self = $class->SUPER::new (children => [], %arg);	472	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374	$self->add ($_) for @$children;	473	$self->add ($_) for @$children;
375		474
376	$self	475	$self
377	}	476	}
378		477
…		…
386	$self->{children} = [	485	$self->{children} = [
387	sort { $a->{z} <=> $b->{z} }	486	sort { $a->{z} <=> $b->{z} }
388	@{$self->{children}}, $child	487	@{$self->{children}}, $child
389	];	488	];
390		489
391	$self->{w} = $self->{h} = -1;
392
393	$child->check_size;	490	$child->check_size;
394	}	491	}
395		492
396	sub remove {	493	sub remove {
397	my ($self, $widget) = @_;	494	my ($self, $child) = @_;
398		495
		496	delete $child->{parent};
		497
399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	498	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400		499
401	$self->check_size;	500	$self->check_size;
		501	$self->update;
402	}	502	}
403		503
404	sub find_widget {	504	sub find_widget {
405	my ($self, $x, $y) = @_;	505	my ($self, $x, $y) = @_;
406		506
…		…
436		536
437	$class->SUPER::new (children => [$child], %arg)	537	$class->SUPER::new (children => [$child], %arg)
438	}	538	}
439		539
440	sub add {	540	sub add {
441	my ($self, $widget) = @_;	541	my ($self, $child) = @_;
442		542
443	$self->{children} = [];	543	$self->{children} = [];
444		544
445	$self->SUPER::add ($widget);	545	$self->SUPER::add ($child);
446	}	546	}
447		547
448	sub remove {	548	sub remove {
449	my ($self, $widget) = @_;	549	my ($self, $widget) = @_;
450		550
…		…
470		570
471	package CFClient::UI::Window;	571	package CFClient::UI::Window;
472		572
473	our @ISA = CFClient::UI::Bin::;	573	our @ISA = CFClient::UI::Bin::;
474		574
475	use SDL::OpenGL;	575	use CFClient::OpenGL;
476		576
477	sub new {	577	sub new {
478	my ($class, %arg) = @_;	578	my ($class, %arg) = @_;
479		579
480	my $self = $class->SUPER::new (%arg);	580	my $self = $class->SUPER::new (%arg);
…		…
534	sub new { die }	634	sub new { die }
535		635
536	sub size_request {	636	sub size_request {
537	my ($self) = @_;	637	my ($self) = @_;
538		638
539	@$self{qw(child_w child_h)} = $self->child->size_request;	639	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
540	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	640	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541		641
542	@$self{qw(child_w child_h)}	642	@$self{qw(child_w child_h)}
543	}	643	}
544		644
…		…
553		653
554	package CFClient::UI::Frame;	654	package CFClient::UI::Frame;
555		655
556	our @ISA = CFClient::UI::Bin::;	656	our @ISA = CFClient::UI::Bin::;
557		657
558	use SDL::OpenGL;	658	use CFClient::OpenGL;
559
560	sub size_request {
561	my ($self) = @_;
562	my $chld = $self->child
563	or return (0, 0);
564
565	$chld->move (2, 2);
566
567	map { $_ + 4 } $chld->size_request;
568	}
569
570	sub size_allocate {
571	my ($self, $x, $y, $w, $h) = @_;
572
573	$self->child->configure (2, 2, $w - 4, $h - 4);
574	}
575
576	sub _draw {
577	my ($self) = @_;
578
579	my $chld = $self->child;
580
581	my ($w, $h) = $chld->size_request;
582
583	glBegin GL_QUADS;
584	glColor 0, 0, 0;
585	glVertex 0 , 0;
586	glVertex 0 , $h + 4;
587	glVertex $w + 4 , $h + 4;
588	glVertex $w + 4 , 0;
589	glEnd;
590
591	$chld->draw;
592	}
593
594	#############################################################################
595
596	package CFClient::UI::FancyFrame;
597
598	our @ISA = CFClient::UI::Bin::;
599
600	use SDL::OpenGL;
601
602	my @tex =
603	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605		659
606	sub new {	660	sub new {
607	my $class = shift;	661	my $class = shift;
608		662
609	# TODO: user_x, user_y, overwrite moveto?
610
611	$class->SUPER::new (	663	my $self = $class->SUPER::new (
612	bg => [1, 1, 1, 1],	664	bg => [1, 1, 1, 1],
613	border_bg => [1, 1, 1, 1],	665	border_bg => [1, 1, 1, 1],
614	border => int $::FONTSIZE * 0.8,	666	border => 0.8,
615	@_	667	@_
616	)	668	);
		669
		670	$self
		671	}
		672
		673	sub _draw {
		674	my ($self) = @_;
		675
		676	my ($w, $h) = ($self->{w}, $self->{h});
		677
		678	glEnable GL_BLEND;
		679	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		680	glEnable GL_TEXTURE_2D;
		681	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		682
		683	# glBegin GL_QUADS;
		684	# glColor 0, 0, 0, 0;
		685	# glVertex 0 , 0;
		686	# glVertex 0 , $h;
		687	# glVertex $w, $h;
		688	# glVertex $w, 0;
		689	# glEnd;
		690
		691
		692	$self->child->draw;
		693	glDisable GL_BLEND;
		694	glDisable GL_TEXTURE_2D;
		695	}
		696
		697	#############################################################################
		698
		699	package CFClient::UI::FancyFrame;
		700
		701	our @ISA = CFClient::UI::Bin::;
		702
		703	use CFClient::OpenGL;
		704
		705	my @tex =
		706	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		707	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		708
		709	sub new {
		710	my $class = shift;
		711
		712	# TODO: user_x, user_y, overwrite moveto?
		713
		714	my $self = $class->SUPER::new (
		715	bg => [1, 1, 1, 1],
		716	border_bg => [1, 1, 1, 1],
		717	border => 0.8,
		718	can_events => 1,
		719	@_
		720	);
		721
		722	$self->{title} &&= new CFClient::UI::Label
		723	align => 0,
		724	valign => 1,
		725	text => $self->{title},
		726	fontsize => 1;
		727
		728	$self
		729	}
		730
		731	sub border {
		732	int $_[0]{border} * $::FONTSIZE
617	}	733	}
618		734
619	sub size_request {	735	sub size_request {
620	my ($self) = @_;	736	my ($self) = @_;
621		737
622	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624	my ($w, $h) = $self->SUPER::size_request;	738	my ($w, $h) = $self->SUPER::size_request;
625		739
626	(	740	(
627	$w + $self->{border} * 2,	741	$w + $self->border * 2,
628	$h + $self->{border} * 2,	742	$h + $self->border * 2,
629	)	743	)
630	}	744	}
631		745
632	sub size_allocate {	746	sub size_allocate {
633	my ($self, $w, $h) = @_;	747	my ($self, $w, $h) = @_;
634		748
635	$h -= List::Util::max 0, $self->{border} * 2;	749	$h -= List::Util::max 0, $self->border * 2;
636	$w -= List::Util::max 0, $self->{border} * 2;	750	$w -= List::Util::max 0, $self->border * 2;
637		751
		752	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		753	if $self->{title};
		754
638	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	755	$self->child->configure ($self->border, $self->border, $w, $h);
639	}	756	}
640		757
641	sub button_down {	758	sub button_down {
642	my ($self, $ev, $x, $y) = @_;	759	my ($self, $ev, $x, $y) = @_;
643		760
		761	my $border = $self->border;
		762
644	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	763	if ($x < $self->{w} && $x >= $self->{w} - $border
645	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	764	&& $y < $self->{h} && $y >= $self->{h} - $border) {
646		765
647	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	766	my ($ox, $oy) = ($ev->{x}, $ev->{y});
648	my ($bw, $bh) = ($self->{w}, $self->{h});	767	my ($bw, $bh) = ($self->{w}, $self->{h});
649		768
650	$self->{motion} = sub {	769	$self->{motion} = sub {
651	my ($ev, $x, $y) = @_;	770	my ($ev, $x, $y) = @_;
652		771
653	($x, $y) = ($ev->motion_x, $ev->motion_y);	772	($x, $y) = ($ev->{x}, $ev->{y});
654		773
655	$self->{user_w} = $bw + $x - $ox;	774	$self->{user_w} = $bw + $x - $ox;
656	$self->{user_h} = $bh + $y - $oy;	775	$self->{user_h} = $bh + $y - $oy;
657	$self->check_size;	776	$self->check_size;
658	};	777	};
659		778
660	} elsif ($x >= 0 && $x < $self->{w}	779	} elsif ($x >= 0 && $x < $self->{w}
661	&& $y >= 0 && $y < $self->{border}) {	780	&& $y >= 0 && $y < $border) {
662		781
663	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	782	my ($ox, $oy) = ($ev->{x}, $ev->{y});
664	my ($bx, $by) = ($self->{x}, $self->{y});	783	my ($bx, $by) = ($self->{x}, $self->{y});
665		784
666	$self->{motion} = sub {	785	$self->{motion} = sub {
667	my ($ev, $x, $y) = @_;	786	my ($ev, $x, $y) = @_;
668		787
669	($x, $y) = ($ev->motion_x, $ev->motion_y);	788	($x, $y) = ($ev->{x}, $ev->{y});
670		789
671	$self->move ($bx + $x - $ox, $by + $y - $oy);	790	$self->move ($bx + $x - $ox, $by + $y - $oy);
672	$self->update;	791	$self->update;
673	};	792	};
674	}	793	}
…		…
695	glEnable GL_BLEND;	814	glEnable GL_BLEND;
696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	815	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697	glEnable GL_TEXTURE_2D;	816	glEnable GL_TEXTURE_2D;
698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	817	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699		818
		819	my $border = $self->border;
		820
700	glColor @{ $self->{border_bg} };	821	glColor @{ $self->{border_bg} };
701	$tex[1]->draw_quad (0, 0, $w, $self->{border});	822	$tex[1]->draw_quad (0, 0, $w, $border);
702	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	823	$tex[3]->draw_quad (0, $border, $border, $ch);
703	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	824	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	825	$tex[4]->draw_quad (0, $h - $border, $w, $border);
705		826
706	my $bg = $tex[0];	827	my $bg = $tex[0];
707		828
708	# TODO: repeat texture not scale	829	# TODO: repeat texture not scale
709	my $rep_x = $cw / $bg->{w};	830	my $rep_x = $cw / $bg->{w};
…		…
712	glColor @{ $self->{bg} };	833	glColor @{ $self->{bg} };
713		834
714	$bg->{s} = $rep_x;	835	$bg->{s} = $rep_x;
715	$bg->{t} = $rep_y;	836	$bg->{t} = $rep_y;
716	$bg->{wrap_mode} = 1;	837	$bg->{wrap_mode} = 1;
717	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	838	$bg->draw_quad ($border, $border, $cw, $ch);
718		839
719	glDisable GL_TEXTURE_2D;	840	glDisable GL_TEXTURE_2D;
720	glDisable GL_BLEND;	841	glDisable GL_BLEND;
721		842
		843	$self->{title}->draw if $self->{title};
722	$self->child->draw;	844	$self->child->draw;
723	}	845	}
724		846
725	#############################################################################	847	#############################################################################
726		848
…		…
728		850
729	our @ISA = CFClient::UI::Base::;	851	our @ISA = CFClient::UI::Base::;
730		852
731	use List::Util qw(max sum);	853	use List::Util qw(max sum);
732		854
733	use SDL::OpenGL;	855	use CFClient::OpenGL;
734		856
735	sub new {	857	sub new {
736	my $class = shift;	858	my $class = shift;
737		859
738	$class->SUPER::new (	860	$class->SUPER::new (
…		…
745	my ($self, $x, $y, $child) = @_;	867	my ($self, $x, $y, $child) = @_;
746		868
747	$child->set_parent ($self);	869	$child->set_parent ($self);
748	$self->{children}[$y][$x] = $child;	870	$self->{children}[$y][$x] = $child;
749		871
750	$self->{w} = $self->{h} = -1;
751
752	$child->check_size;	872	$child->check_size;
753	}	873	}
754		874
755	# TODO: move to container class maybe? send childs a signal on removal?	875	# TODO: move to container class maybe? send childs a signal on removal?
756	sub clear {	876	sub clear {
…		…
770	or next;	890	or next;
771		891
772	for my $x (0 .. $#$row) {	892	for my $x (0 .. $#$row) {
773	my $widget = $row->[$x]	893	my $widget = $row->[$x]
774	or next;	894	or next;
775	my ($w, $h) = $widget->size_request;	895	my ($w, $h) = @$widget{qw(req_w req_h)};
776		896
777	$w[$x] = max $w[$x], $w;	897	$w[$x] = max $w[$x], $w;
778	$h[$y] = max $h[$y], $h;	898	$h[$y] = max $h[$y], $h;
779	}	899	}
780	}	900	}
…		…
885		1005
886	($h, $w) = ($w, $h);	1006	($h, $w) = ($w, $h);
887		1007
888	my $children = $self->{children};	1008	my $children = $self->{children};
889		1009
890	my @h = map +($_->size_request)[0], @$children;	1010	my @h = map $_->{req_w}, @$children;
891		1011
892	my $req_h = List::Util::sum @h;	1012	my $req_h = List::Util::sum @h;
893		1013
894	if ($req_h > $h) {	1014	if ($req_h > $h) {
895	# ah well, not enough space	1015	# ah well, not enough space
…		…
943	sub size_allocate {	1063	sub size_allocate {
944	my ($self, $w, $h) = @_;	1064	my ($self, $w, $h) = @_;
945		1065
946	my $children = $self->{children};	1066	my $children = $self->{children};
947		1067
948	my @h = map +($_->size_request)[1], @$children;	1068	my @h = map $_->{req_h}, @$children;
949		1069
950	my $req_h = List::Util::sum @h;	1070	my $req_h = List::Util::sum @h;
951		1071
952	if ($req_h > $h) {	1072	if ($req_h > $h) {
953	# ah well, not enough space	1073	# ah well, not enough space
…		…
981		1101
982	package CFClient::UI::Label;	1102	package CFClient::UI::Label;
983		1103
984	our @ISA = CFClient::UI::Base::;	1104	our @ISA = CFClient::UI::Base::;
985		1105
986	use SDL::OpenGL;	1106	use CFClient::OpenGL;
987		1107
988	sub new {	1108	sub new {
989	my ($class, %arg) = @_;	1109	my ($class, %arg) = @_;
990		1110
991	my $self = $class->SUPER::new (	1111	my $self = $class->SUPER::new (
992	fg => [1, 1, 1],	1112	fg => [1, 1, 1],
		1113	#font => default_font
993	fontsize => $::FONTSIZE,	1114	fontsize => 1,
994	text => "",	1115	text => "",
995	align => -1,	1116	align => -1,
996	valign => -1,	1117	valign => -1,
997	padding => 2,	1118	padding => 2,
998	layout => new CFClient::Layout,	1119	layout => new CFClient::Layout,
		1120	can_events => 0,
999	%arg	1121	%arg
1000	);	1122	);
1001		1123
1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1124	if (exists $self->{template}) {
		1125	my $layout = new CFClient::Layout;
		1126	$layout->set_text (delete $self->{template});
		1127	$self->{template} = $layout;
		1128	}
1003		1129
1004	$self->set_text (delete $self->{text}) if exists $self->{text};	1130	$self->set_text (delete $self->{text}) if exists $self->{text};
1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1131	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006		1132
1007	$self	1133	$self
…		…
1021	my ($self, $text) = @_;	1147	my ($self, $text) = @_;
1022		1148
1023	$self->{layout}->set_text ($text);	1149	$self->{layout}->set_text ($text);
1024		1150
1025	delete $self->{texture};	1151	delete $self->{texture};
		1152	$self->check_size;
1026	$self->update;	1153	$self->update;
1027	}	1154	}
1028		1155
1029	sub set_markup {	1156	sub set_markup {
1030	my ($self, $markup) = @_;	1157	my ($self, $markup) = @_;
1031		1158
1032	$self->{layout}->set_markup ($markup);	1159	$self->{layout}->set_markup ($markup);
1033		1160
1034	delete $self->{texture};	1161	delete $self->{texture};
		1162	$self->check_size;
1035	$self->update;	1163	$self->update;
1036	}	1164	}
1037		1165
1038	sub size_request {	1166	sub size_request {
1039	my ($self) = @_;	1167	my ($self) = @_;
1040		1168
1041	$self->{layout}->set_width;	1169	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1170	$self->{layout}->set_width ($self->{max_w} || -1);
1042	$self->{layout}->set_height ($self->{fontsize});	1171	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043		1172
1044	my ($w, $h) = $self->{layout}->size;	1173	my ($w, $h) = $self->{layout}->size;
		1174
		1175	if (exists $self->{template}) {
		1176	$self->{template}->set_font ($self->{font}) if $self->{font};
		1177	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1178
		1179	my ($w2, $h2) = $self->{template}->size;
		1180
		1181	$w = List::Util::max $w, $w2;
		1182	$h = List::Util::max $h, $h2;
		1183	}
1045		1184
1046	(	1185	(
1047	$w + $self->{padding} * 2,	1186	$w + $self->{padding} * 2,
1048	$h + $self->{padding} * 2,	1187	$h + $self->{padding} * 2,
1049	)	1188	)
…		…
1053	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1054		1193
1055	delete $self->{texture};	1194	delete $self->{texture};
1056	}	1195	}
1057		1196
1058	sub update {	1197	sub set_fontsize {
1059	my ($self) = @_;	1198	my ($self, $fontsize) = @_;
1060		1199
		1200	$self->{fontsize} = $fontsize;
1061	delete $self->{texture};	1201	delete $self->{texture};
		1202	$self->check_size;
1062	$self->SUPER::update;	1203	$self->update;
1063	}	1204	}
1064		1205
1065	sub _draw {	1206	sub _draw {
1066	my ($self) = @_;	1207	my ($self) = @_;
1067		1208
1068	my $tex = $self->{texture} ||= do {	1209	my $tex = $self->{texture} ||= do {
		1210	$self->{layout}->set_font ($self->{font}) if $self->{font};
1069	$self->{layout}->set_width ($self->{w});	1211	$self->{layout}->set_width ($self->{w});
1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1212	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071	new_from_layout CFClient::Texture $self->{layout}	1213	new_from_layout CFClient::Texture $self->{layout}
1072	};	1214	};
1073		1215
1074	glEnable GL_BLEND;	1216	glEnable GL_BLEND;
1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1217	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1100		1242
1101	package CFClient::UI::EntryBase;	1243	package CFClient::UI::EntryBase;
1102		1244
1103	our @ISA = CFClient::UI::Label::;	1245	our @ISA = CFClient::UI::Label::;
1104		1246
1105	use SDL;	1247	use CFClient::OpenGL;
1106	use SDL::OpenGL;
1107		1248
1108	sub new {	1249	sub new {
1109	my $class = shift;	1250	my $class = shift;
1110		1251
1111	$class->SUPER::new (	1252	$class->SUPER::new (
…		…
1114	active_bg => [1, 1, 1, 0.5],	1255	active_bg => [1, 1, 1, 0.5],
1115	active_fg => [0, 0, 0],	1256	active_fg => [0, 0, 0],
1116	can_hover => 1,	1257	can_hover => 1,
1117	can_focus => 1,	1258	can_focus => 1,
1118	valign => 0,	1259	valign => 0,
		1260	can_events => 1,
1119	@_	1261	@_
1120	)	1262	)
1121	}	1263	}
1122		1264
1123	sub _set_text {	1265	sub _set_text {
…		…
1125		1267
1126	delete $self->{cur_h};	1268	delete $self->{cur_h};
1127		1269
1128	return if $self->{text} eq $text;	1270	return if $self->{text} eq $text;
1129		1271
		1272	delete $self->{texture};
		1273
1130	$self->{last_activity} = $::NOW;	1274	$self->{last_activity} = $::NOW;
1131	$self->{text} = $text;	1275	$self->{text} = $text;
1132		1276
1133	$text =~ s/./*/g if $self->{hidden};	1277	$text =~ s/./*/g if $self->{hidden};
1134	$self->{layout}->set_text ("$text ");	1278	$self->{layout}->set_text ("$text ");
…		…
1149	}	1293	}
1150		1294
1151	sub size_allocate {	1295	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1296	my ($self, $w, $h) = @_;
1153		1297
1154	$self->_set_text ($self->{text});	1298	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155	}	1299	}
1156		1300
1157	sub set_text {	1301	sub set_text {
1158	my ($self, $text) = @_;	1302	my ($self, $text) = @_;
1159		1303
…		…
1163	}	1307	}
1164		1308
1165	sub key_down {	1309	sub key_down {
1166	my ($self, $ev) = @_;	1310	my ($self, $ev) = @_;
1167		1311
1168	my $mod = $ev->key_mod;	1312	my $mod = $ev->{mod};
1169	my $sym = $ev->key_sym;	1313	my $sym = $ev->{sym};
1170
1171	my $uni = $ev->key_unicode;	1314	my $uni = $ev->{unicode};
1172		1315
1173	my $text = $self->get_text;	1316	my $text = $self->get_text;
1174		1317
1175	if ($sym == SDLK_BACKSPACE) {	1318	if ($sym == 8) {
1176	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1319	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177	} elsif ($sym == SDLK_DELETE) {	1320	} elsif ($sym == 127) {
1178	substr $text, $self->{cursor}, 1, "";	1321	substr $text, $self->{cursor}, 1, "";
1179	} elsif ($sym == SDLK_LEFT) {	1322	} elsif ($sym == CFClient::SDLK_LEFT) {
1180	--$self->{cursor} if $self->{cursor};	1323	--$self->{cursor} if $self->{cursor};
1181	} elsif ($sym == SDLK_RIGHT) {	1324	} elsif ($sym == CFClient::SDLK_RIGHT) {
1182	++$self->{cursor} if $self->{cursor} < length $self->{text};	1325	++$self->{cursor} if $self->{cursor} < length $self->{text};
1183	} elsif ($sym == SDLK_HOME) {	1326	} elsif ($sym == CFClient::SDLK_HOME) {
1184	$self->{cursor} = 0;	1327	$self->{cursor} = 0;
1185	} elsif ($sym == SDLK_END) {	1328	} elsif ($sym == CFClient::SDLK_END) {
1186	$self->{cursor} = length $text;	1329	$self->{cursor} = length $text;
1187	} elsif ($sym == SDLK_ESCAPE) {	1330	} elsif ($sym == 27) {
1188	$self->emit ('escape');	1331	$self->emit ('escape');
1189	} elsif ($uni) {	1332	} elsif ($uni) {
1190	substr $text, $self->{cursor}++, 0, chr $uni;	1333	substr $text, $self->{cursor}++, 0, chr $uni;
1191	}	1334	}
1192		1335
…		…
1267		1410
1268	package CFClient::UI::Entry;	1411	package CFClient::UI::Entry;
1269		1412
1270	our @ISA = CFClient::UI::EntryBase::;	1413	our @ISA = CFClient::UI::EntryBase::;
1271		1414
1272	use SDL;	1415	use CFClient::OpenGL;
1273	use SDL::OpenGL;
1274		1416
1275	sub key_down {	1417	sub key_down {
1276	my ($self, $ev) = @_;	1418	my ($self, $ev) = @_;
1277		1419
1278	my $sym = $ev->key_sym;	1420	my $sym = $ev->{sym};
1279		1421
1280	if ($sym == SDLK_RETURN) {	1422	if ($sym == 13) {
1281	$self->emit (activate => $self->get_text);	1423	$self->emit (activate => $self->get_text);
1282	$self->update;	1424	$self->update;
1283		1425
1284	} else {	1426	} else {
1285	$self->SUPER::key_down ($ev);	1427	$self->SUPER::key_down ($ev);
…		…
1291		1433
1292	package CFClient::UI::Button;	1434	package CFClient::UI::Button;
1293		1435
1294	our @ISA = CFClient::UI::Label::;	1436	our @ISA = CFClient::UI::Label::;
1295		1437
1296	use SDL;	1438	use CFClient::OpenGL;
1297	use SDL::OpenGL;
1298		1439
1299	my @tex =	1440	my @tex =
1300	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1441	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301	qw(b1_button_active.png);	1442	qw(b1_button_active.png);
1302		1443
1303	sub new {	1444	sub new {
1304	my $class = shift;	1445	my $class = shift;
1305		1446
…		…
1309	bg => [1, 1, 1, 0.2],	1450	bg => [1, 1, 1, 0.2],
1310	active_fg => [0, 0, 1],	1451	active_fg => [0, 0, 1],
1311	can_hover => 1,	1452	can_hover => 1,
1312	align => 0,	1453	align => 0,
1313	valign => 0,	1454	valign => 0,
		1455	can_events => 1,
1314	@_	1456	@_
1315	)	1457	)
1316	}	1458	}
1317		1459
1318	sub button_up {	1460	sub button_up {
…		…
1352	package CFClient::UI::CheckBox;	1494	package CFClient::UI::CheckBox;
1353		1495
1354	our @ISA = CFClient::UI::DrawBG::;	1496	our @ISA = CFClient::UI::DrawBG::;
1355		1497
1356	my @tex =	1498	my @tex =
1357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1499	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1500	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359		1501
1360	use SDL;	1502	use CFClient::OpenGL;
1361	use SDL::OpenGL;
1362		1503
1363	sub new {	1504	sub new {
1364	my $class = shift;	1505	my $class = shift;
1365		1506
1366	$class->SUPER::new (	1507	$class->SUPER::new (
…		…
1412	glDisable GL_BLEND;	1553	glDisable GL_BLEND;
1413	}	1554	}
1414		1555
1415	#############################################################################	1556	#############################################################################
1416		1557
1417	package CFClient::UI::VGauge;	1558	package CFClient::UI::Image;
1418		1559
1419	our @ISA = CFClient::UI::Base::;	1560	our @ISA = CFClient::UI::Base::;
1420		1561
1421	use SDL::OpenGL;	1562	use CFClient::OpenGL;
		1563	use Carp qw/confess/;
1422		1564
1423	my %tex = (	1565	our %loaded_images;
1424	food => [
1425	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427	],
1428	grace => [
1429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431	],
1432	hp => [
1433	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435	],
1436	mana => [
1437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439	],
1440	);
1441		1566
1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
1443	sub new {	1567	sub new {
1444	my $class = shift;	1568	my $class = shift;
1445		1569
1446	my $self = $class->SUPER::new (gauge => 'food', @_);	1570	my $self = $class->SUPER::new (can_events => 0, @_);
		1571
		1572	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1573
		1574	$loaded_images{$self->{image}} ||=
		1575	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1576
		1577	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1578
		1579	Scalar::Util::weaken $loaded_images{$self->{image}};
		1580
		1581	$self->{aspect} = $tex->{w} / $tex->{h};
1447		1582
1448	$self	1583	$self
1449	}	1584	}
1450		1585
1451	sub size_request {	1586	sub size_request {
1452	my ($self) = @_;	1587	my ($self) = @_;
1453		1588
1454	my $tex = $tex{$self->{gauge}}[0];	1589	($self->{tex}->{w}, $self->{tex}->{h})
1455
1456	@$tex{qw(w h)}
1457	}
1458
1459	sub set_max {
1460	my ($self, $max) = @_;
1461
1462	$self->{max_val} = $max;
1463	}
1464
1465	sub set_value {
1466	my ($self, $val, $max) = @_;
1467
1468	$self->set_max ($max)
1469	if defined $max;
1470
1471	$max = $self->{max_val};
1472	$self->{val} = $val;
1473
1474	$self->update;
1475	}	1590	}
1476		1591
1477	sub _draw {	1592	sub _draw {
1478	my ($self) = @_;	1593	my ($self) = @_;
1479		1594
1480	my $tex = $tex{$self->{gauge}};	1595	my $tex = $self->{tex};
1481		1596
1482	my ($w, $h) = ($self->{w}, $self->{h});	1597	my ($w, $h) = ($self->{w}, $self->{h});
1483		1598
1484	my $ycut = $self->{val} / ($self->{max_val} || 1);	1599	if ($self->{rot90}) {
1485	$ycut = 1 if $self->{val} > $self->{max_val};	1600	glRotate 90, 0, 0, 1;
		1601	glTranslate 0, -$self->{w}, 0;
1486		1602
1487	my $t1 = $tex->[0];	1603	($w, $h) = ($h, $w);
1488	my $t2 = $tex->[1];	1604	}
1489		1605
1490	glEnable GL_BLEND;	1606	glEnable GL_BLEND;
1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1607	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492	glEnable GL_TEXTURE_2D;	1608	glEnable GL_TEXTURE_2D;
1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494		1610
		1611	$tex->draw_quad (0, 0, $w, $h);
		1612
		1613	glDisable GL_BLEND;
		1614	glDisable GL_TEXTURE_2D;
		1615	}
		1616
		1617	#############################################################################
		1618
		1619	package CFClient::UI::VGauge;
		1620
		1621	our @ISA = CFClient::UI::Base::;
		1622
		1623	use List::Util qw(min max);
		1624
		1625	use CFClient::OpenGL;
		1626
		1627	my %tex = (
		1628	food => [
		1629	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1630	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1631	],
		1632	grace => [
		1633	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1634	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1635	],
		1636	hp => [
		1637	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1638	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1639	],
		1640	mana => [
		1641	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1642	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1643	],
		1644	);
		1645
		1646	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1647	sub new {
		1648	my $class = shift;
		1649
		1650	my $self = $class->SUPER::new (
		1651	type => 'food',
		1652	@_
		1653	);
		1654
		1655	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1656
		1657	$self
		1658	}
		1659
		1660	sub size_request {
		1661	my ($self) = @_;
		1662
		1663	#my $tex = $tex{$self->{type}}[0];
		1664	#@$tex{qw(w h)}
		1665	(0, 0)
		1666	}
		1667
		1668	sub set_max {
		1669	my ($self, $max) = @_;
		1670
		1671	$self->{max_val} = $max;
		1672	}
		1673
		1674	sub set_value {
		1675	my ($self, $val, $max) = @_;
		1676
		1677	$self->set_max ($max)
		1678	if defined $max;
		1679
		1680	$max = $self->{max_val};
		1681	$self->{val} = $val;
		1682
		1683	$self->update;
		1684	}
		1685
		1686	sub _draw {
		1687	my ($self) = @_;
		1688
		1689	my $tex = $tex{$self->{type}};
		1690	my ($t1, $t2, $t3) = @$tex;
		1691
		1692	my ($w, $h) = ($self->{w}, $self->{h});
		1693
		1694	if ($self->{vertical}) {
		1695	glRotate 90, 0, 0, 1;
		1696	glTranslate 0, -$self->{w}, 0;
		1697
		1698	($w, $h) = ($h, $w);
		1699	}
		1700
		1701	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1702
		1703	my $ycut1 = max 0, min 1, $ycut;
		1704	my $ycut2 = max 0, min 1, $ycut - 1;
		1705
1495	my $h1 = $self->{h} - $ycut * $self->{h};	1706	my $h1 = $self->{h} * (1 - $ycut1);
1496	my $h2 = $ycut * $self->{h};	1707	my $h2 = $self->{h} * (1 - $ycut2);
1497		1708
1498	my $yp = 0;	1709	glEnable GL_BLEND;
		1710	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1711	glEnable GL_TEXTURE_2D;
		1712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499		1713
1500	glBindTexture GL_TEXTURE_2D, $t1->{name};	1714	glBindTexture GL_TEXTURE_2D, $t1->{name};
1501	glBegin GL_QUADS;	1715	glBegin GL_QUADS;
1502	glTexCoord 0 , 0; glVertex 0 , $yp;	1716	glTexCoord 0 , 0; glVertex 0 , 0;
1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1717	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1718	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1719	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506	glEnd;	1720	glEnd;
1507		1721
1508	$yp += $h1;	1722	my $ycut1 = List::Util::min 1, $ycut;
1509
1510	glBindTexture GL_TEXTURE_2D, $t2->{name};	1723	glBindTexture GL_TEXTURE_2D, $t2->{name};
1511	glBegin GL_QUADS;	1724	glBegin GL_QUADS;
1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1725	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1726	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514	glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;	1727	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1728	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516	glEnd;	1729	glEnd;
		1730
		1731	if ($t3) {
		1732	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1733	glBegin GL_QUADS;
		1734	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1735	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1736	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1737	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1738	glEnd;
		1739	}
1517		1740
1518	glDisable GL_BLEND;	1741	glDisable GL_BLEND;
1519	glDisable GL_TEXTURE_2D;	1742	glDisable GL_TEXTURE_2D;
1520	}	1743	}
1521		1744
1522	#############################################################################	1745	#############################################################################
1523		1746
		1747	package CFClient::UI::Gauge;
		1748
		1749	our @ISA = CFClient::UI::VBox::;
		1750
		1751	sub new {
		1752	my ($class, %arg) = @_;
		1753
		1754	my $self = $class->SUPER::new (
		1755	tooltip => $arg{type},
		1756	can_events => 1,
		1757	can_hover => 1,
		1758	%arg,
		1759	);
		1760
		1761	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1762	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1763	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1764
		1765	$self
		1766	}
		1767
		1768	sub set_fontsize {
		1769	my ($self, $fsize) = @_;
		1770
		1771	$self->{value}->set_fontsize ($fsize);
		1772	$self->{max} ->set_fontsize ($fsize);
		1773	}
		1774
		1775	sub set_value {
		1776	my ($self, $val, $max) = @_;
		1777
		1778	$self->set_max ($max)
		1779	if defined $max;
		1780
		1781	$self->{gauge}->set_value ($val, $max);
		1782	$self->{value}->set_text ($val);
		1783	}
		1784
		1785	sub set_max {
		1786	my ($self, $max) = @_;
		1787
		1788	$self->{gauge}->set_max ($max);
		1789	$self->{max}->set_text ($max);
		1790	}
		1791
		1792	#############################################################################
		1793
1524	package CFClient::UI::Slider;	1794	package CFClient::UI::Slider;
1525		1795
1526	use strict;	1796	use strict;
1527		1797
1528	use SDL::OpenGL;	1798	use CFClient::OpenGL;
1529		1799
1530	our @ISA = CFClient::UI::DrawBG::;	1800	our @ISA = CFClient::UI::DrawBG::;
1531		1801
1532	my @tex =	1802	my @tex =
1533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1803	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1543	# TODO: calculations are off	1813	# TODO: calculations are off
1544	my $self = $class->SUPER::new (	1814	my $self = $class->SUPER::new (
1545	fg => [1, 1, 1],	1815	fg => [1, 1, 1],
1546	active_fg => [0, 0, 0],	1816	active_fg => [0, 0, 0],
1547	range => [0, 0, 100, 10],	1817	range => [0, 0, 100, 10],
1548	req_w => 40,	1818	req_w => 20,
1549	req_h => 13,	1819	req_h => 20,
1550	vertical => 0,	1820	vertical => 0,
1551	can_hover => 1,	1821	can_hover => 1,
1552	inner_pad => 5,	1822	inner_pad => 5,
1553	@_	1823	@_
1554	);	1824	);
…		…
1658		1928
1659	package CFClient::UI::TextView;	1929	package CFClient::UI::TextView;
1660		1930
1661	our @ISA = CFClient::UI::HBox::;	1931	our @ISA = CFClient::UI::HBox::;
1662		1932
1663	use SDL::OpenGL;	1933	use CFClient::OpenGL;
1664		1934
1665	sub new {	1935	sub new {
1666	my $class = shift;	1936	my $class = shift;
1667		1937
1668	my $self = $class->SUPER::new (	1938	my $self = $class->SUPER::new (
1669	req_w => $::WIDTH / 6,
1670	req_h => $::HEIGHT / 6,
1671	fontsize => $::FONTSIZE,	1939	fontsize => 1,
		1940	#font => default_font
1672	@_,	1941	@_,
1673		1942
1674	layout => (new CFClient::Layout),	1943	layout => (new CFClient::Layout),
1675	par => [],	1944	par => [],
1676	height => 0,	1945	height => 0,
…		…
1697	sub text_height {	1966	sub text_height {
1698	my ($self, $text) = @_;	1967	my ($self, $text) = @_;
1699		1968
1700	my $layout = $self->{layout};	1969	my $layout = $self->{layout};
1701		1970
1702	$layout->set_height ($self->{fontsize});	1971	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703	$layout->set_width ($self->{w});	1972	$layout->set_width ($self->{w});
1704	$layout->set_text ($text);	1973	$layout->set_text ($text);
1705		1974
1706	($layout->size)[1]	1975	($layout->size)[1]
1707	}	1976	}
…		…
1711		1980
1712	$self->{need_reflow}++;	1981	$self->{need_reflow}++;
1713	$self->update;	1982	$self->update;
1714	}	1983	}
1715		1984
1716	sub size_request {
1717	my ($self) = @_;
1718
1719	($self->{req_w}, $self->{req_h})
1720	}
1721
1722	sub size_allocate {	1985	sub size_allocate {
1723	my ($self, $w, $h) = @_;	1986	my ($self, $w, $h) = @_;
1724		1987
		1988	$self->SUPER::size_allocate ($w, $h);
		1989
		1990	$self->{layout}->set_font ($self->{font}) if $self->{font};
1725	$self->{layout}->set_height ($self->{fontsize});	1991	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726	$self->{layout}->set_width ($self->{w});	1992	$self->{layout}->set_width ($self->{children}[0]{w});
1727		1993
1728	$self->reflow;	1994	$self->reflow;
1729	$self->update;
1730	}	1995	}
1731		1996
1732	sub add_paragraph {	1997	sub add_paragraph {
1733	my ($self, $color, $text) = @_;	1998	my ($self, $color, $text) = @_;
1734		1999
…		…
1782	my $y1 = $top + $self->{h};	2047	my $y1 = $top + $self->{h};
1783		2048
1784	my $y = 0;	2049	my $y = 0;
1785		2050
1786	my $layout = $self->{layout};	2051	my $layout = $self->{layout};
		2052
		2053	$layout->set_font ($self->{font}) if $self->{font};
1787		2054
1788	for my $par (@{$self->{par}}) {	2055	for my $par (@{$self->{par}}) {
1789	my $h = $par->[0];	2056	my $h = $par->[0];
1790		2057
1791	if ($y0 < $y + $h && $y < $y1) {	2058	if ($y0 < $y + $h && $y < $y1) {
…		…
1819		2086
1820	}	2087	}
1821		2088
1822	#############################################################################	2089	#############################################################################
1823		2090
1824	package CFClient::UI::MapWidget;
1825
1826	use strict;
1827
1828	use List::Util qw(min max);
1829
1830	use SDL;
1831	use SDL::OpenGL;
1832
1833	our @ISA = CFClient::UI::Base::;
1834
1835	sub new {
1836	my $class = shift;
1837
1838	$class->SUPER::new (
1839	z => -1,
1840	can_focus => 1,
1841	list => (glGenLists 1),
1842	@_
1843	)
1844	}
1845
1846	sub key_down {
1847	print "MAPKEYDOWN\n";
1848	}
1849
1850	sub key_up {
1851	}
1852
1853	sub button_down {
1854	my ($self, $ev, $x, $y) = @_;
1855
1856	$self->focus_in;
1857
1858	if ($ev->button == 2) {
1859	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862	$self->{motion} = sub {
1863	my ($ev, $x, $y) = @_;
1864
1865	($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867	$::CFG->{map_shift_x} = $bw + $x - $ox;
1868	$::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870	$self->update;
1871	};
1872	}
1873	}
1874
1875	sub button_up {
1876	my ($self, $ev, $x, $y) = @_;
1877
1878	delete $self->{motion};
1879	}
1880
1881	sub mouse_motion {
1882	my ($self, $ev, $x, $y) = @_;
1883
1884	$self->{motion}->($ev, $x, $y) if $self->{motion};
1885	}
1886
1887	sub size_request {
1888	(
1889	1 + 32 * int $::WIDTH / 32,
1890	1 + 32 * int $::HEIGHT / 32,
1891	)
1892	}
1893
1894	sub update {
1895	my ($self) = @_;
1896
1897	$self->{need_update} = 1;
1898	$self->SUPER::update;
1899	}
1900
1901	sub draw {
1902	my ($self) = @_;
1903
1904	if (delete $self->{need_update}) {
1905	glNewList $self->{list}, GL_COMPILE;
1906
1907	if ($::MAP) {
1908	my $sw = int $::WIDTH / 32;
1909	my $sh = int $::HEIGHT / 32;
1910
1911	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914	glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918	if ($::CFG->{fow_enable}) {
1919	if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920	glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921	glConvolutionFilter2D (
1922	GL_CONVOLUTION_2D,
1923	GL_ALPHA,
1924	3, 3,
1925	GL_ALPHA, GL_FLOAT,
1926	pack "f*",
1927	0.1, 0.1, 0.1,
1928	0.1, 0.2, 0.1,
1929	0.1, 0.1, 0.1,
1930	);
1931	glEnable GL_CONVOLUTION_2D;
1932	}
1933
1934	$self->{fow_texture} = new CFClient::Texture
1935	w => $w,
1936	h => $h,
1937	data => $data,
1938	internalformat => GL_ALPHA,
1939	format => GL_ALPHA;
1940
1941	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943	glEnable GL_BLEND;
1944	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945	glEnable GL_TEXTURE_2D;
1946	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948	glColor +($::CFG->{fow_intensity}) x 3, 1;
1949	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951	glDisable GL_TEXTURE_2D;
1952	glDisable GL_BLEND;
1953	}
1954
1955	# HACK BEGIN
1956	{
1957	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958	my ($w, $h) = (250, 250);
1959
1960	glEnable GL_BLEND;
1961	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965	$self->{mapmap_texture} =
1966	new CFClient::Texture
1967	w => $w,
1968	h => $h,
1969	data => $::MAP->mapmap ($w, $h),
1970	type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972	$self->{mapmap_texture}->draw_quad (100, 100);
1973
1974	glDisable GL_TEXTURE_2D;
1975	glDisable GL_BLEND;
1976	}
1977	# HACK END
1978	}
1979
1980	glEndList;
1981	}
1982
1983	glPushMatrix;
1984	glCallList $self->{list};
1985	glPopMatrix;
1986
1987	if ($FOCUS != $self) {
1988	glColor 64/255, 64/255, 64/255;
1989	glLogicOp GL_AND;
1990	glEnable GL_COLOR_LOGIC_OP;
1991	glBegin GL_QUADS;
1992	glVertex 0, 0;
1993	glVertex 0, $::HEIGHT;
1994	glVertex $::WIDTH, $::HEIGHT;
1995	glVertex $::WIDTH, 0;
1996	glEnd;
1997	glDisable GL_COLOR_LOGIC_OP;
1998	}
1999	}
2000
2001	my %DIR = (
2002	SDLK_KP8, [1, "north"],
2003	SDLK_KP9, [2, "northeast"],
2004	SDLK_KP6, [3, "east"],
2005	SDLK_KP3, [4, "southeast"],
2006	SDLK_KP2, [5, "south"],
2007	SDLK_KP1, [6, "southwest"],
2008	SDLK_KP4, [7, "west"],
2009	SDLK_KP7, [8, "northwest"],
2010
2011	SDLK_UP, [1, "north"],
2012	SDLK_RIGHT, [3, "east"],
2013	SDLK_DOWN, [5, "south"],
2014	SDLK_LEFT, [7, "west"],
2015	);
2016
2017	sub key_down {
2018	my ($self, $ev) = @_;
2019
2020	my $mod = $ev->key_mod;
2021	my $sym = $ev->key_sym;
2022
2023	if ($sym == SDLK_KP5) {
2024	$::CONN->user_send ("stay fire");
2025	} elsif ($sym == SDLK_a) {
2026	$::CONN->user_send ("apply");
2027	} elsif ($sym == SDLK_QUOTE) {
2028	$self->emit ('activate_console');
2029	} elsif ($sym == SDLK_SLASH) {
2030	$self->emit ('activate_console' => '/');
2031	} elsif (exists $DIR{$sym}) {
2032	if ($mod & KMOD_SHIFT) {
2033	$self->{shft}++;
2034	$::CONN->user_send ("fire $DIR{$sym}[0]");
2035	} elsif ($mod & KMOD_CTRL) {
2036	$self->{ctrl}++;
2037	$::CONN->user_send ("run $DIR{$sym}[0]");
2038	} else {
2039	$::CONN->user_send ("$DIR{$sym}[1]");
2040	}
2041	}
2042	}
2043
2044	sub key_up {
2045	my ($self, $ev) = @_;
2046
2047	my $mod = $ev->key_mod;
2048	my $sym = $ev->key_sym;
2049
2050	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051	$::CONN->user_send ("fire_stop");
2052	}
2053	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054	$::CONN->user_send ("run_stop");
2055	}
2056	}
2057
2058	#############################################################################
2059
2060	package CFClient::UI::Animator;	2091	package CFClient::UI::Animator;
2061		2092
2062	use SDL::OpenGL;	2093	use CFClient::OpenGL;
2063		2094
2064	our @ISA = CFClient::UI::Bin::;	2095	our @ISA = CFClient::UI::Bin::;
2065		2096
2066	sub moveto {	2097	sub moveto {
2067	my ($self, $x, $y) = @_;	2098	my ($self, $x, $y) = @_;
…		…
2107	my $class = shift;	2138	my $class = shift;
2108		2139
2109	my $self = $class->SUPER::new (	2140	my $self = $class->SUPER::new (
2110	state => 0,	2141	state => 0,
2111	connect_activate => \&toggle_flopper,	2142	connect_activate => \&toggle_flopper,
		2143	can_events => 1,
2112	@_	2144	@_
2113	);	2145	);
2114		2146
2115	if ($self->{state}) {	2147	if ($self->{state}) {
2116	$self->{state} = 0;	2148	$self->{state} = 0;
…		…
2136	$self->emit (changed => $self->{state});	2168	$self->emit (changed => $self->{state});
2137	}	2169	}
2138		2170
2139	#############################################################################	2171	#############################################################################
2140		2172
		2173	package CFClient::UI::Tooltip;
		2174
		2175	our @ISA = CFClient::UI::Bin::;
		2176
		2177	use CFClient::OpenGL;
		2178
		2179	sub new {
		2180	my $class = shift;
		2181
		2182	$class->SUPER::new (
		2183	@_,
		2184	can_events => 0,
		2185	)
		2186	}
		2187
		2188	sub set_text {
		2189	my ($self, $text) = @_;
		2190
		2191	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2192	$self->{label}->set_text ($text);
		2193	$self->add ($self->{label});
		2194	}
		2195
		2196	sub size_request {
		2197	my ($self) = @_;
		2198
		2199	$self->child->set_max_size ($::WIDTH * 0.3);
		2200
		2201	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2202
		2203	($w + 4, $h + 4)
		2204	}
		2205
		2206	sub _draw {
		2207	my ($self) = @_;
		2208
		2209	glPushMatrix;
		2210	glTranslate 0.375, 0.375;
		2211
		2212	my ($w, $h) = @$self{qw(w h)};
		2213
		2214	glColor 1, 0.8, 0.4;
		2215	glBegin GL_QUADS;
		2216	glVertex 0 , 0;
		2217	glVertex 0 , $h;
		2218	glVertex $w, $h;
		2219	glVertex $w, 0;
		2220	glEnd;
		2221
		2222	glColor 0, 0, 0;
		2223	glBegin GL_LINE_LOOP;
		2224	glVertex 0 , 0;
		2225	glVertex 0 , $h;
		2226	glVertex $w, $h;
		2227	glVertex $w, 0;
		2228	glEnd;
		2229
		2230	glPopMatrix;
		2231
		2232	glTranslate 2, 2;
		2233	$self->SUPER::_draw;
		2234	}
		2235
		2236	#############################################################################
		2237
2141	package CFClient::UI::Root;	2238	package CFClient::UI::Root;
2142		2239
2143	our @ISA = CFClient::UI::Container::;	2240	our @ISA = CFClient::UI::Container::;
2144		2241
2145	use SDL::OpenGL;	2242	use CFClient::OpenGL;
2146		2243
2147	sub check_size {	2244	sub check_size {
2148	my ($self) = @_;	2245	my ($self) = @_;
2149		2246
2150	$self->configure (0, 0, $::WITH, $::HEIGHT);	2247	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151	}	2248	}
2152		2249
2153	sub size_request {	2250	sub size_request {
2154	($::WIDTH, $::HEIGHT)	2251	($::WIDTH, $::HEIGHT)
2155	}	2252	}
…		…
2157	sub configure {	2254	sub configure {
2158	my ($self, $x, $y, $w, $h) = @_;	2255	my ($self, $x, $y, $w, $h) = @_;
2159		2256
2160	$self->SUPER::configure ($x, $y, $w, $h);	2257	$self->SUPER::configure ($x, $y, $w, $h);
2161		2258
2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2163	for @{$self->{children}};	2259	for my $child (@{$self->{children}}) {
		2260	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2261
		2262	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2263	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2264	$child->configure ($X, $Y, $W,$H);
		2265	}
2164	}	2266	}
2165		2267
2166	sub _topleft {	2268	sub _topleft {
2167	my ($self, $x, $y) = @_;	2269	my ($self, $x, $y) = @_;
2168		2270
…		…
2176	::refresh ();	2278	::refresh ();
2177	}	2279	}
2178		2280
2179	sub add {	2281	sub add {
2180	my ($self, $child) = @_;	2282	my ($self, $child) = @_;
		2283
		2284	# integerize window positions
		2285	$child->{x} = int $child->{x};
		2286	$child->{y} = int $child->{y};
2181		2287
2182	$self->SUPER::add ($child);	2288	$self->SUPER::add ($child);
2183	}	2289	}
2184		2290
2185	sub on_refresh {	2291	sub on_refresh {
…		…
2211	#############################################################################	2317	#############################################################################
2212		2318
2213	package CFClient::UI;	2319	package CFClient::UI;
2214		2320
2215	$ROOT = new CFClient::UI::Root;	2321	$ROOT = new CFClient::UI::Root;
		2322	$TOOLTIP = new CFClient::UI::Tooltip;
2216		2323
2217	1	2324	1
2218		2325

Diff Legend

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