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.158 by root, Mon Apr 24 02:41:48 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 (exists $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 show {
		148	my ($self) = @_;
		149
		150	return if $self->{parent};
		151
		152	$CFClient::UI::ROOT->add ($self);
		153	}
		154
		155	sub hide {
		156	my ($self) = @_;
		157
		158	return unless $self->{parent};
		159
		160	$self->{parent}->remove ($self);
		161	}
		162
115	sub move {	163	sub move {
116	my ($self, $x, $y, $z) = @_;	164	my ($self, $x, $y, $z) = @_;
117		165
118	$self->{x} = int $x;	166	$self->{x} = int $x;
119	$self->{y} = int $y;	167	$self->{y} = int $y;
120	$self->{z} = $z if defined $z;	168	$self->{z} = $z if defined $z;
121		169
122	$self->update;	170	$self->update;
123	}	171	}
124		172
125	sub needs_redraw {	173	sub set_size {
126	0	174	my ($self, $w, $h) = @_;
		175
		176	$self->{user_w} = $w;
		177	$self->{user_h} = $h;
		178
		179	$self->check_size;
127	}	180	}
128		181
129	sub size_request {	182	sub size_request {
130	require Carp;	183	require Carp;
131	Carp::confess "size_request is abtract";	184	Carp::confess "size_request is abstract";
132	}	185	}
133		186
134	sub configure {	187	sub configure {
135	my ($self, $x, $y, $w, $h) = @_;	188	my ($self, $x, $y, $w, $h) = @_;
136		189
		190	if ($self->{aspect}) {
		191	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		192	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		193
		194	# use alignment to adjust x, y
		195
		196	$x += int +($w - $w2) * 0.5;
		197	$y += int +($h - $h2) * 0.5;
		198
		199	($w, $h) = ($w2, $h2);
		200	}
		201
		202	if ($self->{x} != $x || $self->{y} != $y) {
137	$self->{x} = $x;	203	$self->{x} = $x;
138	$self->{y} = $y;	204	$self->{y} = $y;
		205	$self->update;
		206	}
139		207
140	return unless $self->{w} != $w || $self->{h} != $h;	208	if ($self->{w} != $w || $self->{h} != $h) {
141
142	$self->{w} = $w;	209	$self->{w} = $w;
143	$self->{h} = $h;	210	$self->{h} = $h;
144		211
145	$self->size_allocate ($w, $h);	212	$self->size_allocate ($w, $h);
		213	$self->update;
		214	}
146	}	215	}
147		216
148	sub size_allocate {	217	sub size_allocate {
149	# nothing to be done	218	# nothing to be done
		219	}
		220
		221	sub set_max_size {
		222	my ($self, $w, $h) = @_;
		223
		224	delete $self->{max_w}; $self->{max_w} = $w if $w;
		225	delete $self->{max_h}; $self->{max_h} = $h if $h;
150	}	226	}
151		227
152	# return top left coordinates	228	# return top left coordinates
153	sub _topleft {	229	sub _topleft {
154	my ($self, $x, $y) = @_;	230	my ($self, $x, $y) = @_;
…		…
248	}	324	}
249		325
250	sub find_widget {	326	sub find_widget {
251	my ($self, $x, $y) = @_;	327	my ($self, $x, $y) = @_;
252		328
		329	return () unless $self->{can_events};
		330
253	return $self	331	return $self
254	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	332	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	333	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
256		334
257	()	335	()
…		…
264	}	342	}
265		343
266	sub check_size {	344	sub check_size {
267	my ($self) = @_;	345	my ($self) = @_;
268		346
269	my ($w, $h) = $self->size_request;	347	$self->{parent}
		348	or return 1;
270		349
		350	my ($w, $h) = $self->{user_w} && $self->{user_h}
		351	? @$self{qw(user_w user_h)}
		352	: $self->size_request;
		353
271	if ($w != $self->{req_w} || $h != $self->{req_h}) {	354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
272	$self->{req_w} = $w;	355	$self->{req_w} = $w;
273	$self->{req_h} = $h;	356	$self->{req_h} = $h;
274		357
275	$self->{parent}->check_size	358	$self->{parent}->check_size
276	if $self->{parent};
277
278	$self->size_allocate ($w, $h);	359	or $self->size_allocate (
279	$self->update;	360	(List::Util::max $self->{w}, $w),
		361	(List::Util::max $self->{h}, $h),
		362	);
		363
		364	1
		365	} else {
		366	0
280	}	367	}
281	}	368	}
282		369
283	sub update {	370	sub update {
284	my ($self) = @_;	371	my ($self) = @_;
…		…
312	package CFClient::UI::DrawBG;	399	package CFClient::UI::DrawBG;
313		400
314	our @ISA = CFClient::UI::Base::;	401	our @ISA = CFClient::UI::Base::;
315		402
316	use strict;	403	use strict;
317	use SDL::OpenGL;	404	use CFClient::OpenGL;
318		405
319	sub new {	406	sub new {
320	my $class = shift;	407	my $class = shift;
321		408
322	# range [value, low, high, page]	409	# range [value, low, high, page]
…		…
351		438
352	package CFClient::UI::Empty;	439	package CFClient::UI::Empty;
353		440
354	our @ISA = CFClient::UI::Base::;	441	our @ISA = CFClient::UI::Base::;
355		442
		443	sub new {
		444	my ($class, %arg) = @_;
		445	$class->SUPER::new (can_events => 0, %arg);
		446	}
		447
356	sub size_request {	448	sub size_request {
357	(0, 0)	449	(0, 0)
358	}	450	}
359		451
360	sub draw { }	452	sub draw { }
…		…
368	sub new {	460	sub new {
369	my ($class, %arg) = @_;	461	my ($class, %arg) = @_;
370		462
371	my $children = delete $arg{children} || [];	463	my $children = delete $arg{children} || [];
372		464
373	my $self = $class->SUPER::new (children => [], %arg);	465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
374	$self->add ($_) for @$children;	466	$self->add ($_) for @$children;
375		467
376	$self	468	$self
377	}	469	}
378		470
…		…
386	$self->{children} = [	478	$self->{children} = [
387	sort { $a->{z} <=> $b->{z} }	479	sort { $a->{z} <=> $b->{z} }
388	@{$self->{children}}, $child	480	@{$self->{children}}, $child
389	];	481	];
390		482
391	$self->{w} = $self->{h} = -1;
392
393	$child->check_size;	483	$child->check_size;
394	}	484	}
395		485
396	sub remove {	486	sub remove {
397	my ($self, $widget) = @_;	487	my ($self, $child) = @_;
398		488
		489	delete $child->{parent};
		490
399	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400		492
401	$self->check_size;	493	$self->check_size;
		494	$self->update;
402	}	495	}
403		496
404	sub find_widget {	497	sub find_widget {
405	my ($self, $x, $y) = @_;	498	my ($self, $x, $y) = @_;
406		499
…		…
436		529
437	$class->SUPER::new (children => [$child], %arg)	530	$class->SUPER::new (children => [$child], %arg)
438	}	531	}
439		532
440	sub add {	533	sub add {
441	my ($self, $widget) = @_;	534	my ($self, $child) = @_;
442		535
443	$self->{children} = [];	536	$self->{children} = [];
444		537
445	$self->SUPER::add ($widget);	538	$self->SUPER::add ($child);
446	}	539	}
447		540
448	sub remove {	541	sub remove {
449	my ($self, $widget) = @_;	542	my ($self, $widget) = @_;
450		543
…		…
470		563
471	package CFClient::UI::Window;	564	package CFClient::UI::Window;
472		565
473	our @ISA = CFClient::UI::Bin::;	566	our @ISA = CFClient::UI::Bin::;
474		567
475	use SDL::OpenGL;	568	use CFClient::OpenGL;
476		569
477	sub new {	570	sub new {
478	my ($class, %arg) = @_;	571	my ($class, %arg) = @_;
479		572
480	my $self = $class->SUPER::new (%arg);	573	my $self = $class->SUPER::new (%arg);
…		…
534	sub new { die }	627	sub new { die }
535		628
536	sub size_request {	629	sub size_request {
537	my ($self) = @_;	630	my ($self) = @_;
538		631
539	@$self{qw(child_w child_h)} = $self->child->size_request;	632	@$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)});	633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541		634
542	@$self{qw(child_w child_h)}	635	@$self{qw(child_w child_h)}
543	}	636	}
544		637
…		…
553		646
554	package CFClient::UI::Frame;	647	package CFClient::UI::Frame;
555		648
556	our @ISA = CFClient::UI::Bin::;	649	our @ISA = CFClient::UI::Bin::;
557		650
558	use SDL::OpenGL;	651	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		652
606	sub new {	653	sub new {
607	my $class = shift;	654	my $class = shift;
608		655
609	# TODO: user_x, user_y, overwrite moveto?
610
611	$class->SUPER::new (	656	my $self = $class->SUPER::new (
612	bg => [1, 1, 1, 1],	657	bg => [1, 1, 1, 1],
613	border_bg => [1, 1, 1, 1],	658	border_bg => [1, 1, 1, 1],
614	border => int $::FONTSIZE * 0.8,	659	border => 0.8,
615	@_	660	@_
616	)	661	);
		662
		663	$self
		664	}
		665
		666	sub _draw {
		667	my ($self) = @_;
		668
		669	my ($w, $h) = ($self->{w}, $self->{h});
		670
		671	glEnable GL_BLEND;
		672	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		673	glEnable GL_TEXTURE_2D;
		674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		675
		676	# glBegin GL_QUADS;
		677	# glColor 0, 0, 0, 0;
		678	# glVertex 0 , 0;
		679	# glVertex 0 , $h;
		680	# glVertex $w, $h;
		681	# glVertex $w, 0;
		682	# glEnd;
		683
		684
		685	$self->child->draw;
		686	glDisable GL_BLEND;
		687	glDisable GL_TEXTURE_2D;
		688	}
		689
		690	#############################################################################
		691
		692	package CFClient::UI::FancyFrame;
		693
		694	our @ISA = CFClient::UI::Bin::;
		695
		696	use CFClient::OpenGL;
		697
		698	my @tex =
		699	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		700	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		701
		702	sub new {
		703	my $class = shift;
		704
		705	# TODO: user_x, user_y, overwrite moveto?
		706
		707	my $self = $class->SUPER::new (
		708	bg => [1, 1, 1, 1],
		709	border_bg => [1, 1, 1, 1],
		710	border => 0.8,
		711	can_events => 1,
		712	@_
		713	);
		714
		715	$self->{title} &&= new CFClient::UI::Label
		716	align => 0,
		717	valign => 1,
		718	text => $self->{title},
		719	fontsize => 1;
		720
		721	$self
		722	}
		723
		724	sub border {
		725	int $_[0]{border} * $::FONTSIZE
617	}	726	}
618		727
619	sub size_request {	728	sub size_request {
620	my ($self) = @_;	729	my ($self) = @_;
621		730
622	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624	my ($w, $h) = $self->SUPER::size_request;	731	my ($w, $h) = $self->SUPER::size_request;
625		732
626	(	733	(
627	$w + $self->{border} * 2,	734	$w + $self->border * 2,
628	$h + $self->{border} * 2,	735	$h + $self->border * 2,
629	)	736	)
630	}	737	}
631		738
632	sub size_allocate {	739	sub size_allocate {
633	my ($self, $w, $h) = @_;	740	my ($self, $w, $h) = @_;
634		741
635	$h -= List::Util::max 0, $self->{border} * 2;	742	$h -= List::Util::max 0, $self->border * 2;
636	$w -= List::Util::max 0, $self->{border} * 2;	743	$w -= List::Util::max 0, $self->border * 2;
637		744
		745	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		746	if $self->{title};
		747
638	$self->child->configure ($self->{border}, $self->{border}, $w, $h);	748	$self->child->configure ($self->border, $self->border, $w, $h);
639	}	749	}
640		750
641	sub button_down {	751	sub button_down {
642	my ($self, $ev, $x, $y) = @_;	752	my ($self, $ev, $x, $y) = @_;
643		753
		754	my $border = $self->border;
		755
644	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	756	if ($x < $self->{w} && $x >= $self->{w} - $border
645	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	757	&& $y < $self->{h} && $y >= $self->{h} - $border) {
646		758
647	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	759	my ($ox, $oy) = ($ev->{x}, $ev->{y});
648	my ($bw, $bh) = ($self->{w}, $self->{h});	760	my ($bw, $bh) = ($self->{w}, $self->{h});
649		761
650	$self->{motion} = sub {	762	$self->{motion} = sub {
651	my ($ev, $x, $y) = @_;	763	my ($ev, $x, $y) = @_;
652		764
653	($x, $y) = ($ev->motion_x, $ev->motion_y);	765	($x, $y) = ($ev->{x}, $ev->{y});
654		766
655	$self->{user_w} = $bw + $x - $ox;	767	$self->{user_w} = $bw + $x - $ox;
656	$self->{user_h} = $bh + $y - $oy;	768	$self->{user_h} = $bh + $y - $oy;
657	$self->check_size;	769	$self->check_size;
658	};	770	};
659		771
660	} elsif ($x >= 0 && $x < $self->{w}	772	} elsif ($x >= 0 && $x < $self->{w}
661	&& $y >= 0 && $y < $self->{border}) {	773	&& $y >= 0 && $y < $border) {
662		774
663	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	775	my ($ox, $oy) = ($ev->{x}, $ev->{y});
664	my ($bx, $by) = ($self->{x}, $self->{y});	776	my ($bx, $by) = ($self->{x}, $self->{y});
665		777
666	$self->{motion} = sub {	778	$self->{motion} = sub {
667	my ($ev, $x, $y) = @_;	779	my ($ev, $x, $y) = @_;
668		780
669	($x, $y) = ($ev->motion_x, $ev->motion_y);	781	($x, $y) = ($ev->{x}, $ev->{y});
670		782
671	$self->move ($bx + $x - $ox, $by + $y - $oy);	783	$self->move ($bx + $x - $ox, $by + $y - $oy);
672	$self->update;	784	$self->update;
673	};	785	};
674	}	786	}
…		…
695	glEnable GL_BLEND;	807	glEnable GL_BLEND;
696	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697	glEnable GL_TEXTURE_2D;	809	glEnable GL_TEXTURE_2D;
698	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699		811
		812	my $border = $self->border;
		813
700	glColor @{ $self->{border_bg} };	814	glColor @{ $self->{border_bg} };
701	$tex[1]->draw_quad (0, 0, $w, $self->{border});	815	$tex[1]->draw_quad (0, 0, $w, $border);
702	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	816	$tex[3]->draw_quad (0, $border, $border, $ch);
703	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	818	$tex[4]->draw_quad (0, $h - $border, $w, $border);
705		819
706	my $bg = $tex[0];	820	my $bg = $tex[0];
707		821
708	# TODO: repeat texture not scale	822	# TODO: repeat texture not scale
709	my $rep_x = $cw / $bg->{w};	823	my $rep_x = $cw / $bg->{w};
…		…
712	glColor @{ $self->{bg} };	826	glColor @{ $self->{bg} };
713		827
714	$bg->{s} = $rep_x;	828	$bg->{s} = $rep_x;
715	$bg->{t} = $rep_y;	829	$bg->{t} = $rep_y;
716	$bg->{wrap_mode} = 1;	830	$bg->{wrap_mode} = 1;
717	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	831	$bg->draw_quad ($border, $border, $cw, $ch);
718		832
719	glDisable GL_TEXTURE_2D;	833	glDisable GL_TEXTURE_2D;
720	glDisable GL_BLEND;	834	glDisable GL_BLEND;
721		835
		836	$self->{title}->draw if $self->{title};
722	$self->child->draw;	837	$self->child->draw;
723	}	838	}
724		839
725	#############################################################################	840	#############################################################################
726		841
…		…
728		843
729	our @ISA = CFClient::UI::Base::;	844	our @ISA = CFClient::UI::Base::;
730		845
731	use List::Util qw(max sum);	846	use List::Util qw(max sum);
732		847
733	use SDL::OpenGL;	848	use CFClient::OpenGL;
734		849
735	sub new {	850	sub new {
736	my $class = shift;	851	my $class = shift;
737		852
738	$class->SUPER::new (	853	$class->SUPER::new (
…		…
745	my ($self, $x, $y, $child) = @_;	860	my ($self, $x, $y, $child) = @_;
746		861
747	$child->set_parent ($self);	862	$child->set_parent ($self);
748	$self->{children}[$y][$x] = $child;	863	$self->{children}[$y][$x] = $child;
749		864
750	$self->{w} = $self->{h} = -1;
751
752	$child->check_size;	865	$child->check_size;
753	}	866	}
754		867
755	# TODO: move to container class maybe? send childs a signal on removal?	868	# TODO: move to container class maybe? send childs a signal on removal?
756	sub clear {	869	sub clear {
…		…
770	or next;	883	or next;
771		884
772	for my $x (0 .. $#$row) {	885	for my $x (0 .. $#$row) {
773	my $widget = $row->[$x]	886	my $widget = $row->[$x]
774	or next;	887	or next;
775	my ($w, $h) = $widget->size_request;	888	my ($w, $h) = @$widget{qw(req_w req_h)};
776		889
777	$w[$x] = max $w[$x], $w;	890	$w[$x] = max $w[$x], $w;
778	$h[$y] = max $h[$y], $h;	891	$h[$y] = max $h[$y], $h;
779	}	892	}
780	}	893	}
…		…
885		998
886	($h, $w) = ($w, $h);	999	($h, $w) = ($w, $h);
887		1000
888	my $children = $self->{children};	1001	my $children = $self->{children};
889		1002
890	my @h = map +($_->size_request)[0], @$children;	1003	my @h = map $_->{req_w}, @$children;
891		1004
892	my $req_h = List::Util::sum @h;	1005	my $req_h = List::Util::sum @h;
893		1006
894	if ($req_h > $h) {	1007	if ($req_h > $h) {
895	# ah well, not enough space	1008	# ah well, not enough space
…		…
943	sub size_allocate {	1056	sub size_allocate {
944	my ($self, $w, $h) = @_;	1057	my ($self, $w, $h) = @_;
945		1058
946	my $children = $self->{children};	1059	my $children = $self->{children};
947		1060
948	my @h = map +($_->size_request)[1], @$children;	1061	my @h = map $_->{req_h}, @$children;
949		1062
950	my $req_h = List::Util::sum @h;	1063	my $req_h = List::Util::sum @h;
951		1064
952	if ($req_h > $h) {	1065	if ($req_h > $h) {
953	# ah well, not enough space	1066	# ah well, not enough space
…		…
981		1094
982	package CFClient::UI::Label;	1095	package CFClient::UI::Label;
983		1096
984	our @ISA = CFClient::UI::Base::;	1097	our @ISA = CFClient::UI::Base::;
985		1098
986	use SDL::OpenGL;	1099	use CFClient::OpenGL;
987		1100
988	sub new {	1101	sub new {
989	my ($class, %arg) = @_;	1102	my ($class, %arg) = @_;
990		1103
991	my $self = $class->SUPER::new (	1104	my $self = $class->SUPER::new (
992	fg => [1, 1, 1],	1105	fg => [1, 1, 1],
		1106	#font => default_font
993	fontsize => $::FONTSIZE,	1107	fontsize => 1,
994	text => "",	1108	text => "",
995	align => -1,	1109	align => -1,
996	valign => -1,	1110	valign => -1,
997	padding => 2,	1111	padding => 2,
998	layout => new CFClient::Layout,	1112	layout => new CFClient::Layout,
		1113	can_events => 0,
999	%arg	1114	%arg
1000	);	1115	);
1001		1116
1002	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1117	if (exists $self->{template}) {
		1118	my $layout = new CFClient::Layout;
		1119	$layout->set_text (delete $self->{template});
		1120	$self->{template} = $layout;
		1121	}
1003		1122
1004	$self->set_text (delete $self->{text}) if exists $self->{text};	1123	$self->set_text (delete $self->{text}) if exists $self->{text};
1005	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
1006		1125
1007	$self	1126	$self
…		…
1021	my ($self, $text) = @_;	1140	my ($self, $text) = @_;
1022		1141
1023	$self->{layout}->set_text ($text);	1142	$self->{layout}->set_text ($text);
1024		1143
1025	delete $self->{texture};	1144	delete $self->{texture};
		1145	$self->check_size;
1026	$self->update;	1146	$self->update;
1027	}	1147	}
1028		1148
1029	sub set_markup {	1149	sub set_markup {
1030	my ($self, $markup) = @_;	1150	my ($self, $markup) = @_;
1031		1151
1032	$self->{layout}->set_markup ($markup);	1152	$self->{layout}->set_markup ($markup);
1033		1153
1034	delete $self->{texture};	1154	delete $self->{texture};
		1155	$self->check_size;
1035	$self->update;	1156	$self->update;
1036	}	1157	}
1037		1158
1038	sub size_request {	1159	sub size_request {
1039	my ($self) = @_;	1160	my ($self) = @_;
1040		1161
1041	$self->{layout}->set_width;	1162	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1163	$self->{layout}->set_width ($self->{max_w} || -1);
1042	$self->{layout}->set_height ($self->{fontsize});	1164	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043		1165
1044	my ($w, $h) = $self->{layout}->size;	1166	my ($w, $h) = $self->{layout}->size;
		1167
		1168	if (exists $self->{template}) {
		1169	$self->{template}->set_font ($self->{font}) if $self->{font};
		1170	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1171
		1172	my ($w2, $h2) = $self->{template}->size;
		1173
		1174	$w = List::Util::max $w, $w2;
		1175	$h = List::Util::max $h, $h2;
		1176	}
1045		1177
1046	(	1178	(
1047	$w + $self->{padding} * 2,	1179	$w + $self->{padding} * 2,
1048	$h + $self->{padding} * 2,	1180	$h + $self->{padding} * 2,
1049	)	1181	)
…		…
1053	my ($self, $w, $h) = @_;	1185	my ($self, $w, $h) = @_;
1054		1186
1055	delete $self->{texture};	1187	delete $self->{texture};
1056	}	1188	}
1057		1189
1058	sub update {	1190	sub set_fontsize {
1059	my ($self) = @_;	1191	my ($self, $fontsize) = @_;
1060		1192
		1193	$self->{fontsize} = $fontsize;
1061	delete $self->{texture};	1194	delete $self->{texture};
		1195	$self->check_size;
1062	$self->SUPER::update;	1196	$self->update;
1063	}	1197	}
1064		1198
1065	sub _draw {	1199	sub _draw {
1066	my ($self) = @_;	1200	my ($self) = @_;
1067		1201
1068	my $tex = $self->{texture} ||= do {	1202	my $tex = $self->{texture} ||= do {
		1203	$self->{layout}->set_font ($self->{font}) if $self->{font};
1069	$self->{layout}->set_width ($self->{w});	1204	$self->{layout}->set_width ($self->{w});
1070	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1071	new_from_layout CFClient::Texture $self->{layout}	1206	new_from_layout CFClient::Texture $self->{layout}
1072	};	1207	};
1073		1208
1074	glEnable GL_BLEND;	1209	glEnable GL_BLEND;
1075	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1100		1235
1101	package CFClient::UI::EntryBase;	1236	package CFClient::UI::EntryBase;
1102		1237
1103	our @ISA = CFClient::UI::Label::;	1238	our @ISA = CFClient::UI::Label::;
1104		1239
1105	use SDL;	1240	use CFClient::OpenGL;
1106	use SDL::OpenGL;
1107		1241
1108	sub new {	1242	sub new {
1109	my $class = shift;	1243	my $class = shift;
1110		1244
1111	$class->SUPER::new (	1245	$class->SUPER::new (
…		…
1114	active_bg => [1, 1, 1, 0.5],	1248	active_bg => [1, 1, 1, 0.5],
1115	active_fg => [0, 0, 0],	1249	active_fg => [0, 0, 0],
1116	can_hover => 1,	1250	can_hover => 1,
1117	can_focus => 1,	1251	can_focus => 1,
1118	valign => 0,	1252	valign => 0,
		1253	can_events => 1,
1119	@_	1254	@_
1120	)	1255	)
1121	}	1256	}
1122		1257
1123	sub _set_text {	1258	sub _set_text {
…		…
1125		1260
1126	delete $self->{cur_h};	1261	delete $self->{cur_h};
1127		1262
1128	return if $self->{text} eq $text;	1263	return if $self->{text} eq $text;
1129		1264
		1265	delete $self->{texture};
		1266
1130	$self->{last_activity} = $::NOW;	1267	$self->{last_activity} = $::NOW;
1131	$self->{text} = $text;	1268	$self->{text} = $text;
1132		1269
1133	$text =~ s/./*/g if $self->{hidden};	1270	$text =~ s/./*/g if $self->{hidden};
1134	$self->{layout}->set_text ("$text ");	1271	$self->{layout}->set_text ("$text ");
…		…
1149	}	1286	}
1150		1287
1151	sub size_allocate {	1288	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1289	my ($self, $w, $h) = @_;
1153		1290
1154	$self->_set_text ($self->{text});	1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155	}	1292	}
1156		1293
1157	sub set_text {	1294	sub set_text {
1158	my ($self, $text) = @_;	1295	my ($self, $text) = @_;
1159		1296
…		…
1163	}	1300	}
1164		1301
1165	sub key_down {	1302	sub key_down {
1166	my ($self, $ev) = @_;	1303	my ($self, $ev) = @_;
1167		1304
1168	my $mod = $ev->key_mod;	1305	my $mod = $ev->{mod};
1169	my $sym = $ev->key_sym;	1306	my $sym = $ev->{sym};
1170
1171	my $uni = $ev->key_unicode;	1307	my $uni = $ev->{unicode};
1172		1308
1173	my $text = $self->get_text;	1309	my $text = $self->get_text;
1174		1310
1175	if ($sym == SDLK_BACKSPACE) {	1311	if ($sym == 8) {
1176	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1312	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177	} elsif ($sym == SDLK_DELETE) {	1313	} elsif ($sym == 127) {
1178	substr $text, $self->{cursor}, 1, "";	1314	substr $text, $self->{cursor}, 1, "";
1179	} elsif ($sym == SDLK_LEFT) {	1315	} elsif ($sym == CFClient::SDLK_LEFT) {
1180	--$self->{cursor} if $self->{cursor};	1316	--$self->{cursor} if $self->{cursor};
1181	} elsif ($sym == SDLK_RIGHT) {	1317	} elsif ($sym == CFClient::SDLK_RIGHT) {
1182	++$self->{cursor} if $self->{cursor} < length $self->{text};	1318	++$self->{cursor} if $self->{cursor} < length $self->{text};
1183	} elsif ($sym == SDLK_HOME) {	1319	} elsif ($sym == CFClient::SDLK_HOME) {
1184	$self->{cursor} = 0;	1320	$self->{cursor} = 0;
1185	} elsif ($sym == SDLK_END) {	1321	} elsif ($sym == CFClient::SDLK_END) {
1186	$self->{cursor} = length $text;	1322	$self->{cursor} = length $text;
1187	} elsif ($sym == SDLK_ESCAPE) {	1323	} elsif ($sym == 27) {
1188	$self->emit ('escape');	1324	$self->emit ('escape');
1189	} elsif ($uni) {	1325	} elsif ($uni) {
1190	substr $text, $self->{cursor}++, 0, chr $uni;	1326	substr $text, $self->{cursor}++, 0, chr $uni;
1191	}	1327	}
1192		1328
…		…
1267		1403
1268	package CFClient::UI::Entry;	1404	package CFClient::UI::Entry;
1269		1405
1270	our @ISA = CFClient::UI::EntryBase::;	1406	our @ISA = CFClient::UI::EntryBase::;
1271		1407
1272	use SDL;	1408	use CFClient::OpenGL;
1273	use SDL::OpenGL;
1274		1409
1275	sub key_down {	1410	sub key_down {
1276	my ($self, $ev) = @_;	1411	my ($self, $ev) = @_;
1277		1412
1278	my $sym = $ev->key_sym;	1413	my $sym = $ev->{sym};
1279		1414
1280	if ($sym == SDLK_RETURN) {	1415	if ($sym == 13) {
1281	$self->emit (activate => $self->get_text);	1416	$self->emit (activate => $self->get_text);
1282	$self->update;	1417	$self->update;
1283		1418
1284	} else {	1419	} else {
1285	$self->SUPER::key_down ($ev);	1420	$self->SUPER::key_down ($ev);
…		…
1291		1426
1292	package CFClient::UI::Button;	1427	package CFClient::UI::Button;
1293		1428
1294	our @ISA = CFClient::UI::Label::;	1429	our @ISA = CFClient::UI::Label::;
1295		1430
1296	use SDL;	1431	use CFClient::OpenGL;
1297	use SDL::OpenGL;
1298		1432
1299	my @tex =	1433	my @tex =
1300	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301	qw(b1_button_active.png);	1435	qw(b1_button_active.png);
1302		1436
1303	sub new {	1437	sub new {
1304	my $class = shift;	1438	my $class = shift;
1305		1439
…		…
1309	bg => [1, 1, 1, 0.2],	1443	bg => [1, 1, 1, 0.2],
1310	active_fg => [0, 0, 1],	1444	active_fg => [0, 0, 1],
1311	can_hover => 1,	1445	can_hover => 1,
1312	align => 0,	1446	align => 0,
1313	valign => 0,	1447	valign => 0,
		1448	can_events => 1,
1314	@_	1449	@_
1315	)	1450	)
1316	}	1451	}
1317		1452
1318	sub button_up {	1453	sub button_up {
…		…
1352	package CFClient::UI::CheckBox;	1487	package CFClient::UI::CheckBox;
1353		1488
1354	our @ISA = CFClient::UI::DrawBG::;	1489	our @ISA = CFClient::UI::DrawBG::;
1355		1490
1356	my @tex =	1491	my @tex =
1357	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1492	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1493	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359		1494
1360	use SDL;	1495	use CFClient::OpenGL;
1361	use SDL::OpenGL;
1362		1496
1363	sub new {	1497	sub new {
1364	my $class = shift;	1498	my $class = shift;
1365		1499
1366	$class->SUPER::new (	1500	$class->SUPER::new (
…		…
1412	glDisable GL_BLEND;	1546	glDisable GL_BLEND;
1413	}	1547	}
1414		1548
1415	#############################################################################	1549	#############################################################################
1416		1550
1417	package CFClient::UI::VGauge;	1551	package CFClient::UI::Image;
1418		1552
1419	our @ISA = CFClient::UI::Base::;	1553	our @ISA = CFClient::UI::Base::;
1420		1554
1421	use SDL::OpenGL;	1555	use CFClient::OpenGL;
		1556	use Carp qw/confess/;
1422		1557
1423	my %tex = (	1558	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		1559
1442	# eg. VGauge->new (gauge => 'food'), default gauge: food
1443	sub new {	1560	sub new {
1444	my $class = shift;	1561	my $class = shift;
1445		1562
1446	my $self = $class->SUPER::new (gauge => 'food', @_);	1563	my $self = $class->SUPER::new (can_events => 0, @_);
		1564
		1565	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1566
		1567	$loaded_images{$self->{image}} ||=
		1568	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1569
		1570	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1571
		1572	Scalar::Util::weaken $loaded_images{$self->{image}};
		1573
		1574	$self->{aspect} = $tex->{w} / $tex->{h};
1447		1575
1448	$self	1576	$self
1449	}	1577	}
1450		1578
1451	sub size_request {	1579	sub size_request {
1452	my ($self) = @_;	1580	my ($self) = @_;
1453		1581
1454	my $tex = $tex{$self->{gauge}}[0];	1582	($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	}	1583	}
1476		1584
1477	sub _draw {	1585	sub _draw {
1478	my ($self) = @_;	1586	my ($self) = @_;
1479		1587
1480	my $tex = $tex{$self->{gauge}};	1588	my $tex = $self->{tex};
1481		1589
1482	my ($w, $h) = ($self->{w}, $self->{h});	1590	my ($w, $h) = ($self->{w}, $self->{h});
1483		1591
1484	my $ycut = $self->{val} / ($self->{max_val} || 1);	1592	if ($self->{rot90}) {
1485	$ycut = 1 if $self->{val} > $self->{max_val};	1593	glRotate 90, 0, 0, 1;
		1594	glTranslate 0, -$self->{w}, 0;
1486		1595
1487	my $t1 = $tex->[0];	1596	($w, $h) = ($h, $w);
1488	my $t2 = $tex->[1];	1597	}
1489		1598
1490	glEnable GL_BLEND;	1599	glEnable GL_BLEND;
1491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1600	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492	glEnable GL_TEXTURE_2D;	1601	glEnable GL_TEXTURE_2D;
1493	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1602	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494		1603
		1604	$tex->draw_quad (0, 0, $w, $h);
		1605
		1606	glDisable GL_BLEND;
		1607	glDisable GL_TEXTURE_2D;
		1608	}
		1609
		1610	#############################################################################
		1611
		1612	package CFClient::UI::VGauge;
		1613
		1614	our @ISA = CFClient::UI::Base::;
		1615
		1616	use List::Util qw(min max);
		1617
		1618	use CFClient::OpenGL;
		1619
		1620	my %tex = (
		1621	food => [
		1622	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1623	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1624	],
		1625	grace => [
		1626	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1627	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1628	],
		1629	hp => [
		1630	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1631	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1632	],
		1633	mana => [
		1634	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1635	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1636	],
		1637	);
		1638
		1639	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1640	sub new {
		1641	my $class = shift;
		1642
		1643	my $self = $class->SUPER::new (
		1644	type => 'food',
		1645	@_
		1646	);
		1647
		1648	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1649
		1650	$self
		1651	}
		1652
		1653	sub size_request {
		1654	my ($self) = @_;
		1655
		1656	#my $tex = $tex{$self->{type}}[0];
		1657	#@$tex{qw(w h)}
		1658	(0, 0)
		1659	}
		1660
		1661	sub set_max {
		1662	my ($self, $max) = @_;
		1663
		1664	$self->{max_val} = $max;
		1665	}
		1666
		1667	sub set_value {
		1668	my ($self, $val, $max) = @_;
		1669
		1670	$self->set_max ($max)
		1671	if defined $max;
		1672
		1673	$max = $self->{max_val};
		1674	$self->{val} = $val;
		1675
		1676	$self->update;
		1677	}
		1678
		1679	sub _draw {
		1680	my ($self) = @_;
		1681
		1682	my $tex = $tex{$self->{type}};
		1683	my ($t1, $t2, $t3) = @$tex;
		1684
		1685	my ($w, $h) = ($self->{w}, $self->{h});
		1686
		1687	if ($self->{vertical}) {
		1688	glRotate 90, 0, 0, 1;
		1689	glTranslate 0, -$self->{w}, 0;
		1690
		1691	($w, $h) = ($h, $w);
		1692	}
		1693
		1694	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1695
		1696	my $ycut1 = max 0, min 1, $ycut;
		1697	my $ycut2 = max 0, min 1, $ycut - 1;
		1698
1495	my $h1 = $self->{h} - $ycut * $self->{h};	1699	my $h1 = $self->{h} * (1 - $ycut1);
1496	my $h2 = $ycut * $self->{h};	1700	my $h2 = $self->{h} * (1 - $ycut2);
1497		1701
1498	my $yp = 0;	1702	glEnable GL_BLEND;
		1703	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1704	glEnable GL_TEXTURE_2D;
		1705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499		1706
1500	glBindTexture GL_TEXTURE_2D, $t1->{name};	1707	glBindTexture GL_TEXTURE_2D, $t1->{name};
1501	glBegin GL_QUADS;	1708	glBegin GL_QUADS;
1502	glTexCoord 0 , 0; glVertex 0 , $yp;	1709	glTexCoord 0 , 0; glVertex 0 , 0;
1503	glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;	1710	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;	1711	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505	glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;	1712	glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506	glEnd;	1713	glEnd;
1507		1714
1508	$yp += $h1;	1715	my $ycut1 = List::Util::min 1, $ycut;
1509
1510	glBindTexture GL_TEXTURE_2D, $t2->{name};	1716	glBindTexture GL_TEXTURE_2D, $t2->{name};
1511	glBegin GL_QUADS;	1717	glBegin GL_QUADS;
1512	glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;	1718	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513	glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;	1719	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;	1720	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1721	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516	glEnd;	1722	glEnd;
		1723
		1724	if ($t3) {
		1725	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1726	glBegin GL_QUADS;
		1727	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1728	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1729	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1730	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1731	glEnd;
		1732	}
1517		1733
1518	glDisable GL_BLEND;	1734	glDisable GL_BLEND;
1519	glDisable GL_TEXTURE_2D;	1735	glDisable GL_TEXTURE_2D;
1520	}	1736	}
1521		1737
1522	#############################################################################	1738	#############################################################################
1523		1739
		1740	package CFClient::UI::Gauge;
		1741
		1742	our @ISA = CFClient::UI::VBox::;
		1743
		1744	sub new {
		1745	my ($class, %arg) = @_;
		1746
		1747	my $self = $class->SUPER::new (
		1748	tooltip => $arg{type},
		1749	%arg,
		1750	);
		1751
		1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);
		1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);
		1755
		1756	$self
		1757	}
		1758
		1759	sub set_fontsize {
		1760	my ($self, $fsize) = @_;
		1761
		1762	$self->{value}->set_fontsize ($fsize);
		1763	$self->{max} ->set_fontsize ($fsize);
		1764	}
		1765
		1766	sub set_value {
		1767	my ($self, $val, $max) = @_;
		1768
		1769	$self->set_max ($max)
		1770	if defined $max;
		1771
		1772	$self->{gauge}->set_value ($val, $max);
		1773	$self->{value}->set_text ($val);
		1774	}
		1775
		1776	sub set_max {
		1777	my ($self, $max) = @_;
		1778
		1779	$self->{gauge}->set_max ($max);
		1780	$self->{max}->set_text ($max);
		1781	}
		1782
		1783	#############################################################################
		1784
1524	package CFClient::UI::Slider;	1785	package CFClient::UI::Slider;
1525		1786
1526	use strict;	1787	use strict;
1527		1788
1528	use SDL::OpenGL;	1789	use CFClient::OpenGL;
1529		1790
1530	our @ISA = CFClient::UI::DrawBG::;	1791	our @ISA = CFClient::UI::DrawBG::;
1531		1792
1532	my @tex =	1793	my @tex =
1533	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1794	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1543	# TODO: calculations are off	1804	# TODO: calculations are off
1544	my $self = $class->SUPER::new (	1805	my $self = $class->SUPER::new (
1545	fg => [1, 1, 1],	1806	fg => [1, 1, 1],
1546	active_fg => [0, 0, 0],	1807	active_fg => [0, 0, 0],
1547	range => [0, 0, 100, 10],	1808	range => [0, 0, 100, 10],
1548	req_w => 40,	1809	req_w => 20,
1549	req_h => 13,	1810	req_h => 20,
1550	vertical => 0,	1811	vertical => 0,
1551	can_hover => 1,	1812	can_hover => 1,
1552	inner_pad => 5,	1813	inner_pad => 5,
1553	@_	1814	@_
1554	);	1815	);
…		…
1658		1919
1659	package CFClient::UI::TextView;	1920	package CFClient::UI::TextView;
1660		1921
1661	our @ISA = CFClient::UI::HBox::;	1922	our @ISA = CFClient::UI::HBox::;
1662		1923
1663	use SDL::OpenGL;	1924	use CFClient::OpenGL;
1664		1925
1665	sub new {	1926	sub new {
1666	my $class = shift;	1927	my $class = shift;
1667		1928
1668	my $self = $class->SUPER::new (	1929	my $self = $class->SUPER::new (
1669	req_w => $::WIDTH / 6,
1670	req_h => $::HEIGHT / 6,
1671	fontsize => $::FONTSIZE,	1930	fontsize => 1,
		1931	#font => default_font
1672	@_,	1932	@_,
1673		1933
1674	layout => (new CFClient::Layout),	1934	layout => (new CFClient::Layout),
1675	par => [],	1935	par => [],
1676	height => 0,	1936	height => 0,
…		…
1697	sub text_height {	1957	sub text_height {
1698	my ($self, $text) = @_;	1958	my ($self, $text) = @_;
1699		1959
1700	my $layout = $self->{layout};	1960	my $layout = $self->{layout};
1701		1961
1702	$layout->set_height ($self->{fontsize});	1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703	$layout->set_width ($self->{w});	1963	$layout->set_width ($self->{w});
1704	$layout->set_text ($text);	1964	$layout->set_text ($text);
1705		1965
1706	($layout->size)[1]	1966	($layout->size)[1]
1707	}	1967	}
…		…
1711		1971
1712	$self->{need_reflow}++;	1972	$self->{need_reflow}++;
1713	$self->update;	1973	$self->update;
1714	}	1974	}
1715		1975
1716	sub size_request {
1717	my ($self) = @_;
1718
1719	($self->{req_w}, $self->{req_h})
1720	}
1721
1722	sub size_allocate {	1976	sub size_allocate {
1723	my ($self, $w, $h) = @_;	1977	my ($self, $w, $h) = @_;
1724		1978
		1979	$self->SUPER::size_allocate ($w, $h);
		1980
		1981	$self->{layout}->set_font ($self->{font}) if $self->{font};
1725	$self->{layout}->set_height ($self->{fontsize});	1982	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726	$self->{layout}->set_width ($self->{w});	1983	$self->{layout}->set_width ($self->{children}[0]{w});
1727		1984
1728	$self->reflow;	1985	$self->reflow;
1729	$self->update;
1730	}	1986	}
1731		1987
1732	sub add_paragraph {	1988	sub add_paragraph {
1733	my ($self, $color, $text) = @_;	1989	my ($self, $color, $text) = @_;
1734		1990
…		…
1782	my $y1 = $top + $self->{h};	2038	my $y1 = $top + $self->{h};
1783		2039
1784	my $y = 0;	2040	my $y = 0;
1785		2041
1786	my $layout = $self->{layout};	2042	my $layout = $self->{layout};
		2043
		2044	$layout->set_font ($self->{font}) if $self->{font};
1787		2045
1788	for my $par (@{$self->{par}}) {	2046	for my $par (@{$self->{par}}) {
1789	my $h = $par->[0];	2047	my $h = $par->[0];
1790		2048
1791	if ($y0 < $y + $h && $y < $y1) {	2049	if ($y0 < $y + $h && $y < $y1) {
…		…
1819		2077
1820	}	2078	}
1821		2079
1822	#############################################################################	2080	#############################################################################
1823		2081
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;	2082	package CFClient::UI::Animator;
2061		2083
2062	use SDL::OpenGL;	2084	use CFClient::OpenGL;
2063		2085
2064	our @ISA = CFClient::UI::Bin::;	2086	our @ISA = CFClient::UI::Bin::;
2065		2087
2066	sub moveto {	2088	sub moveto {
2067	my ($self, $x, $y) = @_;	2089	my ($self, $x, $y) = @_;
…		…
2107	my $class = shift;	2129	my $class = shift;
2108		2130
2109	my $self = $class->SUPER::new (	2131	my $self = $class->SUPER::new (
2110	state => 0,	2132	state => 0,
2111	connect_activate => \&toggle_flopper,	2133	connect_activate => \&toggle_flopper,
		2134	can_events => 1,
2112	@_	2135	@_
2113	);	2136	);
2114		2137
2115	if ($self->{state}) {	2138	if ($self->{state}) {
2116	$self->{state} = 0;	2139	$self->{state} = 0;
…		…
2136	$self->emit (changed => $self->{state});	2159	$self->emit (changed => $self->{state});
2137	}	2160	}
2138		2161
2139	#############################################################################	2162	#############################################################################
2140		2163
		2164	package CFClient::UI::Tooltip;
		2165
		2166	our @ISA = CFClient::UI::Bin::;
		2167
		2168	use CFClient::OpenGL;
		2169
		2170	sub new {
		2171	my $class = shift;
		2172
		2173	$class->SUPER::new (
		2174	@_,
		2175	can_events => 0,
		2176	)
		2177	}
		2178
		2179	sub set_text {
		2180	my ($self, $text) = @_;
		2181
		2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2183	$self->{label}->set_text ($text);
		2184	$self->add ($self->{label});
		2185	}
		2186
		2187	sub size_request {
		2188	my ($self) = @_;
		2189
		2190	$self->child->set_max_size ($::WIDTH * 0.2);
		2191
		2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2193
		2194	($w + 4, $h + 4)
		2195	}
		2196
		2197	sub _draw {
		2198	my ($self) = @_;
		2199
		2200	glPushMatrix;
		2201	glTranslate 0.375, 0.375;
		2202
		2203	my ($w, $h) = @$self{qw(w h)};
		2204
		2205	glColor 1, 0.8, 0.4;
		2206	glBegin GL_QUADS;
		2207	glVertex 0 , 0;
		2208	glVertex 0 , $h;
		2209	glVertex $w, $h;
		2210	glVertex $w, 0;
		2211	glEnd;
		2212
		2213	glColor 0, 0, 0;
		2214	glBegin GL_LINE_LOOP;
		2215	glVertex 0 , 0;
		2216	glVertex 0 , $h;
		2217	glVertex $w, $h;
		2218	glVertex $w, 0;
		2219	glEnd;
		2220
		2221	glPopMatrix;
		2222
		2223	glTranslate 2, 2;
		2224	$self->SUPER::_draw;
		2225	}
		2226
		2227	#############################################################################
		2228
2141	package CFClient::UI::Root;	2229	package CFClient::UI::Root;
2142		2230
2143	our @ISA = CFClient::UI::Container::;	2231	our @ISA = CFClient::UI::Container::;
2144		2232
2145	use SDL::OpenGL;	2233	use CFClient::OpenGL;
2146		2234
2147	sub check_size {	2235	sub check_size {
2148	my ($self) = @_;	2236	my ($self) = @_;
2149		2237
2150	$self->configure (0, 0, $::WITH, $::HEIGHT);	2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
2151	}	2239	}
2152		2240
2153	sub size_request {	2241	sub size_request {
2154	($::WIDTH, $::HEIGHT)	2242	($::WIDTH, $::HEIGHT)
2155	}	2243	}
…		…
2157	sub configure {	2245	sub configure {
2158	my ($self, $x, $y, $w, $h) = @_;	2246	my ($self, $x, $y, $w, $h) = @_;
2159		2247
2160	$self->SUPER::configure ($x, $y, $w, $h);	2248	$self->SUPER::configure ($x, $y, $w, $h);
2161		2249
2162	$_->configure ($_->{x}, $_->{y}, $_->size_request)
2163	for @{$self->{children}};	2250	for my $child (@{$self->{children}}) {
		2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2252
		2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2255	$child->configure ($X, $Y, $W,$H);
		2256	}
2164	}	2257	}
2165		2258
2166	sub _topleft {	2259	sub _topleft {
2167	my ($self, $x, $y) = @_;	2260	my ($self, $x, $y) = @_;
2168		2261
…		…
2176	::refresh ();	2269	::refresh ();
2177	}	2270	}
2178		2271
2179	sub add {	2272	sub add {
2180	my ($self, $child) = @_;	2273	my ($self, $child) = @_;
		2274
		2275	# integerize window positions
		2276	$child->{x} = int $child->{x};
		2277	$child->{y} = int $child->{y};
2181		2278
2182	$self->SUPER::add ($child);	2279	$self->SUPER::add ($child);
2183	}	2280	}
2184		2281
2185	sub on_refresh {	2282	sub on_refresh {
…		…
2211	#############################################################################	2308	#############################################################################
2212		2309
2213	package CFClient::UI;	2310	package CFClient::UI;
2214		2311
2215	$ROOT = new CFClient::UI::Root;	2312	$ROOT = new CFClient::UI::Root;
		2313	$TOOLTIP = new CFClient::UI::Tooltip;
2216		2314
2217	1	2315	1
2218		2316

Diff Legend

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