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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
223	}	234	}
224		235
225	$self	236	$self
226	}
227
228	sub toggle_visibility {
229	my ($self) = @_;
230
231	if ($self->{visible}) {
232	$self->hide;
233	} else {
234	$self->show;
235	}
236	}	237	}
237		238
238	sub destroy {	239	sub destroy {
239	my ($self) = @_;	240	my ($self) = @_;
240		241
…		…
242	%$self = ();	243	%$self = ();
243	}	244	}
244		245
245	sub show {	246	sub show {
246	my ($self) = @_;	247	my ($self) = @_;
		248
247	return if $self->{parent};	249	return if $self->{parent};
248		250
249	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
250	}	252	}
251		253
252	sub show_centered {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
		256
254	return if $self->{parent};	257	return if $self->{visible};
255		258
256	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
257		261
258	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
259	"centered $self" => sub {	263
260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
261	},	265
262	);	266	$_->set_visible for $self->children;
263	}	267	}
264		268
265	sub set_invisible {	269	sub set_invisible {
266	my ($self) = @_;	270	my ($self) = @_;
267		271
268	return unless $self->{visible};	272	return unless $self->{visible};
269		273
270	# broken show/hide model	274	$_->set_invisible for $self->children;
271		275
272	delete $self->{root};	276	delete $self->{root};
273	delete $self->{visible};	277	delete $self->{visible};
274		278
275	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
276	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
277		281
278	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
279	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
280		284
281	$self->focus_out;	285	$self->focus_out;
282		286
283	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
284	}	305	}
285		306
286	sub hide {	307	sub hide {
287	my ($self) = @_;	308	my ($self) = @_;
288		309
…		…
290		311
291	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
292	if $self->{parent};	313	if $self->{parent};
293	}	314	}
294		315
295	sub move {	316	sub move_abs {
296	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
297		318
298	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
299	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
300	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
301		322
302	$self->update;	323	$self->update;
303	}	324	}
304		325
305	sub set_size {	326	sub set_size {
306	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
307		328
308	$self->{user_w} = $w;	329	$self->{force_w} = $w;
309	$self->{user_h} = $h;	330	$self->{force_h} = $h;
310		331
311	$self->check_size;	332	$self->realloc;
312	}	333	}
313		334
314	sub size_request {	335	sub size_request {
315	require Carp;	336	require Carp;
316	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
318		339
319	sub configure {	340	sub configure {
320	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
321		342
322	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
323	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
324	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
325		348
326	# use alignment to adjust x, y	349	# use alignment to adjust x, y
327		350
328	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
329	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
330
331	($w, $h) = ($w2, $h2);
332	}	353	}
333		354
334	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
335	$self->{x} = $x;	356	$self->{x} = $x;
336	$self->{y} = $y;	357	$self->{y} = $y;
337	$self->update;	358	$self->update;
338	}	359	}
339		360
340	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
342	}	368	}
343	}	369	}
344		370
345	sub size_allocate {	371	sub size_allocate {
346	# nothing to be done	372	# nothing to be done
347	}
348
349	sub reconfigure {
350	my ($self) = @_;
351
352	$self->check_size (1);
353	$self->update;
354	}	373	}
355		374
356	sub children {	375	sub children {
357	}	376	}
358		377
…		…
436	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
437	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
438	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
439	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
440	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		460
		461	sub find_widget {
		462	my ($self, $x, $y) = @_;
		463
		464	return () unless $self->{can_events};
		465
		466	return $self
		467	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		468	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		469
		470	()
		471	}
		472
		473	sub set_parent {
		474	my ($self, $parent) = @_;
		475
		476	Scalar::Util::weaken ($self->{parent} = $parent);
		477	$self->set_visible if $parent->{visible};
		478	}
		479
		480	sub connect {
		481	my ($self, $signal, $cb) = @_;
		482
		483	push @{ $self->{signal_cb}{$signal} }, $cb;
		484	}
		485
		486	sub _emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		490	}
		491
		492	sub emit {
		493	my ($self, $signal, @args) = @_;
		494
		495	$self->_emit ($signal, @args)
		496	|| $self->$signal (@args);
		497	}
		498
		499	sub visibility_change {
		500	#my ($self, $visible) = @_;
		501	}
		502
		503	sub realloc {
		504	my ($self) = @_;
		505
		506	if ($self->{visible}) {
		507	return if $self->{root}{realloc}{$self+0};
		508
		509	$self->{root}{realloc}{$self+0} = $self;
		510	$self->{root}->update;
		511	} else {
		512	delete $self->{req_w};
		513	delete $self->{req_h};
		514	}
		515	}
		516
		517	sub update {
		518	my ($self) = @_;
		519
		520	$self->{parent}->update
		521	if $self->{parent};
		522	}
		523
		524	sub reconfigure {
		525	my ($self) = @_;
		526
		527	$self->realloc;
		528	$self->update;
		529	}
441		530
442	sub draw {	531	sub draw {
443	my ($self) = @_;	532	my ($self) = @_;
444		533
445	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
462	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
463	glEnd;	552	glEnd;
464	glDisable GL_BLEND;	553	glDisable GL_BLEND;
465	}	554	}
466		555
467	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
468	glPushMatrix;	557	glPushMatrix;
469	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
472	glVertex 0 , 0;	561	glVertex 0 , 0;
…		…
483	my ($self) = @_;	572	my ($self) = @_;
484		573
485	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
486	}	575	}
487		576
488	sub find_widget {
489	my ($self, $x, $y) = @_;
490
491	return () unless $self->{can_events};
492
493	return $self
494	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497	()
498	}
499
500	sub set_parent {
501	my ($self, $parent) = @_;
502
503	Scalar::Util::weaken ($self->{parent} = $parent);
504
505	if ($parent->{visible} || 1) {
506	$self->{root} = $parent->{root};
507	$self->{visible} = $parent->{visible} + 1;
508
509	$self->emit (visibility_change => 1)
510	unless $self->{parent}{visible};
511	}
512
513	# TODO: req_w _does_change after ->reconfigure
514	$self->check_size
515	unless exists $self->{req_w};
516
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}
556
557	sub DESTROY {	577	sub DESTROY {
558	my ($self) = @_;	578	my ($self) = @_;
559		579
560	delete $WIDGET{$self+0};	580	delete $WIDGET{$self+0};
561	#$self->deactivate;	581	#$self->deactivate;
…		…
617	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
619	}	639	}
620		640
621	sub size_request {	641	sub size_request {
622	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
623	}	645	}
624		646
625	sub draw { }	647	sub draw { }
626		648
627	#############################################################################	649	#############################################################################
…		…
656	$self->{children} = [	678	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
659	];	681	];
660		682
661	$self->check_size (1);	683	$self->realloc;
662	$self->update;
663	}	684	}
664		685
665	sub children {	686	sub children {
666	@{ $_[0]{children} }	687	@{ $_[0]{children} }
667	}	688	}
…		…
672	delete $child->{parent};	693	delete $child->{parent};
673	$child->hide;	694	$child->hide;
674		695
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		697
677	$self->check_size (1);	698	$self->realloc;
678	$self->update;
679	}	699	}
680		700
681	sub clear {	701	sub clear {
682	my ($self) = @_;	702	my ($self) = @_;
683		703
…		…
687	for (@$children) {	707	for (@$children) {
688	delete $_->{parent};	708	delete $_->{parent};
689	$_->hide;	709	$_->hide;
690	}	710	}
691		711
692	$self->check_size;	712	$self->realloc;
693	$self->update;
694	}	713	}
695		714
696	sub find_widget {	715	sub find_widget {
697	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
698		717
…		…
835	}	854	}
836		855
837	sub size_request {	856	sub size_request {
838	my ($self) = @_;	857	my ($self) = @_;
839		858
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		860
842	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
843	}	865	}
844		866
845	sub size_allocate {	867	sub size_allocate {
846	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
847		869
		870	my $child = $self->child;
		871
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		874
851	$self->child->configure (0, 0, $w, $h);	875	$self->child->configure (0, 0, $w, $h);
852	$self->update;	876	$self->update;
853	}	877	}
854		878
…		…
997		1021
998	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
999		1023
1000	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
1001		1025
1002	my @tex =	1026	my $bg =
		1027	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1028	mipmap => 1, wrap => 1;
		1029
		1030	my @border =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1032	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005		1033
1006	sub new {	1034	sub new {
1007	my $class = shift;	1035	my $class = shift;
1008
1009	# TODO: user_x, user_y, overwrite moveto?
1010		1036
1011	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1040	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
1017	@_	1044	@_
1018	);	1045	);
1019		1046
1020	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
1021	align => 0,	1048	align => 0,
…		…
1074	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
1075		1102
1076	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
1078		1105
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1108
1084	$self->check_size;	1109	$self->realloc;
		1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1111	};
1086		1112
1087	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1117	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1093		1119
1094	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1095		1121
1096	$self->{user_x} = $bx + $x - $ox;	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1123	};
1101	}	1124	}
1102	}	1125	}
1103		1126
1104	sub button_up {	1127	sub button_up {
…		…
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1147
1125	my $border = $self->border;	1148	my $border = $self->border;
1126		1149
1127	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1155
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1135		1158
1136	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1164	}
1147		1165
1148	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1149		1167
…		…
1179	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1180		1198
1181	$child->set_parent ($self);	1199	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1183		1201
1184	$self->check_size (1);	1202	$self->realloc;
1185	}	1203	}
1186		1204
1187	# TODO: move to container class maybe? send children a signal on removal?	1205	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1206	sub clear {
1189	my ($self) = @_;	1207	my ($self) = @_;
…		…
1194	for (@children) {	1212	for (@children) {
1195	delete $_->{parent};	1213	delete $_->{parent};
1196	$_->hide;	1214	$_->hide;
1197	}	1215	}
1198		1216
1199	$self->check_size (1);	1217	$self->realloc;
1200	$self->update;
1201	}	1218	}
1202		1219
1203	sub get_wh {	1220	sub get_wh {
1204	my ($self) = @_;	1221	my ($self) = @_;
1205		1222
…		…
1301	}	1318	}
1302	}	1319	}
1303		1320
1304	#############################################################################	1321	#############################################################################
1305		1322
1306	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1307
1308	# TODO: wrap into common Box base class
1309		1324
1310	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1311		1326
1312	sub size_request {	1327	sub size_request {
1313	my ($self) = @_;	1328	my ($self) = @_;
1314		1329
1315	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1316		1331	? (
1317	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1318	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319	(List::Util::max map $_->[1], @alloc),	1334	)
1320	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1321	}	1339	}
1322		1340
1323	sub size_allocate {	1341	sub size_allocate {
1324	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1325		1343
1326	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1327
1328	my $children = $self->{children};	1345	my $children = $self->{children};
1329		1346
1330	my @h = map $_->{req_w}, @$children;	1347	my @req;
1331		1348
1332	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1333		1350	@req = ($space / (@$children || 1)) x @$children;
1334	if ($req_h > $h) {
1335	# ah well, not enough space
1336	$_ *= $h / $req_h for @h;
1337	} else {	1351	} else {
		1352	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1353	my $req = List::Util::sum @req;
		1354
		1355	if ($req > $space) {
		1356	# ah well, not enough space
		1357	$_ *= $space / $req for @req;
		1358	} else {
1338	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339	$exp ||= 1;
1340		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1341	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1342	my $child = $children->[$_];
1343
1344	my $alloc_h = $h[$_];
1345	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346	$h[$_] = $alloc_h;
1347	}	1365	}
1348	}	1366	}
1349		1367
1350	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1351		1369
1352	my $y = 0;	1370	my $pos = 0;
1353	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1354	my $child = $children->[$_];
1355	my $h = $h[$_];	1372	my $alloc = $req[$_];
1356	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357		1374
1358	$y += $h;	1375	$pos += $alloc;
1359	}	1376	}
1360		1377
1361	1	1378	1
1362	}	1379	}
1363		1380
1364	#############################################################################	1381	#############################################################################
1365		1382
		1383	package CFClient::UI::HBox;
		1384
		1385	our @ISA = CFClient::UI::Box::;
		1386
		1387	sub new {
		1388	my $class = shift;
		1389
		1390	$class->SUPER::new (
		1391	vertical => 0,
		1392	@_,
		1393	)
		1394	}
		1395
		1396	#############################################################################
		1397
1366	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1367		1399
1368	# TODO: wrap into common Box base class
1369
1370	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1371		1401
1372	sub size_request {	1402	sub new {
1373	my ($self) = @_;	1403	my $class = shift;
1374		1404
1375	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1376		1406	vertical => 1,
1377	(	1407	@_,
1378	(List::Util::max map $_->[0], @alloc),
1379	(List::Util::sum map $_->[1], @alloc),
1380	)	1408	)
1381	}
1382
1383	sub size_allocate {
1384	my ($self, $w, $h) = @_;
1385
1386	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388	my $children = $self->{children};
1389
1390	my @h = map $_->{req_h}, @$children;
1391
1392	my $req_h = List::Util::sum @h;
1393
1394	if ($req_h > $h) {
1395	# ah well, not enough space
1396	$_ *= $h / $req_h for @h;
1397	} else {
1398	my $exp = List::Util::sum map $_->{expand}, @$children;
1399	$exp ||= 1;
1400
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403
1404	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405	}
1406	}
1407
1408	CFClient::UI::harmonize \@h;
1409
1410	my $y = 0;
1411	for (0 .. $#$children) {
1412	my $child = $children->[$_];
1413	my $h = $h[$_];
1414	$child->configure (0, $y, $w, $h);
1415
1416	$y += $h;
1417	}
1418
1419	1
1420	}	1409	}
1421		1410
1422	#############################################################################	1411	#############################################################################
1423		1412
1424	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1441	ellipsise => 3, # end	1430	ellipsise => 3, # end
1442	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1443	fontsize => 1,	1432	fontsize => 1,
1444	align => -1,	1433	align => -1,
1445	valign => -1,	1434	valign => -1,
1446	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1447	can_events => 0,	1437	can_events => 0,
1448	%arg	1438	%arg
1449	);	1439	);
1450		1440
1451	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1487	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1488		1478
1489	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1491		1481
		1482	$self->realloc;
1492	$self->update;	1483	$self->update;
1493	$self->check_size;
1494	}	1484	}
1495		1485
1496	sub set_markup {	1486	sub set_markup {
1497	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1498		1488
…		…
1502	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503		1493
1504	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1506		1496
		1497	$self->realloc;
1507	$self->update;	1498	$self->update;
1508	$self->check_size;
1509	}	1499	}
1510		1500
1511	sub size_request {	1501	sub size_request {
1512	my ($self) = @_;	1502	my ($self) = @_;
1513		1503
…		…
1527		1517
1528	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1529	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1530	}	1520	}
1531		1521
1532	(	1522	($w, $h)
1533	$w + $self->{padding} * 2,
1534	$h + $self->{padding} * 2,
1535	)
1536	}	1523	}
1537		1524
1538	sub size_allocate {	1525	sub size_allocate {
1539	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1540		1527
1541	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542	}	1530	}
1543		1531
1544	sub set_fontsize {	1532	sub set_fontsize {
1545	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1546		1534
1547	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1548	delete $self->{texture};	1536	delete $self->{texture};
1549		1537
1550	$self->update;	1538	$self->realloc;
1551	$self->check_size;
1552	}	1539	}
1553		1540
1554	sub _draw {	1541	sub _draw {
1555	my ($self) = @_;	1542	my ($self) = @_;
1556		1543
…		…
1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566		1553
1567	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1568		1555
1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1572		1559
1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1576		1563
1577	$tex	1564	$tex
1578	};	1565	};
1579		1566
…		…
1636	sub set_text {	1623	sub set_text {
1637	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1638		1625
1639	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1640	$self->_set_text ($text);	1627	$self->_set_text ($text);
1641	$self->update;	1628
1642	$self->check_size;	1629	$self->realloc;
1643	}	1630	}
1644		1631
1645	sub get_text {	1632	sub get_text {
1646	$_[0]{text}	1633	$_[0]{text}
1647	}	1634	}
…		…
1680	} elsif ($uni) {	1667	} elsif ($uni) {
1681	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1682	}	1669	}
1683		1670
1684	$self->_set_text ($text);	1671	$self->_set_text ($text);
1685	$self->update;	1672
1686	$self->check_size;	1673	$self->realloc;
1687	}	1674	}
1688		1675
1689	sub focus_in {	1676	sub focus_in {
1690	my ($self) = @_;	1677	my ($self) = @_;
1691		1678
…		…
1818		1805
1819	sub new {	1806	sub new {
1820	my $class = shift;	1807	my $class = shift;
1821		1808
1822	$class->SUPER::new (	1809	$class->SUPER::new (
1823	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1824	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1825	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1826	can_hover => 1,	1814	can_hover => 1,
1827	align => 0,	1815	align => 0,
1828	valign => 0,	1816	valign => 0,
…		…
1875		1863
1876	sub new {	1864	sub new {
1877	my $class = shift;	1865	my $class = shift;
1878		1866
1879	$class->SUPER::new (	1867	$class->SUPER::new (
1880	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1881	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1882	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1883	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1884	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1885	state => 0,	1874	state => 0,
…		…
1889	}	1878	}
1890		1879
1891	sub size_request {	1880	sub size_request {
1892	my ($self) = @_;	1881	my ($self) = @_;
1893		1882
1894	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1895	}	1884	}
1896		1885
1897	sub button_down {	1886	sub button_down {
1898	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1899		1888
1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1903	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1904	}	1893	}
1905	}	1894	}
1906		1895
1907	sub _draw {	1896	sub _draw {
1908	my ($self) = @_;	1897	my ($self) = @_;
1909		1898
1910	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1911		1900
1912	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913		1902
1914	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1903	my ($w, $h) = @$self{qw(w h)};
		1904
		1905	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915		1906
1916	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917		1908
1918	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1919		1910
…		…
2184	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2185	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2186	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2187	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2188	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2189	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2190	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2191	vertical => 0,	2182	vertical => 0,
2192	can_hover => 1,	2183	can_hover => 1,
2193	inner_pad => 0.02,	2184	inner_pad => 0.02,
2194	@_	2185	@_
2195	);	2186	);
…		…
2198	$self->update;	2189	$self->update;
2199		2190
2200	$self	2191	$self
2201	}	2192	}
2202		2193
		2194	sub changed { }
		2195
2203	sub set_range {	2196	sub set_range {
2204	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2205		2198
2206	($range, $self->{range}) = ($self->{range}, $range);	2199	($range, $self->{range}) = ($self->{range}, $range);
2207		2200
…		…
2233	}	2226	}
2234		2227
2235	sub size_request {	2228	sub size_request {
2236	my ($self) = @_;	2229	my ($self) = @_;
2237		2230
2238	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2239	my $h = $self->{req_h};
2240
2241	$self->{vertical} ? ($h, $w) : ($w, $h)
2242	}	2232	}
2243		2233
2244	sub button_down {	2234	sub button_down {
2245	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2246		2236
…		…
2631	}	2621	}
2632		2622
2633	sub set_tooltip_from {	2623	sub set_tooltip_from {
2634	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2635		2625
		2626	my $tooltip = $widget->{tooltip};
		2627
		2628	if ($ENV{CFPLUS_DEBUG} & 2) {
		2629	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2630	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2631	. "req $widget->{req_w} $widget->{req_h}\n"
		2632	. "visible $widget->{visible}";
		2633	}
		2634
2636	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2637	markup => $widget->{tooltip},	2636	markup => $tooltip,
2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639	fontsize => 0.8,	2638	fontsize => 0.8,
2640	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2641	ellipsise => 0,	2640	ellipsise => 0,
2642	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2653		2652
2654	sub size_allocate {	2653	sub size_allocate {
2655	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2656		2655
2657	$self->SUPER::size_allocate ($w - 4, $h - 4);	2656	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2657	}
		2658
		2659	sub visibility_change {
		2660	my ($self, $visible) = @_;
		2661
		2662	return unless $visible;
		2663
		2664	$self->{root}->on_post_alloc ("move_$self" => sub {
		2665	my $widget = $self->{owner}
		2666	or return;
		2667
		2668	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2669
		2670	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2671	if $x + $self->{w} > $::WIDTH;
		2672
		2673	$self->move_abs ($x, $y);
		2674	});
2658	}	2675	}
2659		2676
2660	sub _draw {	2677	sub _draw {
2661	my ($self) = @_;	2678	my ($self) = @_;
2662		2679
…		…
2679	glVertex $w, $h;	2696	glVertex $w, $h;
2680	glVertex $w, 0;	2697	glVertex $w, 0;
2681	glEnd;	2698	glEnd;
2682		2699
2683	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2684	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2685	}	2703	}
2686		2704
2687	#############################################################################	2705	#############################################################################
2688		2706
…		…
2764	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2765	}	2783	}
2766		2784
2767	#############################################################################	2785	#############################################################################
2768		2786
2769	package CFClient::UI::Inventory;
2770
2771	our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773	sub new {
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808
2809	sub size_request {
2810	my ($self) = @_;
2811	($self->{req_w}, $self->{req_h});
2812	}
2813
2814	#############################################################################
2815
2816	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2817		2788
2818	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2819		2790
2820	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2858	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2830	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2861		2832
2862	$self->show;	2833	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2834	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2835	}
2865		2836
2866	sub mouse_motion {	2837	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2868		2839
…		…
2993	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
2994	}	2965	}
2995		2966
2996	#############################################################################	2967	#############################################################################
2997		2968
2998	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
2999		2970
3000	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002	use CFClient::OpenGL;
3003		2972
3004	sub new {	2973	sub new {
3005	my $class = shift;	2974	my $class = shift;
3006		2975
3007	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2978	@_,
		2979	);
		2980
		2981	$self
		2982	}
		2983
		2984	sub set_items {
		2985	my ($self, $items) = @_;
		2986
		2987	$self->{scrolled}->clear;
		2988	return unless $items;
		2989
		2990	my @items = sort {
		2991	($a->{type} <=> $b->{type})
		2992	or ($a->{name} cmp $b->{name})
		2993	} @$items;
		2994
		2995	$self->{real_items} = \@items;
		2996
		2997	my $row = 0;
		2998	for my $item (@items) {
		2999	CFClient::Item::update_widgets $item;
		3000
		3001	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3004
		3005	$row++;
		3006	}
		3007	}
		3008
		3009	#############################################################################
		3010
		3011	package CFClient::UI::BindEditor;
		3012
		3013	our @ISA = CFClient::UI::FancyFrame::;
		3014
		3015	sub new {
		3016	my $class = shift;
		3017
		3018	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3019
		3020	$self->add (my $vb = new CFClient::UI::VBox);
		3021
		3022
		3023	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3024	text => "start recording",
		3025	tooltip => "Start/Stops recording of actions."
		3026	."All subsequent actions after the recording started will be captured."
		3027	."The actions are displayed after the record was stopped."
		3028	."To bind the action you have to click on the 'Bind' button",
		3029	on_activate => sub {
		3030	unless ($self->{recording}) {
		3031	$self->start;
		3032	} else {
		3033	$self->stop;
		3034	}
		3035	});
		3036
		3037	$vb->add (new CFClient::UI::Label text => "Actions:");
		3038	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3039
		3040	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3041	$vb->add (my $hb = new CFClient::UI::HBox);
		3042	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3043	$hb->add (new CFClient::UI::Button
		3044	text => "bind",
		3045	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3046	on_activate => sub {
		3047	$self->ask_for_bind;
		3048	});
		3049
		3050	$vb->add (my $hb = new CFClient::UI::HBox);
		3051	$hb->add (new CFClient::UI::Button
		3052	text => "ok",
		3053	expand => 1,
		3054	tooltip => "This closes the binding editor and saves the binding",
		3055	on_activate => sub {
		3056	$self->hide;
		3057	$self->commit;
		3058	});
		3059
		3060	$hb->add (new CFClient::UI::Button
		3061	text => "cancel",
		3062	expand => 1,
		3063	tooltip => "This closes the binding editor without saving",
		3064	on_activate => sub {
		3065	$self->hide;
		3066	$self->{binding_cancel}->()
		3067	if $self->{binding_cancel};
		3068	});
		3069
		3070	$self->update_binding_widgets;
		3071
		3072	$self
		3073	}
		3074
		3075	sub commit {
		3076	my ($self) = @_;
		3077	my ($mod, $sym, $cmds) = $self->get_binding;
		3078	if ($sym != 0 && @$cmds > 0) {
		3079	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3080	."'. Don't forget 'Save Config'!");
		3081	$self->{binding_change}->($mod, $sym, $cmds)
		3082	if $self->{binding_change};
		3083	} else {
		3084	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3085	$self->{binding_cancel}->()
		3086	if $self->{binding_cancel};
		3087	}
		3088	}
		3089
		3090	sub start {
		3091	my ($self) = @_;
		3092
		3093	$self->{rec_btn}->set_text ("stop recording");
		3094	$self->{recording} = 1;
		3095	$self->clear_command_list;
		3096	$::CONN->start_record if $::CONN;
		3097	}
		3098
		3099	sub stop {
		3100	my ($self) = @_;
		3101
		3102	$self->{rec_btn}->set_text ("start recording");
		3103	$self->{recording} = 0;
		3104
		3105	my $rec;
		3106	$rec = $::CONN->stop_record if $::CONN;
		3107	return unless ref $rec eq 'ARRAY';
		3108	$self->set_command_list ($rec);
		3109	}
		3110
		3111	# if $commit is true, the binding will be set after the user entered a key combo
		3112	sub ask_for_bind {
		3113	my ($self, $commit) = @_;
		3114
		3115	CFClient::Binder::open_binding_dialog (sub {
		3116	my ($mod, $sym) = @_;
		3117	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3118	$self->update_binding_widgets;
		3119	$self->commit if $commit;
		3120	});
		3121	}
		3122
		3123	# $mod and $sym are the modifiers and key symbol
		3124	# $cmds is a array ref of strings (the commands)
		3125	# $cb is the callback that is executed on OK
		3126	# $ccb is the callback that is executed on CANCEL and
		3127	# when the binding was unsuccessful on OK
		3128	sub set_binding {
		3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3130
		3131	$self->clear_command_list;
		3132	$self->{recording} = 0;
		3133	$self->{rec_btn}->set_text ("start recording");
		3134
		3135	$self->{binding} = [$mod, $sym];
		3136	$self->{commands} = $cmds;
		3137
		3138	$self->{binding_change} = $cb;
		3139	$self->{binding_cancel} = $ccb;
		3140
		3141	$self->update_binding_widgets;
		3142	}
		3143
		3144	# this is a shortcut method that asks for a binding
		3145	# and then just binds it.
		3146	sub do_quick_binding {
		3147	my ($self, $cmds) = @_;
		3148	$self->set_binding (undef, undef, $cmds, sub {
		3149	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3150	});
		3151	$self->ask_for_bind (1);
		3152	}
		3153
		3154	sub update_binding_widgets {
		3155	my ($self) = @_;
		3156	my ($mod, $sym, $cmds) = $self->get_binding;
		3157	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3158	$self->set_command_list ($cmds);
		3159	}
		3160
		3161	sub get_binding {
		3162	my ($self) = @_;
		3163	return (
		3164	$self->{binding}->[0],
		3165	$self->{binding}->[1],
		3166	[ grep { defined $_ } @{$self->{commands}} ]
		3167	);
		3168	}
		3169
		3170	sub clear_command_list {
		3171	my ($self) = @_;
		3172	$self->{cmdbox}->clear ();
		3173	}
		3174
		3175	sub set_command_list {
		3176	my ($self, $cmds) = @_;
		3177
		3178	$self->{cmdbox}->clear ();
		3179	$self->{commands} = $cmds;
		3180
		3181	my $idx = 0;
		3182
		3183	for (@$cmds) {
		3184	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3185
		3186	my $i = $idx;
		3187	$hb->add (new CFClient::UI::Label text => $_);
		3188	$hb->add (new CFClient::UI::Button
		3189	text => "delete",
		3190	tooltip => "Deletes the action from the record",
		3191	on_activate => sub {
		3192	$self->{cmdbox}->remove ($hb);
		3193	$cmds->[$i] = undef;
		3194	});
		3195
		3196
		3197	$idx++
		3198	}
		3199	}
		3200
		3201	#############################################################################
		3202
		3203	package CFClient::UI::SpellList;
		3204
		3205	our @ISA = CFClient::UI::FancyFrame::;
		3206
		3207	sub new {
		3208	my $class = shift;
		3209
		3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3211
		3212	$self->add (new CFClient::UI::ScrolledWindow
		3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3214
		3215	$self;
		3216	}
		3217
		3218	# XXX: Do sorting? Argl...
		3219	sub add_spell {
		3220	my ($self, $spell) = @_;
		3221	$self->{spells}->{$spell->{name}} = $spell;
		3222
		3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3224	face => $spell->{face},
		3225	can_hover => 1,
		3226	can_events => 1,
		3227	tooltip => $spell->{message});
		3228
		3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3230	text => $spell->{name},
		3231	can_hover => 1,
		3232	can_events => 1,
		3233	tooltip => $spell->{message},
		3234	expand => 1);
		3235
		3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3238	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3239	expand => 1);
		3240
		3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3242	text => "bind to key",
		3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3244	}
		3245
		3246	sub rebuild_spell_list {
		3247	my ($self) = @_;
		3248	$self->{tbl_idx} = 0;
		3249	$self->add_spell ($_) for values %{$self->{spells}};
		3250	}
		3251
		3252	sub remove_spell {
		3253	my ($self, $spell) = @_;
		3254	delete $self->{spells}->{$spell->{name}};
		3255	$self->rebuild_spell_list;
		3256	}
		3257
		3258	#############################################################################
		3259
		3260	package CFClient::UI::Root;
		3261
		3262	our @ISA = CFClient::UI::Container::;
		3263
		3264	use CFClient::OpenGL;
		3265
		3266	sub new {
		3267	my $class = shift;
		3268
		3269	my $self = $class->SUPER::new (
3008	visible => 1,	3270	visible => 1,
3009	@_,	3271	@_,
3010	)	3272	);
3011	}
3012		3273
3013	sub configure {	3274	Scalar::Util::weaken ($self->{root} = $self);
3014	my ($self, $x, $y, $w, $h) = @_;
3015		3275
3016	$self->{w} = $w;	3276	$self
3017	$self->{h} = $h;
3018	}
3019
3020	sub check_size {
3021	my ($self) = @_;
3022
3023	$self->size_allocate ($self->{w}, $self->{h})
3024	if $self->{w};
3025	}	3277	}
3026		3278
3027	sub size_request {	3279	sub size_request {
3028	my ($self) = @_;	3280	my ($self) = @_;
3029		3281
3030	($self->{w}, $self->{h})	3282	($self->{w}, $self->{h})
		3283	}
		3284
		3285	sub _to_pixel {
		3286	my ($coord, $size, $max) = @_;
		3287
		3288	$coord =
		3289	$coord eq "center" ? ($max - $size) * 0.5
		3290	: $coord eq "max" ? $max
		3291	: $coord;
		3292
		3293	$coord = 0 if $coord < 0;
		3294	$coord = $max - $size if $coord > $max - $size;
		3295
		3296	int $coord + 0.5
3031	}	3297	}
3032		3298
3033	sub size_allocate {	3299	sub size_allocate {
3034	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3035		3301
3036	for my $child ($self->children) {	3302	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3303	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3304
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3041		3307
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	$X = $self->{user_x} if exists $self->{user_x};
3046	$Y = $self->{user_y} if exists $self->{user_y};
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3310
3051	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3052	}	3312	}
3053	}	3313	}
3054		3314
…		…
3065	}	3325	}
3066		3326
3067	sub update {	3327	sub update {
3068	my ($self) = @_;	3328	my ($self) = @_;
3069		3329
3070	$self->check_size;
3071	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3072	}	3331	}
3073		3332
3074	sub add {	3333	sub add {
3075	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3076		3335
3077	for (my @widgets = @children; my $w = pop @widgets; ) {
3078	push @widgets, $w->children;
3079	$w->{root} = $self;
3080	$w->{visible} = $self->{visible} + 1;
3081	}
3082
3083	for my $child (@children) {
3084	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3085		3337	for @children;
3086	# integerise window positions
3087	$child->{x} = int $child->{x};
3088	$child->{y} = int $child->{y};
3089	}
3090		3338
3091	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3092	}	3340	}
3093		3341
3094	sub remove {	3342	sub remove {
3095	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3096		3344
3097	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3098		3349
3099	while (@children) {	3350	while (@children) {
3100	my $w = pop @children;	3351	my $w = pop @children;
3101	push @children, $w->children;	3352	push @children, $w->children;
3102	$w->set_invisible;	3353	$w->set_invisible;
…		…
3121	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3122	$_->()	3373	$_->()
3123	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3124	}	3375	}
3125		3376
3126	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
		3378	my %queue;
3127	my @queue;	3379	my @queue;
		3380	my $widget;
3128		3381
3129	for (;;) {	3382	outer:
3130	if ($self->{check_size}) {	3383	while () {
3131	#TODO use array-of-depth approach	3384	if (my $realloc = delete $self->{realloc}) {
		3385	for $widget (values %$realloc) {
		3386	$widget->{visible} or next; # do not resize invisible widgets
3132		3387
3133	@queue = sort { $a->{visible} <=> $b->{visible} }	3388	$queue{$widget+0}++ and next; # duplicates are common
3134	@queue, values %{delete $self->{check_size}};	3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3135	}	3392	}
3136		3393
		3394	while () {
		3395	@queue or last outer;
		3396
3137	my $widget = pop @queue || last;	3397	$widget = pop @{ $queue[-1] || [] }
3138		3398	and last;
3139	defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142	? @$widget{qw(user_w user_h)}
3143	: $widget->size_request;
3144
3145	if (delete $widget->{force_alloc}
3146	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148		3399
		3400	pop @queue;
		3401	}
		3402
		3403	delete $queue{$widget+0};
		3404
		3405	my ($w, $h) = $widget->size_request;
		3406
		3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3409
		3410	$w = $widget->{force_w} if exists $widget->{force_w};
		3411	$h = $widget->{force_h} if exists $widget->{force_h};
		3412
		3413	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3414	|| delete $widget->{force_realloc}) {
3149	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3150	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3151		3417
3152	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3153		3419
3154	$widget->{parent}->check_size
3155	if $widget->{parent};	3420	if (my $parent = $widget->{parent}) {
		3421	$self->{realloc}{$parent+0} = $parent
		3422	unless $queue{$parent+0};
		3423
		3424	$parent->{force_size_alloc} = 1;
		3425	$self->{size_alloc}{$parent+0} = $parent;
		3426	}
3156	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3157	}	3430	}
3158	}	3431	}
3159		3432
3160	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3161	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3162	my ($widget, $w, $h) = @$_;	3435	values %$size_alloc;
		3436
		3437	while () {
		3438	my $widget = pop @queue || last;
		3439
		3440	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163		3441
3164	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3165	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3166		3444
		3445	$w = int $w + 0.5;
		3446	$h = int $h + 0.5;
		3447
		3448	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3449	$widget->{old_w} = $widget->{w};
		3450	$widget->{old_h} = $widget->{h};
		3451
3167	$widget->{w} = $w;	3452	$widget->{w} = $w;
3168	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3169	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3170	}	3457	}
3171	}	3458	}
3172		3459
3173	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3174	$_->()	3461	$_->()
3175	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3176	}	3463	}
		3464
3177		3465
3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3181		3469

Diff Legend

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