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

Diff Legend

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