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.78 by root, Tue Apr 11 22:49:13 2006 UTC vs.
Revision 1.162 by root, Mon Apr 24 06:05:35 2006 UTC

…		…
7		7
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 $TOPLEVEL;	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_markup ($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 = $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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;	97	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER;	98	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		99
		100	check_tooltip;
		101	}
		102
70	$HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;	103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
		104	}
		105
		106	# convert position array to integers
		107	sub harmonize {
		108	my ($vals) = @_;
		109
		110	my $rem = 0;
		111
		112	for (@$vals) {
		113	my $i = int $_ + $rem;
		114	$rem += $_ - $i;
		115	$_ = $i;
		116	}
71	}	117	}
72		118
73	#############################################################################	119	#############################################################################
74		120
75	package CFClient::UI::Base;	121	package CFClient::UI::Base;
76		122
77	use strict;	123	use strict;
78		124
79	use SDL::OpenGL;	125	use CFClient::OpenGL;
80		126
81	sub new {	127	sub new {
82	my $class = shift;	128	my $class = shift;
83		129
84	bless {	130	my $self = bless {
85	x => 0,	131	x => 0,
86	y => 0,	132	y => 0,
87	z => 0,	133	z => 0,
88	w => -1,	134	can_events => 1,
89	h => -1,
90	@_	135	@_
91	}, $class	136	}, $class;
		137
		138	for (keys %$self) {
		139	if (/^connect_(.*)$/) {
		140	$self->connect ($1 => delete $self->{$_});
		141	}
		142	}
		143
		144	$self
		145	}
		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);
92	}	168	}
93		169
94	sub move {	170	sub move {
95	my ($self, $x, $y, $z) = @_;	171	my ($self, $x, $y, $z) = @_;
		172
96	$self->{x} = $x;	173	$self->{x} = int $x;
97	$self->{y} = $y;	174	$self->{y} = int $y;
98	$self->{z} = $z if defined $z;	175	$self->{z} = $z if defined $z;
99	}
100		176
101	sub needs_redraw {	177	$self->update;
102	0	178	}
		179
		180	sub set_size {
		181	my ($self, $w, $h) = @_;
		182
		183	$self->{user_w} = $w;
		184	$self->{user_h} = $h;
		185
		186	$self->check_size;
103	}	187	}
104		188
105	sub size_request {	189	sub size_request {
106	require Carp;	190	require Carp;
107	Carp::confess "size_request is abtract";	191	Carp::confess "size_request is abstract";
108	}	192	}
109		193
110	sub _size_allocate {	194	sub configure {
111	my ($self, $x, $y, $w, $h) = @_;	195	my ($self, $x, $y, $w, $h) = @_;
112		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) {
113	$self->{x} = $x;	210	$self->{x} = $x;
114	$self->{y} = $y;	211	$self->{y} = $y;
		212	$self->update;
		213	}
115		214
116	return unless $self->{w} != $w || $self->{h} != $h;	215	if ($self->{w} != $w || $self->{h} != $h) {
117
118	$self->{w} = $w;	216	$self->{w} = $w;
119	$self->{h} = $h;	217	$self->{h} = $h;
120		218
		219	$self->size_allocate ($w, $h);
		220	$self->update;
121	1	221	}
122	}	222	}
123		223
124	sub size_allocate {	224	sub size_allocate {
		225	# nothing to be done
		226	}
		227
		228	sub set_max_size {
125	my ($self, $x, $y, $w, $h) = @_;	229	my ($self, $w, $h) = @_;
126		230
127	$self->_size_allocate ($x, $y, $w, $h);	231	delete $self->{max_w}; $self->{max_w} = $w if $w;
		232	delete $self->{max_h}; $self->{max_h} = $h if $h;
128	}	233	}
129		234
130	# translate global koordinates to local coordinate system	235	# return top left coordinates
131	sub translate {	236	sub _topleft {
132	my ($self, $x, $y) = @_;	237	my ($self, $x, $y) = @_;
133		238
134	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});	239	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
		240	}
		241
		242	# translate global coordinates to local coordinate system
		243	sub coord2local {
		244	my ($self, $x, $y) = @_;
		245
		246	my ($X, $Y) = $self->_topleft;
		247	($x - $X, $y - $Y)
		248	}
		249
		250	# translate local coordinates to global coordinate system
		251	sub coord2global {
		252	my ($self, $x, $y) = @_;
		253
		254	my ($X, $Y) = $self->_topleft;
		255	($x + $X, $y + $Y)
135	}	256	}
136		257
137	sub focus_in {	258	sub focus_in {
138	my ($self) = @_;	259	my ($self) = @_;
139		260
140	return if $FOCUS == $self;	261	return if $FOCUS == $self;
		262	return unless $self->{can_focus};
141		263
142	my $focus = $FOCUS; $FOCUS = $self;	264	my $focus = $FOCUS; $FOCUS = $self;
		265
		266	$self->emit (focus_in => $focus);
		267
143	$focus->update if $focus;	268	$focus->update if $focus;
144	$FOCUS->update;	269	$FOCUS->update;
145	}	270	}
146		271
147	sub focus_out {	272	sub focus_out {
148	my ($self) = @_;	273	my ($self) = @_;
149		274
150	return unless $FOCUS == $self;	275	return unless $FOCUS == $self;
151		276
152	my $focus = $FOCUS; undef $FOCUS;	277	my $focus = $FOCUS; undef $FOCUS;
		278
		279	$self->emit (focus_out => $focus);
		280
153	$focus->update if $focus; #?	281	$focus->update if $focus; #?
154	}	282	}
155		283
156	sub mouse_motion { }	284	sub mouse_motion { }
157	sub button_up { }	285	sub button_up { }
…		…
178	glPushMatrix;	306	glPushMatrix;
179	glTranslate $self->{x}, $self->{y}, 0;	307	glTranslate $self->{x}, $self->{y}, 0;
180	$self->_draw;	308	$self->_draw;
181	glPopMatrix;	309	glPopMatrix;
182		310
183	if ($self == $HOVER) {	311	if ($self == $HOVER && $self->{can_hover}) {
184	my ($x, $y) = @$self{qw(x y)};	312	my ($x, $y) = @$self{qw(x y)};
185		313
186	glColor 0, 0, 1, 0.2;	314	glColor 1, 0.8, 0.5, 0.2;
187	glEnable GL_BLEND;	315	glEnable GL_BLEND;
188	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	316	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
189	glBegin GL_QUADS;	317	glBegin GL_QUADS;
190	glVertex $x , $y;	318	glVertex $x , $y;
191	glVertex $x + $self->{w}, $y;	319	glVertex $x + $self->{w}, $y;
192	glVertex $x + $self->{w}, $y + $self->{h};	320	glVertex $x + $self->{w}, $y + $self->{h};
193	glVertex $x , $y + $self->{h};	321	glVertex $x , $y + $self->{h};
194	glEnd;	322	glEnd;
195	glDisable GL_BLEND;	323	glDisable GL_BLEND;
196	}	324	}
		325
		326	if ($ENV{PCLIENT_DEBUG}) {
		327	glPushMatrix;
		328	glColor 1, 1, 0, 1;
		329	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		330	glBegin GL_LINE_LOOP;
		331	glVertex 0 , 0;
		332	glVertex $self->{w}, 0;
		333	glVertex $self->{w}, $self->{h};
		334	glVertex 0 , $self->{h};
		335	glEnd;
		336	glPopMatrix;
		337	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		338	}
197	}	339	}
198		340
199	sub _draw {	341	sub _draw {
200	my ($self) = @_;	342	my ($self) = @_;
201		343
202	warn "no draw defined for $self\n";	344	warn "no draw defined for $self\n";
203	}	345	}
204		346
205	sub find_widget {	347	sub find_widget {
206	my ($self, $x, $y) = @_;	348	my ($self, $x, $y) = @_;
		349
		350	return () unless $self->{can_events};
207		351
208	return $self	352	return $self
209	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	353	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
210	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	354	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
211		355
212	()	356	()
213	}	357	}
214		358
215	sub set_parent {	359	sub set_parent {
216	my ($self, $par) = @_;	360	my ($self, $parent) = @_;
217		361
218	$self->{parent} = $par;
219	Scalar::Util::weaken $self->{parent};	362	Scalar::Util::weaken ($self->{parent} = $parent);
220	}	363	}
221		364
222	sub get_parent {	365	sub check_size {
		366	my ($self) = @_;
		367
223	$_[0]->{parent}	368	$self->{parent}
		369	or return 1;
		370
		371	my ($w, $h) = $self->{user_w} && $self->{user_h}
		372	? @$self{qw(user_w user_h)}
		373	: $self->size_request;
		374
		375	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		376	$self->{req_w} = $w;
		377	$self->{req_h} = $h;
		378
		379	$self->{parent}->check_size
		380	or $self->size_allocate (
		381	(List::Util::max $self->{w}, $w),
		382	(List::Util::max $self->{h}, $h),
		383	);
		384
		385	1
		386	} else {
		387	0
		388	}
224	}	389	}
225		390
226	sub update {	391	sub update {
227	my ($self) = @_;	392	my ($self) = @_;
228		393
…		…
231	}	396	}
232		397
233	sub connect {	398	sub connect {
234	my ($self, $signal, $cb) = @_;	399	my ($self, $signal, $cb) = @_;
235		400
236	push @{ $self->{cb}{$signal} }, $cb;	401	push @{ $self->{signal_cb}{$signal} }, $cb;
237	}	402	}
238		403
239	sub emit {	404	sub emit {
240	my ($self, $signal, @args) = @_;	405	my ($self, $signal, @args) = @_;
241		406
		407	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
242	$_->($self, @args)	408	$cb->($self, @args);
243	for @{$self->{cb}{$signal} || []};	409	}
244	}	410	}
245		411
246	sub DESTROY {	412	sub DESTROY {
247	my ($self) = @_;	413	my ($self) = @_;
248		414
…		…
254	package CFClient::UI::DrawBG;	420	package CFClient::UI::DrawBG;
255		421
256	our @ISA = CFClient::UI::Base::;	422	our @ISA = CFClient::UI::Base::;
257		423
258	use strict;	424	use strict;
259	use SDL::OpenGL;	425	use CFClient::OpenGL;
260		426
261	sub new {	427	sub new {
262	my $class = shift;	428	my $class = shift;
263		429
264	# range [value, low, high, page]	430	# range [value, low, high, page]
265		431
266	$class->SUPER::new (	432	$class->SUPER::new (
267	bg => [0, 0, 0, 0.2],	433	bg => [0, 0, 0, 0.2],
268	active_bg => [1, 1, 1],	434	active_bg => [1, 1, 1, 0.5],
269	@_	435	@_
270	)	436	)
271	}	437	}
272		438
273	sub _draw {	439	sub _draw {
…		…
293		459
294	package CFClient::UI::Empty;	460	package CFClient::UI::Empty;
295		461
296	our @ISA = CFClient::UI::Base::;	462	our @ISA = CFClient::UI::Base::;
297		463
		464	sub new {
		465	my ($class, %arg) = @_;
		466	$class->SUPER::new (can_events => 0, %arg);
		467	}
		468
298	sub size_request {	469	sub size_request {
299	(0, 0)	470	(0, 0)
300	}	471	}
301		472
302	sub draw { }	473	sub draw { }
…		…
310	sub new {	481	sub new {
311	my ($class, %arg) = @_;	482	my ($class, %arg) = @_;
312		483
313	my $children = delete $arg{children} || [];	484	my $children = delete $arg{children} || [];
314		485
315	my $self = $class->SUPER::new (children => [], %arg);	486	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
316	$self->add ($_) for @$children;	487	$self->add ($_) for @$children;
317		488
318	$self	489	$self
319	}	490	}
320		491
321	sub add {	492	sub add {
322	my ($self, $chld) = @_;	493	my ($self, $child) = @_;
323		494
324	$chld->set_parent ($self);	495	$child->set_parent ($self);
		496
		497	use sort 'stable';
325		498
326	$self->{children} = [	499	$self->{children} = [
327	sort { $a->{z} <=> $b->{z} }	500	sort { $a->{z} <=> $b->{z} }
328	@{$self->{children}}, $chld	501	@{$self->{children}}, $child
329	];	502	];
330		503
331	$self->{w} = $self->{h} = -1;	504	$child->check_size;
		505	}
		506
		507	sub remove {
		508	my ($self, $child) = @_;
		509
		510	delete $child->{parent};
		511
		512	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		513
		514	$self->check_size;
332	$self->update;	515	$self->update;
333	}	516	}
334		517
335	sub remove {	518	sub clear {
336	my ($self, $widget) = @_;	519	my ($self) = @_;
337		520
338	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	521	delete $_->{parent}
		522	for @{ delete $self->{children} };
339		523
340	$self->size_allocate (0, 0, $self->{w}, $self->{h});	524	$self->{children} = [];
341	}	525	}
342		526
343	sub find_widget {	527	sub find_widget {
344	my ($self, $x, $y) = @_;	528	my ($self, $x, $y) = @_;
345		529
…		…
375		559
376	$class->SUPER::new (children => [$child], %arg)	560	$class->SUPER::new (children => [$child], %arg)
377	}	561	}
378		562
379	sub add {	563	sub add {
380	my ($self, $widget) = @_;	564	my ($self, $child) = @_;
381		565
382	$self->{children} = [];	566	$self->{children} = [];
383		567
384	$self->SUPER::add ($widget);	568	$self->SUPER::add ($child);
385	}	569	}
386		570
387	sub remove {	571	sub remove {
388	my ($self, $widget) = @_;	572	my ($self, $widget) = @_;
389		573
…		…
398	sub size_request {	582	sub size_request {
399	$_[0]{children}[0]->size_request	583	$_[0]{children}[0]->size_request
400	}	584	}
401		585
402	sub size_allocate {	586	sub size_allocate {
403	my ($self, $x, $y, $w, $h) = @_;	587	my ($self, $w, $h) = @_;
404		588
405	$self->_size_allocate ($x, $y, $w, $h) or return;
406
407	$self->{children}[0]->size_allocate (0, 0, $w, $h);	589	$self->{children}[0]->configure (0, 0, $w, $h);
408	}	590	}
409		591
410	#############################################################################	592	#############################################################################
411		593
412	package CFClient::UI::Window;	594	package CFClient::UI::Window;
413		595
414	our @ISA = CFClient::UI::Bin::;	596	our @ISA = CFClient::UI::Bin::;
415		597
416	use SDL::OpenGL;	598	use CFClient::OpenGL;
417		599
418	sub new {	600	sub new {
419	my ($class, %arg) = @_;	601	my ($class, %arg) = @_;
420		602
421	my $self = $class->SUPER::new (%arg);	603	my $self = $class->SUPER::new (%arg);
…		…
430	}	612	}
431		613
432	sub render_chld {	614	sub render_chld {
433	my ($self) = @_;	615	my ($self) = @_;
434		616
435	$self->{texture} =	617	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
436	CFClient::Texture->new_from_opengl (	618	glClearColor 0, 0, 0, 1;
437	$self->{w}, $self->{h}, sub { $self->child->draw }	619	glClear GL_COLOR_BUFFER_BIT;
438	);	620	$self->child->draw;
		621	};
439	}	622	}
440		623
441	sub size_allocate {	624	sub size_allocate {
442	my ($self, $x, $y, $w, $h) = @_;	625	my ($self, $w, $h) = @_;
443		626
444	$self->_size_allocate ($x, $y, $w, $h) or return;
445
446	$self->child->size_allocate (0, 0, $w, $h);	627	$self->child->configure (0, 0, $w, $h);
447		628
448	$self->render_chld;	629	$self->render_chld;
449	}	630	}
450		631
451	sub _draw {	632	sub _draw {
…		…
467	glDisable GL_TEXTURE_2D;	648	glDisable GL_TEXTURE_2D;
468	}	649	}
469		650
470	#############################################################################	651	#############################################################################
471		652
		653	package CFClient::UI::ViewPort;
		654
		655	our @ISA = CFClient::UI::Window::;
		656
		657	sub new { die }
		658
		659	sub size_request {
		660	my ($self) = @_;
		661
		662	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		663	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
		664
		665	@$self{qw(child_w child_h)}
		666	}
		667
		668	sub _draw {
		669	my ($self) = @_;
		670
		671	$self->{children}[1]->draw;
		672	}
		673
		674
		675	#############################################################################
		676
472	package CFClient::UI::Frame;	677	package CFClient::UI::Frame;
473		678
474	our @ISA = CFClient::UI::Bin::;	679	our @ISA = CFClient::UI::Bin::;
475		680
476	use SDL::OpenGL;	681	use CFClient::OpenGL;
477		682
478	sub size_request {	683	sub new {
479	my ($self) = @_;	684	my $class = shift;
480	my $chld = $self->child
481	or return (0, 0);
482		685
483	$chld->move (2, 2);	686	my $self = $class->SUPER::new (
484		687	bg => [1, 1, 1, 1],
485	map { $_ + 4 } $chld->size_request;	688	border_bg => [1, 1, 1, 1],
486	}	689	border => 0.8,
487		690	@_
488	sub size_allocate {
489	my ($self, $x, $y, $w, $h) = @_;
490		691	);
491	$self->_size_allocate ($x, $y, $w, $h) or return;
492		692
493	$self->child->size_allocate (2, 2, $w - 4, $h - 4);	693	$self
494	}	694	}
495		695
496	sub _draw {	696	sub _draw {
497	my ($self) = @_;	697	my ($self) = @_;
498		698
499	my $chld = $self->child;
500
501	my ($w, $h) = $chld->size_request;
502
503	glBegin GL_QUADS;
504	glColor 0, 0, 0;
505	glVertex 0 , 0;
506	glVertex 0 , $h + 4;
507	glVertex $w + 4 , $h + 4;
508	glVertex $w + 4 , 0;
509	glEnd;
510
511	$chld->draw;
512	}
513
514	#############################################################################
515
516	package CFClient::UI::FancyFrame;
517
518	our @ISA = CFClient::UI::Bin::;
519
520	use SDL::OpenGL;
521
522	my @tex =
523	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
524	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
525
526	sub size_request {
527	my ($self) = @_;
528
529	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
530
531	my ($w, $h) = $self->SUPER::size_request;
532
533	$h += $tex[1]->{h};
534	$h += $tex[4]->{h};
535	$w += $tex[2]->{w};
536	$w += $tex[3]->{w};
537
538	($w, $h)
539	}
540
541	sub size_allocate {
542	my ($self, $x, $y, $w, $h) = @_;
543
544	$self->_size_allocate ($x, $y, $w, $h) or return;
545
546	$h -= $tex[1]{h};
547	$h -= $tex[4]{h};
548	$w -= $tex[2]{w};
549	$w -= $tex[3]{w};
550
551	$h = $h < 0 ? 0 : $h;
552	$w = $w < 0 ? 0 : $w;
553
554	my $child = $self->child;
555
556	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
557	}
558
559	sub button_down {
560	my ($self, $ev, $x, $y) = @_;
561
562	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
563	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
564
565	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
566	my ($bw, $bh) = ($self->{w}, $self->{h});
567
568	$self->{motion} = sub {
569	my ($ev, $x, $y) = @_;
570
571	($x, $y) = ($ev->motion_x, $ev->motion_y);
572
573	$self->{user_w} = $bw + $x - $ox;
574	$self->{user_h} = $bh + $y - $oy;
575	$self->update;
576	};
577
578	} elsif ($x >= 0 && $x < $self->{w}
579	&& $y >= 0 && $y < $tex[1]{h}) {
580
581	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
582	my ($bx, $by) = ($self->{x}, $self->{y});
583
584	$self->{motion} = sub {
585	my ($ev, $x, $y) = @_;
586
587	($x, $y) = ($ev->motion_x, $ev->motion_y);
588
589	$self->move ($bx + $x - $ox, $by + $y - $oy);
590	$self->update;
591	};
592	}
593	}
594
595	sub button_up {
596	my ($self, $ev, $x, $y) = @_;
597
598	delete $self->{motion};
599	}
600
601	sub mouse_motion {
602	my ($self, $ev, $x, $y) = @_;
603
604	$self->{motion}->($ev, $x, $y) if $self->{motion};
605	}
606
607	sub _draw {
608	my ($self) = @_;
609
610	my ($w, $h) = ($self->{w}, $self->{h});	699	my ($w, $h) = ($self->{w}, $self->{h});
611	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
612		700
613	glEnable GL_BLEND;	701	glEnable GL_BLEND;
614	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	702	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
615	glEnable GL_TEXTURE_2D;	703	glEnable GL_TEXTURE_2D;
616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
617		705
618	my $top = $tex[1];	706	# glBegin GL_QUADS;
		707	# glColor 0, 0, 0, 0;
		708	# glVertex 0 , 0;
		709	# glVertex 0 , $h;
		710	# glVertex $w, $h;
		711	# glVertex $w, 0;
		712	# glEnd;
		713
		714
		715	$self->child->draw;
		716	glDisable GL_BLEND;
		717	glDisable GL_TEXTURE_2D;
		718	}
		719
		720	#############################################################################
		721
		722	package CFClient::UI::FancyFrame;
		723
		724	our @ISA = CFClient::UI::Bin::;
		725
		726	use CFClient::OpenGL;
		727
		728	my @tex =
		729	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		730	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		731
		732	sub new {
		733	my $class = shift;
		734
		735	# TODO: user_x, user_y, overwrite moveto?
		736
		737	my $self = $class->SUPER::new (
		738	bg => [1, 1, 1, 1],
		739	border_bg => [1, 1, 1, 1],
		740	border => 0.8,
		741	can_events => 1,
		742	@_
		743	);
		744
		745	$self->{title} &&= new CFClient::UI::Label
		746	align => 0,
		747	valign => 1,
		748	text => $self->{title},
		749	fontsize => 1;
		750
		751	$self
		752	}
		753
		754	sub border {
		755	int $_[0]{border} * $::FONTSIZE
		756	}
		757
		758	sub size_request {
		759	my ($self) = @_;
		760
		761	my ($w, $h) = $self->SUPER::size_request;
		762
		763	(
		764	$w + $self->border * 2,
		765	$h + $self->border * 2,
		766	)
		767	}
		768
		769	sub size_allocate {
		770	my ($self, $w, $h) = @_;
		771
		772	$h -= List::Util::max 0, $self->border * 2;
		773	$w -= List::Util::max 0, $self->border * 2;
		774
		775	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		776	if $self->{title};
		777
		778	$self->child->configure ($self->border, $self->border, $w, $h);
		779	}
		780
		781	sub button_down {
		782	my ($self, $ev, $x, $y) = @_;
		783
		784	my $border = $self->border;
		785
		786	if ($x < $self->{w} && $x >= $self->{w} - $border
		787	&& $y < $self->{h} && $y >= $self->{h} - $border) {
		788
		789	my ($ox, $oy) = ($ev->{x}, $ev->{y});
		790	my ($bw, $bh) = ($self->{w}, $self->{h});
		791
		792	$self->{motion} = sub {
		793	my ($ev, $x, $y) = @_;
		794
		795	($x, $y) = ($ev->{x}, $ev->{y});
		796
		797	$self->{user_w} = $bw + $x - $ox;
		798	$self->{user_h} = $bh + $y - $oy;
		799	$self->check_size;
		800	};
		801
		802	} elsif ($x >= 0 && $x < $self->{w}
		803	&& $y >= 0 && $y < $border) {
		804
		805	my ($ox, $oy) = ($ev->{x}, $ev->{y});
		806	my ($bx, $by) = ($self->{x}, $self->{y});
		807
		808	$self->{motion} = sub {
		809	my ($ev, $x, $y) = @_;
		810
		811	($x, $y) = ($ev->{x}, $ev->{y});
		812
		813	$self->move ($bx + $x - $ox, $by + $y - $oy);
		814	$self->update;
		815	};
		816	}
		817	}
		818
		819	sub button_up {
		820	my ($self, $ev, $x, $y) = @_;
		821
		822	delete $self->{motion};
		823	}
		824
		825	sub mouse_motion {
		826	my ($self, $ev, $x, $y) = @_;
		827
		828	$self->{motion}->($ev, $x, $y) if $self->{motion};
		829	}
		830
		831	sub _draw {
		832	my ($self) = @_;
		833
		834	my ($w, $h ) = ($self->{w}, $self->{h});
		835	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		836
		837	glEnable GL_BLEND;
		838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		839	glEnable GL_TEXTURE_2D;
		840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		841
		842	my $border = $self->border;
		843
		844	glColor @{ $self->{border_bg} };
619	$top->draw_quad (0, 0, $w, $top->{h});	845	$tex[1]->draw_quad (0, 0, $w, $border);
620		846	$tex[3]->draw_quad (0, $border, $border, $ch);
621	my $left = $tex[3];	847	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
622	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);	848	$tex[4]->draw_quad (0, $h - $border, $w, $border);
623
624	my $right = $tex[2];
625	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
626
627	my $bottom = $tex[4];
628	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
629		849
630	my $bg = $tex[0];	850	my $bg = $tex[0];
631		851
632	glBindTexture GL_TEXTURE_2D, $bg->{name};	852	# TODO: repeat texture not scale
633	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
634	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
635	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
636
637	my $rep_x = $cw / $bg->{w};	853	my $rep_x = $cw / $bg->{w};
638	my $rep_y = $ch / $bg->{h};	854	my $rep_y = $ch / $bg->{h};
639		855
640	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);	856	glColor @{ $self->{bg} };
		857
		858	$bg->{s} = $rep_x;
		859	$bg->{t} = $rep_y;
		860	$bg->{wrap_mode} = 1;
		861	$bg->draw_quad ($border, $border, $cw, $ch);
641		862
642	glDisable GL_TEXTURE_2D;	863	glDisable GL_TEXTURE_2D;
643	glDisable GL_BLEND;	864	glDisable GL_BLEND;
644		865
		866	$self->{title}->draw if $self->{title};
645	$self->child->draw;	867	$self->child->draw;
646
647	}	868	}
648		869
649	#############################################################################	870	#############################################################################
650		871
651	package CFClient::UI::Table;	872	package CFClient::UI::Table;
652		873
653	our @ISA = CFClient::UI::Base::;	874	our @ISA = CFClient::UI::Base::;
654		875
655	use List::Util qw(max sum);	876	use List::Util qw(max sum);
656		877
657	use SDL::OpenGL;	878	use CFClient::OpenGL;
658		879
659	sub new {	880	sub new {
660	my $class = shift;	881	my $class = shift;
661		882
662	$class->SUPER::new (	883	$class->SUPER::new (
…		…
664	@_	885	@_
665	)	886	)
666	}	887	}
667		888
668	sub add {	889	sub add {
669	my ($self, $x, $y, $chld) = @_;	890	my ($self, $x, $y, $child) = @_;
670		891
		892	$child->set_parent ($self);
671	$self->{children}[$y][$x] = $chld;	893	$self->{children}[$y][$x] = $child;
672	$chld->set_parent ($self);
673		894
674	$self->{w} = $self->{h} = -1;	895	$child->check_size;
		896	}
		897
		898	# TODO: move to container class maybe? send childs a signal on removal?
		899	sub clear {
		900	my ($self) = @_;
		901
		902	delete $self->{children};
675	$self->update;	903	$self->update;
676	}	904	}
677		905
678	sub get_wh {	906	sub get_wh {
679	my ($self) = @_;	907	my ($self) = @_;
…		…
685	or next;	913	or next;
686		914
687	for my $x (0 .. $#$row) {	915	for my $x (0 .. $#$row) {
688	my $widget = $row->[$x]	916	my $widget = $row->[$x]
689	or next;	917	or next;
690	my ($w, $h) = $widget->size_request;	918	my ($w, $h) = @$widget{qw(req_w req_h)};
691		919
692	$w[$x] = max $w[$x], $w;	920	$w[$x] = max $w[$x], $w;
693	$h[$y] = max $h[$y], $h;	921	$h[$y] = max $h[$y], $h;
694	}	922	}
695	}	923	}
…		…
707	(sum @$hs),	935	(sum @$hs),
708	)	936	)
709	}	937	}
710		938
711	sub size_allocate {	939	sub size_allocate {
712	my ($self, $x, $y, $w, $h) = @_;	940	my ($self, $w, $h) = @_;
713
714	$self->_size_allocate ($x, $y, $w, $h) or return;
715		941
716	my ($ws, $hs) = $self->get_wh;	942	my ($ws, $hs) = $self->get_wh;
717		943
718	my $req_w = sum @$ws;	944	my $req_w = sum @$ws;
719	my $req_h = sum @$hs;	945	my $req_h = sum @$hs;
…		…
725		951
726	# linearly scale sizes	952	# linearly scale sizes
727	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	953	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
728	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	954	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
729		955
		956	CFClient::UI::harmonize $ws;
		957	CFClient::UI::harmonize $hs;
		958
730	my $y;	959	my $y;
731		960
732	for my $r (0 .. $#{$self->{children}}) {	961	for my $r (0 .. $#{$self->{children}}) {
733	my $row = $self->{children}[$r]	962	my $row = $self->{children}[$r]
734	or next;	963	or next;
735		964
736	my $x = 0;	965	my $x = 0;
737	my $row_h = $hs->[$r];	966	my $row_h = $hs->[$r];
738		967
739	for my $c (0 .. $#$row) {	968	for my $c (0 .. $#$row) {
740	my $widget = $row->[$c]
741	or next;
742
743	my $col_w = $ws->[$c];	969	my $col_w = $ws->[$c];
744		970
		971	if (my $widget = $row->[$c]) {
745	$widget->size_allocate ($x, $y, $col_w, $row_h);	972	$widget->configure ($x, $y, $col_w, $row_h);
		973	}
746		974
747	$x += $col_w;	975	$x += $col_w;
748	}	976	}
749		977
750	$y += $row_h;	978	$y += $row_h;
…		…
794	(List::Util::max map $_->[1], @alloc),	1022	(List::Util::max map $_->[1], @alloc),
795	)	1023	)
796	}	1024	}
797		1025
798	sub size_allocate {	1026	sub size_allocate {
799	my ($self, $x, $y, $w, $h) = @_;	1027	my ($self, $w, $h) = @_;
800
801	$self->_size_allocate ($x, $y, $w, $h) or return;
802
803	return unless $self->{w};
804		1028
805	($h, $w) = ($w, $h);	1029	($h, $w) = ($w, $h);
806		1030
807	my $children = $self->{children};	1031	my $children = $self->{children};
808		1032
809	my @h = map +($_->size_request)[0], @$children;	1033	my @h = map $_->{req_w}, @$children;
810		1034
811	my $req_h = List::Util::sum @h;	1035	my $req_h = List::Util::sum @h;
812		1036
813	if ($req_h > $h) {	1037	if ($req_h > $h) {
814	# ah well, not enough space	1038	# ah well, not enough space
…		…
824	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;	1048	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
825	$h[$_] = $alloc_h;	1049	$h[$_] = $alloc_h;
826	}	1050	}
827	}	1051	}
828		1052
		1053	CFClient::UI::harmonize \@h;
		1054
829	my $y = 0;	1055	my $y = 0;
830	for (0 .. $#$children) {	1056	for (0 .. $#$children) {
831	my $child = $children->[$_];	1057	my $child = $children->[$_];
832	my $h = $h[$_];	1058	my $h = $h[$_];
833	$child->size_allocate ($y, 0, $h, $w);	1059	$child->configure ($y, 0, $h, $w);
834		1060
835	$y += $h;	1061	$y += $h;
836	}	1062	}
		1063
		1064	1
837	}	1065	}
838		1066
839	#############################################################################	1067	#############################################################################
840		1068
841	package CFClient::UI::VBox;	1069	package CFClient::UI::VBox;
…		…
854	(List::Util::sum map $_->[1], @alloc),	1082	(List::Util::sum map $_->[1], @alloc),
855	)	1083	)
856	}	1084	}
857		1085
858	sub size_allocate {	1086	sub size_allocate {
859	my ($self, $x, $y, $w, $h) = @_;	1087	my ($self, $w, $h) = @_;
860
861	$self->_size_allocate ($x, $y, $w, $h) or return;
862
863	return unless $self->{h};
864		1088
865	my $children = $self->{children};	1089	my $children = $self->{children};
866		1090
867	my @h = map +($_->size_request)[1], @$children;	1091	my @h = map $_->{req_h}, @$children;
868		1092
869	my $req_h = List::Util::sum @h;	1093	my $req_h = List::Util::sum @h;
870		1094
871	if ($req_h > $h) {	1095	if ($req_h > $h) {
872	# ah well, not enough space	1096	# ah well, not enough space
…		…
880		1104
881	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;	1105	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
882	}	1106	}
883	}	1107	}
884		1108
		1109	CFClient::UI::harmonize \@h;
		1110
885	my $y = 0;	1111	my $y = 0;
886	for (0 .. $#$children) {	1112	for (0 .. $#$children) {
887	my $child = $children->[$_];	1113	my $child = $children->[$_];
888	my $h = $h[$_];	1114	my $h = $h[$_];
889	$child->size_allocate (0, $y, $w, $h);	1115	$child->configure (0, $y, $w, $h);
890		1116
891	$y += $h;	1117	$y += $h;
892	}	1118	}
		1119
		1120	1
893	}	1121	}
894		1122
895	#############################################################################	1123	#############################################################################
896		1124
897	package CFClient::UI::Label;	1125	package CFClient::UI::Label;
898		1126
899	our @ISA = CFClient::UI::Base::;	1127	our @ISA = CFClient::UI::Base::;
900		1128
901	use SDL::OpenGL;	1129	use CFClient::OpenGL;
902		1130
903	sub new {	1131	sub new {
904	my ($class, %arg) = @_;	1132	my ($class, %arg) = @_;
905		1133
906	my $self = $class->SUPER::new (	1134	my $self = $class->SUPER::new (
907	fg => [1, 1, 1],	1135	fg => [1, 1, 1],
908	height => $::FONTSIZE,	1136	#font => default_font
		1137	fontsize => 1,
909	text => "",	1138	text => "",
910	align => -1,	1139	align => -1,
		1140	valign => -1,
911	padding => 2,	1141	padding => 2,
912	layout => new CFClient::Layout,	1142	layout => new CFClient::Layout,
		1143	can_events => 0,
913	%arg	1144	%arg
914	);	1145	);
915		1146
916	$self->set_text ($self->{text});	1147	if (exists $self->{template}) {
		1148	my $layout = new CFClient::Layout;
		1149	$layout->set_text (delete $self->{template});
		1150	$self->{template} = $layout;
		1151	}
		1152
		1153	$self->set_text (delete $self->{text}) if exists $self->{text};
		1154	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
917		1155
918	$self	1156	$self
919	}	1157	}
920		1158
921	sub escape_text {	1159	sub escape {
922	local $_ = $_[1];	1160	local $_ = $_[1];
923		1161
924	s/&/&amp;/g;	1162	s/&/&amp;/g;
925	s/>/&gt;/g;	1163	s/>/&gt;/g;
926	s/</&lt;/g;	1164	s/</&lt;/g;
…		…
929	}	1167	}
930		1168
931	sub set_text {	1169	sub set_text {
932	my ($self, $text) = @_;	1170	my ($self, $text) = @_;
933		1171
934	$self->{text} = $text;
935	$self->{layout}->set_markup ($text);	1172	$self->{layout}->set_text ($text);
936		1173
937	delete $self->{texture};	1174	delete $self->{texture};
		1175	$self->check_size;
938	$self->update;	1176	$self->update;
939	}	1177	}
940		1178
941	sub get_text {	1179	sub set_markup {
942	my ($self, $text) = @_;	1180	my ($self, $markup) = @_;
943		1181
944	$self->{text}	1182	$self->{layout}->set_markup ($markup);
		1183
		1184	delete $self->{texture};
		1185	$self->check_size;
		1186	$self->update;
945	}	1187	}
946		1188
947	sub size_request {	1189	sub size_request {
948	my ($self) = @_;	1190	my ($self) = @_;
949		1191
950	$self->{layout}->set_width;	1192	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1193	$self->{layout}->set_width ($self->{max_w} || -1);
951	$self->{layout}->set_height ($self->{height});	1194	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1195
952	my ($w, $h) = $self->{layout}->size;	1196	my ($w, $h) = $self->{layout}->size;
		1197
		1198	if (exists $self->{template}) {
		1199	$self->{template}->set_font ($self->{font}) if $self->{font};
		1200	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1201
		1202	my ($w2, $h2) = $self->{template}->size;
		1203
		1204	$w = List::Util::max $w, $w2;
		1205	$h = List::Util::max $h, $h2;
		1206	}
953		1207
954	(	1208	(
955	$w + $self->{padding} * 2,	1209	$w + $self->{padding} * 2,
956	$h + $self->{padding} * 2,	1210	$h + $self->{padding} * 2,
957	)	1211	)
958	}	1212	}
959		1213
960	sub size_allocate {	1214	sub size_allocate {
961	my ($self, $x, $y, $w, $h) = @_;	1215	my ($self, $w, $h) = @_;
962
963	$self->_size_allocate ($x, $y, $w, $h) or return;
964		1216
965	delete $self->{texture};	1217	delete $self->{texture};
966	}	1218	}
967		1219
968	sub update {	1220	sub set_fontsize {
969	my ($self) = @_;	1221	my ($self, $fontsize) = @_;
970		1222
		1223	$self->{fontsize} = $fontsize;
971	delete $self->{texture};	1224	delete $self->{texture};
		1225	$self->check_size;
972	$self->SUPER::update;	1226	$self->update;
973	}	1227	}
974		1228
975	sub _draw {	1229	sub _draw {
976	my ($self) = @_;	1230	my ($self) = @_;
977		1231
978	my $tex = $self->{texture} ||= do {	1232	my $tex = $self->{texture} ||= do {
		1233	$self->{layout}->set_font ($self->{font}) if $self->{font};
979	$self->{layout}->set_width ($self->{w});	1234	$self->{layout}->set_width ($self->{w});
980	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{height});	1235	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
981	new_from_layout CFClient::Texture $self->{layout}	1236	new_from_layout CFClient::Texture $self->{layout}
982	};	1237	};
983		1238
984	glEnable GL_BLEND;	1239	glEnable GL_BLEND;
985	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
986	glEnable GL_TEXTURE_2D;	1241	glEnable GL_TEXTURE_2D;
987	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
988		1243
989	glColor @{$self->{fg}};	1244	glColor @{$self->{fg}};
990		1245
991	my $x =	1246	$self->{ox} = int (
992	$self->{align} < 0 ? $self->{padding}	1247	$self->{align} < 0 ? $self->{padding}
993	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1248	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
994	: ($self->{w} - $tex->{w}) * 0.5;	1249	: ($self->{w} - $tex->{w}) * 0.5
		1250	);
995		1251
996	$tex->draw_quad ($x, $self->{padding});	1252	$self->{oy} = int (
		1253	$self->{valign} < 0 ? $self->{padding}
		1254	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1255	: ($self->{h} - $tex->{h}) * 0.5
		1256	);
		1257
		1258	$tex->draw_quad ($self->{ox}, $self->{oy});
997		1259
998	glDisable GL_TEXTURE_2D;	1260	glDisable GL_TEXTURE_2D;
999	glDisable GL_BLEND;	1261	glDisable GL_BLEND;
1000	}	1262	}
1001		1263
1002	#############################################################################	1264	#############################################################################
1003		1265
1004	package CFClient::UI::Entry;	1266	package CFClient::UI::EntryBase;
1005		1267
1006	our @ISA = CFClient::UI::Label::;	1268	our @ISA = CFClient::UI::Label::;
1007		1269
1008	use SDL;	1270	use CFClient::OpenGL;
1009	use SDL::OpenGL;
1010		1271
1011	sub new {	1272	sub new {
1012	my $class = shift;	1273	my $class = shift;
1013		1274
1014	$class->SUPER::new (	1275	$class->SUPER::new (
1015	fg => [1, 1, 1],	1276	fg => [1, 1, 1],
1016	bg => [0, 0, 0, 0.2],	1277	bg => [0, 0, 0, 0.2],
1017	active_bg => [1, 1, 1],	1278	active_bg => [1, 1, 1, 0.5],
1018	active_fg => [0, 0, 0],	1279	active_fg => [0, 0, 0],
		1280	can_hover => 1,
		1281	can_focus => 1,
		1282	valign => 0,
		1283	can_events => 1,
1019	@_	1284	@_
1020	)	1285	)
1021	}	1286	}
1022		1287
1023	sub _set_text {	1288	sub _set_text {
1024	my ($self, $text) = @_;	1289	my ($self, $text) = @_;
1025		1290
		1291	delete $self->{cur_h};
		1292
		1293	return if $self->{text} eq $text;
		1294
		1295	delete $self->{texture};
		1296
1026	$self->{last_activity} = $::NOW;	1297	$self->{last_activity} = $::NOW;
1027
1028	$self->{text} = $text;	1298	$self->{text} = $text;
1029	$self->{layout}->set_width ($self->{w});
1030		1299
1031	$text =~ s/./*/g if $self->{hidden};	1300	$text =~ s/./*/g if $self->{hidden};
		1301	$self->{layout}->set_text ("$text ");
1032		1302
1033	$self->{layout}->set_markup ($self->escape_text ($text) . " ");	1303	$self->emit (changed => $self->{text});
		1304	}
1034		1305
1035	$text = substr $text, 0, $self->{cursor};	1306	sub get_text {
1036	utf8::encode $text;	1307	$_[0]{text}
1037
1038	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1039	}	1308	}
1040		1309
1041	sub size_request {	1310	sub size_request {
1042	my ($self) = @_;	1311	my ($self) = @_;
1043		1312
…		…
1045		1314
1046	($w + 1, $h) # add 1 for cursor	1315	($w + 1, $h) # add 1 for cursor
1047	}	1316	}
1048		1317
1049	sub size_allocate {	1318	sub size_allocate {
1050	my ($self, $x, $y, $w, $h) = @_;	1319	my ($self, $w, $h) = @_;
1051		1320
1052	$self->SUPER::size_allocate ($x, $y, $w, $h);	1321	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1053
1054	$self->_set_text ($self->{text});
1055	}	1322	}
1056		1323
1057	sub set_text {	1324	sub set_text {
1058	my ($self, $text) = @_;	1325	my ($self, $text) = @_;
1059		1326
…		…
1063	}	1330	}
1064		1331
1065	sub key_down {	1332	sub key_down {
1066	my ($self, $ev) = @_;	1333	my ($self, $ev) = @_;
1067		1334
1068	my $mod = $ev->key_mod;	1335	my $mod = $ev->{mod};
1069	my $sym = $ev->key_sym;	1336	my $sym = $ev->{sym};
1070
1071	my $uni = $ev->key_unicode;	1337	my $uni = $ev->{unicode};
1072		1338
1073	my $text = $self->get_text;	1339	my $text = $self->get_text;
1074		1340
1075	if ($sym == SDLK_BACKSPACE) {	1341	if ($sym == 8) {
1076	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1342	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1077	} elsif ($sym == SDLK_DELETE) {	1343	} elsif ($sym == 127) {
1078	substr $text, $self->{cursor}, 1, "";	1344	substr $text, $self->{cursor}, 1, "";
1079	} elsif ($sym == SDLK_LEFT) {	1345	} elsif ($sym == CFClient::SDLK_LEFT) {
1080	--$self->{cursor} if $self->{cursor};	1346	--$self->{cursor} if $self->{cursor};
1081	} elsif ($sym == SDLK_RIGHT) {	1347	} elsif ($sym == CFClient::SDLK_RIGHT) {
1082	++$self->{cursor} if $self->{cursor} < length $self->{text};	1348	++$self->{cursor} if $self->{cursor} < length $self->{text};
1083	} elsif ($sym == SDLK_HOME) {	1349	} elsif ($sym == CFClient::SDLK_HOME) {
1084	$self->{cursor} = 0;	1350	$self->{cursor} = 0;
1085	} elsif ($sym == SDLK_END) {	1351	} elsif ($sym == CFClient::SDLK_END) {
1086	$self->{cursor} = length $text;	1352	$self->{cursor} = length $text;
		1353	} elsif ($sym == 27) {
		1354	$self->emit ('escape');
1087	} elsif ($uni) {	1355	} elsif ($uni) {
1088	substr $text, $self->{cursor}++, 0, chr $uni;	1356	substr $text, $self->{cursor}++, 0, chr $uni;
1089	}	1357	}
1090		1358
1091	$self->_set_text ($text);	1359	$self->_set_text ($text);
…		…
1145		1413
1146	$self->SUPER::_draw;	1414	$self->SUPER::_draw;
1147		1415
1148	#TODO: force update every cursor change :(	1416	#TODO: force update every cursor change :(
1149	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {	1417	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1418
		1419	unless (exists $self->{cur_h}) {
		1420	my $text = substr $self->{text}, 0, $self->{cursor};
		1421	utf8::encode $text;
		1422
		1423	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
		1424	}
		1425
1150	glColor @{$self->{fg}};	1426	glColor @{$self->{fg}};
1151	glBegin GL_LINES;	1427	glBegin GL_LINES;
1152	glVertex $self->{cur_x}, $self->{cur_y};
1153	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};	1428	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
		1429	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1154	glEnd;	1430	glEnd;
1155	}	1431	}
1156	}	1432	}
1157		1433
1158	#############################################################################
1159
1160	package CFClient::UI::Slider;	1434	package CFClient::UI::Entry;
1161		1435
1162	use strict;	1436	our @ISA = CFClient::UI::EntryBase::;
1163		1437
1164	use SDL::OpenGL;	1438	use CFClient::OpenGL;
1165		1439
		1440	sub key_down {
		1441	my ($self, $ev) = @_;
		1442
		1443	my $sym = $ev->{sym};
		1444
		1445	if ($sym == 13) {
		1446	$self->emit (activate => $self->get_text);
		1447	$self->update;
		1448
		1449	} else {
		1450	$self->SUPER::key_down ($ev);
		1451	}
		1452
		1453	}
		1454
		1455	#############################################################################
		1456
		1457	package CFClient::UI::Button;
		1458
1166	our @ISA = CFClient::UI::DrawBG::;	1459	our @ISA = CFClient::UI::Label::;
		1460
		1461	use CFClient::OpenGL;
		1462
		1463	my @tex =
		1464	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1465	qw(b1_button_active.png);
1167		1466
1168	sub new {	1467	sub new {
1169	my $class = shift;	1468	my $class = shift;
1170		1469
		1470	$class->SUPER::new (
		1471	padding => 4,
		1472	fg => [1, 1, 1],
		1473	bg => [1, 1, 1, 0.2],
		1474	active_fg => [0, 0, 1],
		1475	can_hover => 1,
		1476	align => 0,
		1477	valign => 0,
		1478	can_events => 1,
		1479	@_
		1480	)
		1481	}
		1482
		1483	sub button_up {
		1484	my ($self, $ev, $x, $y) = @_;
		1485
		1486	if ($x >= 0 && $x < $self->{w}
		1487	&& $y >= 0 && $y < $self->{h}) {
		1488	$self->emit ("activate");
		1489	}
		1490	}
		1491
		1492	sub _draw {
		1493	my ($self) = @_;
		1494
		1495	local $self->{fg} = $self->{fg};
		1496
		1497	if ($GRAB == $self) {
		1498	$self->{fg} = $self->{active_fg};
		1499	}
		1500
		1501	glEnable GL_BLEND;
		1502	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1503	glEnable GL_TEXTURE_2D;
		1504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1505	glColor 0, 0, 0, 1;
		1506
		1507	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
		1508
		1509	glDisable GL_TEXTURE_2D;
		1510	glDisable GL_BLEND;
		1511
		1512	$self->SUPER::_draw;
		1513	}
		1514
		1515	#############################################################################
		1516
		1517	package CFClient::UI::CheckBox;
		1518
		1519	our @ISA = CFClient::UI::DrawBG::;
		1520
		1521	my @tex =
		1522	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1523	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		1524
		1525	use CFClient::OpenGL;
		1526
		1527	sub new {
		1528	my $class = shift;
		1529
		1530	$class->SUPER::new (
		1531	padding => 2,
		1532	fg => [1, 1, 1],
		1533	active_fg => [1, 1, 0],
		1534	state => 0,
		1535	can_hover => 1,
		1536	@_
		1537	)
		1538	}
		1539
		1540	sub size_request {
		1541	my ($self) = @_;
		1542
		1543	($self->{padding} * 2 + 6) x 2
		1544	}
		1545
		1546	sub button_down {
		1547	my ($self, $ev, $x, $y) = @_;
		1548
		1549	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
		1550	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
		1551	$self->{state} = !$self->{state};
		1552	$self->emit (changed => $self->{state});
		1553	}
		1554	}
		1555
		1556	sub _draw {
		1557	my ($self) = @_;
		1558
		1559	$self->SUPER::_draw;
		1560
		1561	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
		1562
		1563	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
		1564
		1565	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		1566
		1567	glEnable GL_BLEND;
		1568	glEnable GL_TEXTURE_2D;
		1569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1570
		1571	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1572
		1573	$tex->draw_quad (0, 0, $s, $s);
		1574
		1575	glDisable GL_TEXTURE_2D;
		1576	glDisable GL_BLEND;
		1577	}
		1578
		1579	#############################################################################
		1580
		1581	package CFClient::UI::Image;
		1582
		1583	our @ISA = CFClient::UI::Base::;
		1584
		1585	use CFClient::OpenGL;
		1586	use Carp qw/confess/;
		1587
		1588	our %loaded_images;
		1589
		1590	sub new {
		1591	my $class = shift;
		1592
		1593	my $self = $class->SUPER::new (can_events => 0, @_);
		1594
		1595	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1596
		1597	$loaded_images{$self->{image}} ||=
		1598	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1599
		1600	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1601
		1602	Scalar::Util::weaken $loaded_images{$self->{image}};
		1603
		1604	$self->{aspect} = $tex->{w} / $tex->{h};
		1605
		1606	$self
		1607	}
		1608
		1609	sub size_request {
		1610	my ($self) = @_;
		1611
		1612	($self->{tex}->{w}, $self->{tex}->{h})
		1613	}
		1614
		1615	sub _draw {
		1616	my ($self) = @_;
		1617
		1618	my $tex = $self->{tex};
		1619
		1620	my ($w, $h) = ($self->{w}, $self->{h});
		1621
		1622	if ($self->{rot90}) {
		1623	glRotate 90, 0, 0, 1;
		1624	glTranslate 0, -$self->{w}, 0;
		1625
		1626	($w, $h) = ($h, $w);
		1627	}
		1628
		1629	glEnable GL_BLEND;
		1630	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1631	glEnable GL_TEXTURE_2D;
		1632	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1633
		1634	$tex->draw_quad (0, 0, $w, $h);
		1635
		1636	glDisable GL_BLEND;
		1637	glDisable GL_TEXTURE_2D;
		1638	}
		1639
		1640	#############################################################################
		1641
		1642	package CFClient::UI::VGauge;
		1643
		1644	our @ISA = CFClient::UI::Base::;
		1645
		1646	use List::Util qw(min max);
		1647
		1648	use CFClient::OpenGL;
		1649
		1650	my %tex = (
		1651	food => [
		1652	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1654	],
		1655	grace => [
		1656	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1658	],
		1659	hp => [
		1660	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1662	],
		1663	mana => [
		1664	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1666	],
		1667	);
		1668
		1669	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1670	sub new {
		1671	my $class = shift;
		1672
		1673	my $self = $class->SUPER::new (
		1674	type => 'food',
		1675	@_
		1676	);
		1677
		1678	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1679
		1680	$self
		1681	}
		1682
		1683	sub size_request {
		1684	my ($self) = @_;
		1685
		1686	#my $tex = $tex{$self->{type}}[0];
		1687	#@$tex{qw(w h)}
		1688	(0, 0)
		1689	}
		1690
		1691	sub set_max {
		1692	my ($self, $max) = @_;
		1693
		1694	$self->{max_val} = $max;
		1695	}
		1696
		1697	sub set_value {
		1698	my ($self, $val, $max) = @_;
		1699
		1700	$self->set_max ($max)
		1701	if defined $max;
		1702
		1703	$max = $self->{max_val};
		1704	$self->{val} = $val;
		1705
		1706	$self->update;
		1707	}
		1708
		1709	sub _draw {
		1710	my ($self) = @_;
		1711
		1712	my $tex = $tex{$self->{type}};
		1713	my ($t1, $t2, $t3) = @$tex;
		1714
		1715	my ($w, $h) = ($self->{w}, $self->{h});
		1716
		1717	if ($self->{vertical}) {
		1718	glRotate 90, 0, 0, 1;
		1719	glTranslate 0, -$self->{w}, 0;
		1720
		1721	($w, $h) = ($h, $w);
		1722	}
		1723
		1724	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1725
		1726	my $ycut1 = max 0, min 1, $ycut;
		1727	my $ycut2 = max 0, min 1, $ycut - 1;
		1728
		1729	my $h1 = $self->{h} * (1 - $ycut1);
		1730	my $h2 = $self->{h} * (1 - $ycut2);
		1731
		1732	glEnable GL_BLEND;
		1733	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1734	glEnable GL_TEXTURE_2D;
		1735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1736
		1737	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1738	glBegin GL_QUADS;
		1739	glTexCoord 0 , 0; glVertex 0 , 0;
		1740	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1741	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
		1742	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1743	glEnd;
		1744
		1745	my $ycut1 = List::Util::min 1, $ycut;
		1746	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1747	glBegin GL_QUADS;
		1748	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1749	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1750	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1751	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
		1752	glEnd;
		1753
		1754	if ($t3) {
		1755	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1756	glBegin GL_QUADS;
		1757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1758	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1761	glEnd;
		1762	}
		1763
		1764	glDisable GL_BLEND;
		1765	glDisable GL_TEXTURE_2D;
		1766	}
		1767
		1768	#############################################################################
		1769
		1770	package CFClient::UI::Gauge;
		1771
		1772	our @ISA = CFClient::UI::VBox::;
		1773
		1774	sub new {
		1775	my ($class, %arg) = @_;
		1776
		1777	my $self = $class->SUPER::new (
		1778	tooltip => $arg{type},
		1779	can_events => 1,
		1780	can_hover => 1,
		1781	%arg,
		1782	);
		1783
		1784	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1785	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1786	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1787
		1788	$self
		1789	}
		1790
		1791	sub set_fontsize {
		1792	my ($self, $fsize) = @_;
		1793
		1794	$self->{value}->set_fontsize ($fsize);
		1795	$self->{max} ->set_fontsize ($fsize);
		1796	}
		1797
		1798	sub set_value {
		1799	my ($self, $val, $max) = @_;
		1800
		1801	$self->set_max ($max)
		1802	if defined $max;
		1803
		1804	$self->{gauge}->set_value ($val, $max);
		1805	$self->{value}->set_text ($val);
		1806	}
		1807
		1808	sub set_max {
		1809	my ($self, $max) = @_;
		1810
		1811	$self->{gauge}->set_max ($max);
		1812	$self->{max}->set_text ($max);
		1813	}
		1814
		1815	#############################################################################
		1816
		1817	package CFClient::UI::Slider;
		1818
		1819	use strict;
		1820
		1821	use CFClient::OpenGL;
		1822
		1823	our @ISA = CFClient::UI::DrawBG::;
		1824
		1825	my @tex =
		1826	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1827	qw(s1_slider.png s1_slider_bg.png);
		1828
		1829	sub new {
		1830	my $class = shift;
		1831
1171	# range [value, low, high, page]	1832	# range [value, low, high, page]
1172		1833
		1834	# TODO: 0-width page
		1835	# TODO: req_w/h are wrong with vertical
		1836	# TODO: calculations are off
1173	my $self = $class->SUPER::new (	1837	my $self = $class->SUPER::new (
1174	fg => [1, 1, 1],	1838	fg => [1, 1, 1],
1175	active_fg => [0, 0, 0],	1839	active_fg => [0, 0, 0],
1176	range => [0, 0, 100, 10],	1840	range => [0, 0, 100, 10],
1177	req_w => 40,	1841	req_w => 20,
1178	req_h => 10,	1842	req_h => 20,
1179	vertical => 0,	1843	vertical => 0,
		1844	can_hover => 1,
		1845	inner_pad => 5,
1180	@_	1846	@_
1181	);	1847	);
1182		1848
1183	$self	1849	$self
1184	}	1850	}
…		…
1205	if ($GRAB == $self) {	1871	if ($GRAB == $self) {
1206	my ($value, $lo, $hi, $page) = @{$self->{range}};	1872	my ($value, $lo, $hi, $page) = @{$self->{range}};
1207		1873
1208	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	1874	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1209		1875
		1876	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1877	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1878
		1879	$x -= $inner_pad_px; # substract the padding
1210	$x = $x * ($hi - $lo) / $w + $lo;	1880	$x = $x * ($hi - $lo) / $inner_w + $lo;
1211	$x = $lo if $x < $lo;	1881	$x = $lo if $x < $lo;
1212	$x = $hi - $page if $x > $hi - $page;	1882	$x = $hi - $page if $x > $hi - $page;
1213	$self->{range}[0] = $x;	1883	$self->{range}[0] = $x;
1214		1884
1215	$self->emit (changed => $x);	1885	$self->emit (changed => $x);
1216	$self->update;	1886	$self->update;
1217	}	1887	}
		1888	}
		1889
		1890	# the inner_* stuff is for generating a padding for the slider handle,
		1891	# so that the handle doesn't leave the texture. This calculation isn't 100%
		1892	# correct propably, but it does the job for now
		1893	sub _calc_inner_pad_px {
		1894	my ($self, $w) = @_;
		1895	($w / 100) * $self->{inner_pad} # % to pixels
1218	}	1896	}
1219		1897
1220	sub _draw {	1898	sub _draw {
1221	my ($self) = @_;	1899	my ($self) = @_;
1222		1900
…		…
1236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	1914	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	1915	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1238		1916
1239	my ($value, $lo, $hi, $page) = @{$self->{range}};	1917	my ($value, $lo, $hi, $page) = @{$self->{range}};
1240		1918
		1919	$hi = $value + 1 if $lo == $hi;
		1920
		1921	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
		1922	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
		1923
1241	$page = int $page * $w / ($hi - $lo);	1924	$page = int $page * $inner_w / ($hi - $lo);
1242	$value = int +($value - $lo) * $w / ($hi - $lo);	1925	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1243		1926
1244	$w -= $page;	1927	$w -= $page;
1245	$page &= ~1;	1928	$page &= ~1;
1246	glTranslate $page * 0.5, 0, 0;	1929	glTranslate $page * 0.5, 0, 0;
		1930	$page ||= 2;
1247		1931
1248	glColor @$fg;
1249	glBegin GL_LINES;
1250	glVertex 0, 0; glVertex 0, $h;
1251	glVertex $w - 1, 0; glVertex $w - 1, $h;
1252	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1253	glEnd;
1254
1255	my $knob_a = $value - $page * 0.5;	1932	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1256	my $knob_b = $value + $page * 0.5;	1933	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1257		1934
1258	glBegin GL_QUADS;	1935	glEnable GL_BLEND;
1259	glColor @$fg;	1936	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1260	glVertex $knob_a, 0;	1937	glEnable GL_TEXTURE_2D;
1261	glVertex $knob_a, $h;	1938	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1262	glVertex $knob_b, $h;
1263	glVertex $knob_b, 0;
1264		1939
1265	if ($knob_a < $knob_b - 2) {	1940	# draw background
1266	glColor @$bg;	1941	$tex[1]->draw_quad (0, 0, $w, $h);
1267	glVertex $knob_a + 1, 1;
1268	glVertex $knob_a + 1, $h - 1;
1269	glVertex $knob_b - 1, $h - 1;
1270	glVertex $knob_b - 1, 1;
1271	}
1272	glEnd;
1273	}
1274		1942
1275	#############################################################################	1943	# draw handle
		1944	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1276		1945
		1946	glDisable GL_BLEND;
		1947	glDisable GL_TEXTURE_2D;
		1948	}
		1949
		1950	#############################################################################
		1951
1277	package CFClient::UI::MapWidget;	1952	package CFClient::UI::TextView;
1278		1953
1279	use strict;
1280
1281	use List::Util qw(min max);
1282
1283	use SDL;
1284	use SDL::OpenGL;
1285
1286	our @ISA = CFClient::UI::Base::;	1954	our @ISA = CFClient::UI::HBox::;
		1955
		1956	use CFClient::OpenGL;
1287		1957
1288	sub new {	1958	sub new {
1289	my $class = shift;	1959	my $class = shift;
1290		1960
1291	$class->SUPER::new (	1961	my $self = $class->SUPER::new (
1292	z => -1,	1962	fontsize => 1,
1293	list => (glGenLists 1),	1963	#font => default_font
1294	@_	1964	@_,
		1965
		1966	layout => (new CFClient::Layout),
		1967	par => [],
		1968	height => 0,
		1969	children => [
		1970	(new CFClient::UI::Empty expand => 1),
		1971	(new CFClient::UI::Slider vertical => 1),
		1972	],
1295	)	1973	);
1296	}
1297		1974
1298	sub key_down {	1975	$self->{children}[1]->connect (changed => sub {
1299	print "MAPKEYDOWN\n";	1976	$self->update;
1300	}	1977	});
1301		1978
1302	sub key_up {	1979	$self
1303	}	1980	}
1304		1981
1305	sub size_request {	1982	sub set_fontsize {
		1983	my ($self, $fontsize) = @_;
		1984
		1985	$self->{fontsize} = $fontsize;
		1986	$self->reflow;
		1987	}
		1988
		1989	sub text_height {
		1990	my ($self, $text) = @_;
		1991
		1992	my $layout = $self->{layout};
		1993
		1994	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		1995	$layout->set_width ($self->{w});
		1996	$layout->set_text ($text);
1306	(	1997
1307	1 + 32 * int $::WIDTH / 32,	1998	($layout->size)[1]
1308	1 + 32 * int $::HEIGHT / 32,	1999	}
1309	)	2000
		2001	sub reflow {
		2002	my ($self) = @_;
		2003
		2004	$self->{need_reflow}++;
		2005	$self->update;
		2006	}
		2007
		2008	sub size_allocate {
		2009	my ($self, $w, $h) = @_;
		2010
		2011	$self->SUPER::size_allocate ($w, $h);
		2012
		2013	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2014	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2015	$self->{layout}->set_width ($self->{children}[0]{w});
		2016
		2017	$self->reflow;
		2018	}
		2019
		2020	sub add_paragraph {
		2021	my ($self, $color, $text) = @_;
		2022
		2023	#TODO: intelligently "reformat" paragraph
		2024
		2025	my $height = $self->text_height ($text);
		2026
		2027	$self->{height} += $height;
		2028
		2029	push @{$self->{par}}, [$height, $color, $text];
		2030
		2031	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
		2032	$self->{children}[1]->update;
1310	}	2033	}
1311		2034
1312	sub update {	2035	sub update {
1313	my ($self) = @_;	2036	my ($self) = @_;
1314		2037
1315	$self->{need_update} = 1;
1316	$self->SUPER::update;	2038	$self->SUPER::update;
1317	}
1318		2039
1319	sub draw {	2040	return unless $self->{h} > 0;
1320	my ($self) = @_;
1321		2041
		2042	delete $self->{texture};
		2043
		2044	$ROOT->on_refresh ($self, sub {
1322	if (delete $self->{need_update}) {	2045	if (delete $self->{need_reflow}) {
1323	glNewList $self->{list}, GL_COMPILE;	2046	my $height = 0;
1324		2047
1325	my $mx = $::CONN->{mapx};	2048	$height += $_->[0] = $self->text_height ($_->[2])
1326	my $my = $::CONN->{mapy};	2049	for @{$self->{par}};
1327		2050
1328	my $map = $::CONN->{map};	2051	$self->{height} = $height;
1329		2052
1330	my ($xofs, $yofs);	2053	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1331		2054
1332	my $sw = 1 + int $::WIDTH / 32;	2055	delete $self->{texture};
1333	my $sh = 1 + int $::HEIGHT / 32;
1334
1335	if ($::CONN->{mapw} > $sw) {
1336	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
1337	} else {
1338	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
1339	}	2056	}
1340		2057
1341	if ($::CONN->{maph} > $sh) {	2058	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1342	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	2059	glClearColor 0, 0, 0, 1;
1343	} else {	2060	glClear GL_COLOR_BUFFER_BIT;
1344	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	2061
		2062	glEnable GL_BLEND;
		2063	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2064	glEnable GL_TEXTURE_2D;
		2065	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2066
		2067	my $top = int $self->{children}[1]{range}[0];
		2068
		2069	my $y0 = $top;
		2070	my $y1 = $top + $self->{h};
		2071
		2072	my $y = 0;
		2073
		2074	my $layout = $self->{layout};
		2075
		2076	$layout->set_font ($self->{font}) if $self->{font};
		2077
		2078	for my $par (@{$self->{par}}) {
		2079	my $h = $par->[0];
		2080
		2081	if ($y0 < $y + $h && $y < $y1) {
		2082	$layout->set_text ($par->[2]);
		2083
		2084	glColor @{ $par->[1] };
		2085	my ($W, $H) = $layout->size;
		2086	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
		2087	}
		2088
		2089	$y += $h;
		2090	}
		2091
		2092	glDisable GL_TEXTURE_2D;
		2093	glDisable GL_BLEND;
1345	}	2094	};
		2095	});
		2096	}
1346		2097
		2098	sub _draw {
		2099	my ($self) = @_;
		2100
		2101	if ($self->{texture}) {
1347	glEnable GL_TEXTURE_2D;	2102	glEnable GL_TEXTURE_2D;
1348	glEnable GL_BLEND;
1349	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1350	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2103	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1351		2104	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1352	my $sw4 = ($sw + 3) & ~3;
1353	my $darkness = "\x00" x ($sw4 * $sh);
1354
1355	for my $x (0 .. $sw - 1) {
1356	my $row = $map->[$x + $xofs];
1357	for my $y (0 .. $sh - 1) {
1358
1359	my $cell = $row->[$y + $yofs]
1360	or next;
1361
1362	my $dark = $cell->[0];
1363	if ($dark < 0) {
1364	substr $darkness, $y * $sw4 + $x, 1, chr 224;
1365	} else {
1366	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1367	}
1368
1369	for my $num (grep $_, @$cell[1,2,3]) {
1370	my $tex = $::CONN->{face}[$num]{texture} || next;
1371
1372	my ($w, $h) = @$tex{qw(w h)};
1373
1374	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1375	}
1376	}
1377	}
1378
1379	# if (1) { # higher quality darkness
1380	# $lighting =~ s/(.)/$1$1$1/gs;
1381	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1382	#
1383	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1384	#
1385	# $lighting = $pb->get_pixels;
1386	# $lighting =~ s/(.)../$1/gs;
1387	# }
1388
1389	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1390
1391	$darkness = new CFClient::Texture
1392	w => $sw4,
1393	h => $sh,
1394	data => $darkness,
1395	internalformat => GL_ALPHA,
1396	format => GL_ALPHA;
1397
1398	glColor 0.45, 0.45, 0.45, 1;
1399	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1400
1401	glDisable GL_TEXTURE_2D;	2105	glDisable GL_TEXTURE_2D;
1402	glDisable GL_BLEND;
1403
1404	glEndList;
1405	}	2106	}
1406		2107
1407	glCallList $self->{list};	2108	$self->{children}[1]->draw;
1408	}
1409		2109
1410	my %DIR = (
1411	SDLK_KP8, [1, "north"],
1412	SDLK_KP9, [2, "northeast"],
1413	SDLK_KP6, [3, "east"],
1414	SDLK_KP3, [4, "southeast"],
1415	SDLK_KP2, [5, "south"],
1416	SDLK_KP1, [6, "southwest"],
1417	SDLK_KP4, [7, "west"],
1418	SDLK_KP7, [8, "northwest"],
1419
1420	SDLK_UP, [1, "north"],
1421	SDLK_RIGHT, [3, "east"],
1422	SDLK_DOWN, [5, "south"],
1423	SDLK_LEFT, [7, "west"],
1424	);
1425
1426	sub key_down {
1427	my ($self, $ev) = @_;
1428
1429	my $mod = $ev->key_mod;
1430	my $sym = $ev->key_sym;
1431
1432	if ($sym == SDLK_KP5) {
1433	$::CONN->send ("command stay fire");
1434	} elsif (exists $DIR{$sym}) {
1435	if ($mod & KMOD_SHIFT) {
1436	$self->{shft}++;
1437	$::CONN->send ("command fire $DIR{$sym}[0]");
1438	} elsif ($mod & KMOD_CTRL) {
1439	$self->{ctrl}++;
1440	$::CONN->send ("command run $DIR{$sym}[0]");
1441	} else {
1442	$::CONN->send ("command $DIR{$sym}[1]");
1443	}
1444	}
1445	}
1446
1447	sub key_up {
1448	my ($self, $ev) = @_;
1449
1450	my $mod = $ev->key_mod;
1451	my $sym = $ev->key_sym;
1452
1453	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1454	$::CONN->send ("command fire_stop");
1455	}
1456	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1457	$::CONN->send ("command run_stop");
1458	}
1459	}	2110	}
1460		2111
1461	#############################################################################	2112	#############################################################################
1462		2113
1463	package CFClient::UI::Animator;	2114	package CFClient::UI::Animator;
1464		2115
1465	use SDL::OpenGL;	2116	use CFClient::OpenGL;
1466		2117
1467	our @ISA = CFClient::UI::Bin::;	2118	our @ISA = CFClient::UI::Bin::;
1468		2119
1469	sub moveto {	2120	sub moveto {
1470	my ($self, $x, $y) = @_;	2121	my ($self, $x, $y) = @_;
…		…
1500	glPopMatrix;	2151	glPopMatrix;
1501	}	2152	}
1502		2153
1503	#############################################################################	2154	#############################################################################
1504		2155
1505	package CFClient::UI::Toplevel;	2156	package CFClient::UI::Flopper;
		2157
		2158	our @ISA = CFClient::UI::Button::;
		2159
		2160	sub new {
		2161	my $class = shift;
		2162
		2163	my $self = $class->SUPER::new (
		2164	state => 0,
		2165	connect_activate => \&toggle_flopper,
		2166	can_events => 1,
		2167	@_
		2168	);
		2169
		2170	if ($self->{state}) {
		2171	$self->{state} = 0;
		2172	$self->toggle_flopper;
		2173	}
		2174
		2175	$self
		2176	}
		2177
		2178	sub toggle_flopper {
		2179	my ($self) = @_;
		2180
		2181	# TODO: use animation
		2182	if ($self->{state} = !$self->{state}) {
		2183	$CFClient::UI::ROOT->add ($self->{other});
		2184	$self->{other}->move ($self->coord2global (0, $self->{h}));
		2185	$self->emit ("open");
		2186	} else {
		2187	$CFClient::UI::ROOT->remove ($self->{other});
		2188	$self->emit ("close");
		2189	}
		2190
		2191	$self->emit (changed => $self->{state});
		2192	}
		2193
		2194	#############################################################################
		2195
		2196	package CFClient::UI::Tooltip;
		2197
		2198	our @ISA = CFClient::UI::Bin::;
		2199
		2200	use CFClient::OpenGL;
		2201
		2202	sub new {
		2203	my $class = shift;
		2204
		2205	$class->SUPER::new (
		2206	@_,
		2207	can_events => 0,
		2208	)
		2209	}
		2210
		2211	sub set_markup {
		2212	my ($self, $text) = @_;
		2213
		2214	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2215	$self->{label}->set_markup ($text);
		2216	$self->add ($self->{label});
		2217	}
		2218
		2219	sub size_request {
		2220	my ($self) = @_;
		2221
		2222	$self->child->set_max_size ($::WIDTH * 0.3);
		2223
		2224	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2225
		2226	($w + 4, $h + 4)
		2227	}
		2228
		2229	sub size_allocate {
		2230	my ($self, $w, $h) = @_;
		2231
		2232	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2233	}
		2234
		2235	sub _draw {
		2236	my ($self) = @_;
		2237
		2238	glPushMatrix;
		2239	glTranslate 0.375, 0.375;
		2240
		2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	glColor 1, 0.8, 0.4;
		2244	glBegin GL_QUADS;
		2245	glVertex 0 , 0;
		2246	glVertex 0 , $h;
		2247	glVertex $w, $h;
		2248	glVertex $w, 0;
		2249	glEnd;
		2250
		2251	glColor 0, 0, 0;
		2252	glBegin GL_LINE_LOOP;
		2253	glVertex 0 , 0;
		2254	glVertex 0 , $h;
		2255	glVertex $w, $h;
		2256	glVertex $w, 0;
		2257	glEnd;
		2258
		2259	glPopMatrix;
		2260
		2261	glTranslate 2, 2;
		2262	$self->SUPER::_draw;
		2263	}
		2264
		2265	#############################################################################
		2266
		2267	package CFClient::UI::Face;
		2268
		2269	our @ISA = CFClient::UI::Base::;
		2270
		2271	use CFClient::OpenGL;
		2272
		2273	sub new {
		2274	my $class = shift;
		2275
		2276	$class->SUPER::new (
		2277	aspect => 1,
		2278	@_,
		2279	)
		2280	}
		2281
		2282	sub size_request {
		2283	(32, 8)
		2284	}
		2285
		2286	sub draw {
		2287	my ($self) = @_;
		2288
		2289	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2290
		2291	if ($tex) {
		2292	glEnable GL_BLEND;
		2293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2294	glEnable GL_TEXTURE_2D;
		2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2296	glColor 1, 1, 1, 1;
		2297	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2298	glDisable GL_TEXTURE_2D;
		2299	glDisable GL_BLEND;
		2300	}
		2301	}
		2302
		2303	#############################################################################
		2304
		2305	package CFClient::UI::Root;
1506		2306
1507	our @ISA = CFClient::UI::Container::;	2307	our @ISA = CFClient::UI::Container::;
		2308
		2309	use CFClient::OpenGL;
		2310
		2311	sub check_size {
		2312	my ($self) = @_;
		2313
		2314	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
		2315	}
1508		2316
1509	sub size_request {	2317	sub size_request {
1510	($::WIDTH, $::HEIGHT)	2318	($::WIDTH, $::HEIGHT)
1511	}	2319	}
1512		2320
1513	sub size_allocate {	2321	sub configure {
1514	my ($self, $x, $y, $w, $h) = @_;	2322	my ($self, $x, $y, $w, $h) = @_;
1515		2323
1516	$self->_size_allocate ($x, $y, $w, $h);	2324	$self->SUPER::configure ($x, $y, $w, $h);
1517		2325
1518	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1519	for @{$self->{children}};	2326	for my $child (@{$self->{children}}) {
1520	}	2327	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1521		2328
1522	sub translate {	2329	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2330	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2331	$child->configure ($X, $Y, $W,$H);
		2332	}
		2333	}
		2334
		2335	sub _topleft {
1523	my ($self, $x, $y) = @_;	2336	my ($self, $x, $y) = @_;
1524		2337
1525	($x, $y)	2338	($x, $y)
1526	}	2339	}
1527		2340
1528	sub update {	2341	sub update {
1529	my ($self) = @_;	2342	my ($self) = @_;
1530		2343
1531	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2344	$self->check_size;
1532	::refresh ();	2345	::refresh ();
1533	}	2346	}
1534		2347
1535	sub add {	2348	sub add {
1536	my ($self, $widget) = @_;	2349	my ($self, $child) = @_;
1537		2350
		2351	# integerize window positions
		2352	$child->{x} = int $child->{x};
		2353	$child->{y} = int $child->{y};
		2354
1538	$self->SUPER::add ($widget);	2355	$self->SUPER::add ($child);
		2356	}
1539		2357
1540	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);	2358	sub on_refresh {
		2359	my ($self, $id, $cb) = @_;
		2360
		2361	$self->{refresh_hook}{$id} = $cb;
1541	}	2362	}
1542		2363
1543	sub draw {	2364	sub draw {
1544	my ($self) = @_;	2365	my ($self) = @_;
1545		2366
		2367	while (my $rcb = delete $self->{refresh_hook}) {
		2368	$_->() for values %$rcb;
		2369	}
		2370
		2371	glViewport 0, 0, $::WIDTH, $::HEIGHT;
		2372	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
		2373	glClear GL_COLOR_BUFFER_BIT;
		2374
		2375	glMatrixMode GL_PROJECTION;
		2376	glLoadIdentity;
		2377	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
		2378	glMatrixMode GL_MODELVIEW;
		2379	glLoadIdentity;
		2380
1546	$self->_draw;	2381	$self->_draw;
1547	}	2382	}
1548		2383
1549	#############################################################################	2384	#############################################################################
1550		2385
1551	package CFClient::UI;	2386	package CFClient::UI;
1552		2387
		2388	$ROOT = new CFClient::UI::Root;
1553	$TOPLEVEL = new CFClient::UI::Toplevel;	2389	$TOOLTIP = new CFClient::UI::Tooltip;
1554		2390
1555	1	2391	1
1556		2392

Diff Legend

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