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.243 by root, Sat May 27 20:46:54 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	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$self->focus_out;	285	$self->focus_out;
		286
		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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
426	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	}
427		530
428	sub draw {	531	sub draw {
429	my ($self) = @_;	532	my ($self) = @_;
430		533
431	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
448	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
449	glEnd;	552	glEnd;
450	glDisable GL_BLEND;	553	glDisable GL_BLEND;
451	}	554	}
452		555
453	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	557	glPushMatrix;
455	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	561	glVertex 0 , 0;
…		…
469	my ($self) = @_;	572	my ($self) = @_;
470		573
471	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
472	}	575	}
473		576
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	577	sub DESTROY {
535	my ($self) = @_;	578	my ($self) = @_;
536		579
537	delete $WIDGET{$self+0};	580	delete $WIDGET{$self+0};
538	#$self->deactivate;	581	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
596	}	639	}
597		640
598	sub size_request {	641	sub size_request {
599	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
600	}	645	}
601		646
602	sub draw { }	647	sub draw { }
603		648
604	#############################################################################	649	#############################################################################
…		…
633	$self->{children} = [	678	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
636	];	681	];
637		682
638	$self->check_size (1);	683	$self->realloc;
639	$self->update;
640	}	684	}
641		685
642	sub children {	686	sub children {
643	@{ $_[0]{children} }	687	@{ $_[0]{children} }
644	}	688	}
…		…
649	delete $child->{parent};	693	delete $child->{parent};
650	$child->hide;	694	$child->hide;
651		695
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		697
654	$self->check_size (1);	698	$self->realloc;
655	$self->update;
656	}	699	}
657		700
658	sub clear {	701	sub clear {
659	my ($self) = @_;	702	my ($self) = @_;
660		703
…		…
664	for (@$children) {	707	for (@$children) {
665	delete $_->{parent};	708	delete $_->{parent};
666	$_->hide;	709	$_->hide;
667	}	710	}
668		711
669	$self->check_size;	712	$self->realloc;
670	$self->update;
671	}	713	}
672		714
673	sub find_widget {	715	sub find_widget {
674	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
675		717
…		…
812	}	854	}
813		855
814	sub size_request {	856	sub size_request {
815	my ($self) = @_;	857	my ($self) = @_;
816		858
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		860
819	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
820	}	865	}
821		866
822	sub size_allocate {	867	sub size_allocate {
823	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
824		869
		870	my $child = $self->child;
		871
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		874
828	$self->child->configure (0, 0, $w, $h);	875	$self->child->configure (0, 0, $w, $h);
829	$self->update;	876	$self->update;
830	}	877	}
831		878
…		…
974		1021
975	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
976		1023
977	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
978		1025
979	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 =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	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);
982		1033
983	sub new {	1034	sub new {
984	my $class = shift;	1035	my $class = shift;
985
986	# TODO: user_x, user_y, overwrite moveto?
987		1036
988	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1040	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
994	@_	1044	@_
995	);	1045	);
996		1046
997	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
998	align => 0,	1048	align => 0,
…		…
1051	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
1052		1102
1053	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
1055		1105
1056	$self->{user_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1108
1061	$self->check_size;	1109	$self->realloc;
		1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1111	};
1063		1112
1064	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1117	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1070		1119
1071	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1072		1121
1073	$self->{user_x} = $bx + $x - $ox;	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074	$self->{user_y} = $by + $y - $oy;
1075	$self->move ($self->{user_x}, $self->{user_y});
1076	$self->update;
1077	};	1123	};
1078	}	1124	}
1079	}	1125	}
1080		1126
1081	sub button_up {	1127	sub button_up {
…		…
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1147
1102	my $border = $self->border;	1148	my $border = $self->border;
1103		1149
1104	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1155
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1112		1158
1113	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1116
1117	glColor @{ $self->{bg} };
1118
1119	$bg->{s} = $rep_x;
1120	$bg->{t} = $rep_y;
1121	$bg->{wrap_mode} = 1;
1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1164	}
1124		1165
1125	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1126		1167
…		…
1156	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1157		1198
1158	$child->set_parent ($self);	1199	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1160		1201
1161	$self->check_size (1);	1202	$self->realloc;
1162	}	1203	}
1163		1204
1164	# 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?
1165	sub clear {	1206	sub clear {
1166	my ($self) = @_;	1207	my ($self) = @_;
…		…
1171	for (@children) {	1212	for (@children) {
1172	delete $_->{parent};	1213	delete $_->{parent};
1173	$_->hide;	1214	$_->hide;
1174	}	1215	}
1175		1216
1176	$self->check_size (1);	1217	$self->realloc;
1177	$self->update;
1178	}	1218	}
1179		1219
1180	sub get_wh {	1220	sub get_wh {
1181	my ($self) = @_;	1221	my ($self) = @_;
1182		1222
…		…
1278	}	1318	}
1279	}	1319	}
1280		1320
1281	#############################################################################	1321	#############################################################################
1282		1322
1283	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1324
1287	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1288		1326
1289	sub size_request {	1327	sub size_request {
1290	my ($self) = @_;	1328	my ($self) = @_;
1291		1329
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1293		1331	? (
1294	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1334	)
1297	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1298	}	1339	}
1299		1340
1300	sub size_allocate {	1341	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1302		1343
1303	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1345	my $children = $self->{children};
1306		1346
1307	my @h = map $_->{req_w}, @$children;	1347	my @req;
1308		1348
1309	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1310		1350	@req = ($space / (@$children || 1)) x @$children;
1311	if ($req_h > $h) {
1312	# ah well, not enough space
1313	$_ *= $h / $req_h for @h;
1314	} 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 {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1319	my $child = $children->[$_];
1320
1321	my $alloc_h = $h[$_];
1322	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323	$h[$_] = $alloc_h;
1324	}	1365	}
1325	}	1366	}
1326		1367
1327	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1328		1369
1329	my $y = 0;	1370	my $pos = 0;
1330	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1372	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1374
1335	$y += $h;	1375	$pos += $alloc;
1336	}	1376	}
1337		1377
1338	1	1378	1
1339	}	1379	}
1340		1380
1341	#############################################################################	1381	#############################################################################
1342		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
1343	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1344		1399
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1348		1401
1349	sub size_request {	1402	sub new {
1350	my ($self) = @_;	1403	my $class = shift;
1351		1404
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1353		1406	vertical => 1,
1354	(	1407	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1408	)
1358	}
1359
1360	sub size_allocate {
1361	my ($self, $w, $h) = @_;
1362
1363	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365	my $children = $self->{children};
1366
1367	my @h = map $_->{req_h}, @$children;
1368
1369	my $req_h = List::Util::sum @h;
1370
1371	if ($req_h > $h) {
1372	# ah well, not enough space
1373	$_ *= $h / $req_h for @h;
1374	} else {
1375	my $exp = List::Util::sum map $_->{expand}, @$children;
1376	$exp ||= 1;
1377
1378	for (0 .. $#$children) {
1379	my $child = $children->[$_];
1380
1381	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382	}
1383	}
1384
1385	CFClient::UI::harmonize \@h;
1386
1387	my $y = 0;
1388	for (0 .. $#$children) {
1389	my $child = $children->[$_];
1390	my $h = $h[$_];
1391	$child->configure (0, $y, $w, $h);
1392
1393	$y += $h;
1394	}
1395
1396	1
1397	}	1409	}
1398		1410
1399	#############################################################################	1411	#############################################################################
1400		1412
1401	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1430	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1420	fontsize => 1,	1432	fontsize => 1,
1421	align => -1,	1433	align => -1,
1422	valign => -1,	1434	valign => -1,
1423	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1424	can_events => 0,	1437	can_events => 0,
1425	%arg	1438	%arg
1426	);	1439	);
1427		1440
1428	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1465		1478
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1468		1481
		1482	$self->realloc;
1469	$self->update;	1483	$self->update;
1470	$self->check_size;
1471	}	1484	}
1472		1485
1473	sub set_markup {	1486	sub set_markup {
1474	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1475		1488
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1493
1481	$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;
1482	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1483		1496
		1497	$self->realloc;
1484	$self->update;	1498	$self->update;
1485	$self->check_size;
1486	}	1499	}
1487		1500
1488	sub size_request {	1501	sub size_request {
1489	my ($self) = @_;	1502	my ($self) = @_;
1490		1503
…		…
1504		1517
1505	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1507	}	1520	}
1508		1521
1509	(	1522	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1523	}
1514		1524
1515	sub size_allocate {	1525	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1517		1527
1518	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1530	}
1520		1531
1521	sub set_fontsize {	1532	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1523		1534
1524	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1536	delete $self->{texture};
1526		1537
1527	$self->update;	1538	$self->realloc;
1528	$self->check_size;
1529	}	1539	}
1530		1540
1531	sub _draw {	1541	sub _draw {
1532	my ($self) = @_;	1542	my ($self) = @_;
1533		1543
…		…
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1553
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1545		1555
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1549		1559
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1553		1563
1554	$tex	1564	$tex
1555	};	1565	};
1556		1566
…		…
1613	sub set_text {	1623	sub set_text {
1614	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1615		1625
1616	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1627	$self->_set_text ($text);
1618	$self->update;	1628
1619	$self->check_size;	1629	$self->realloc;
1620	}	1630	}
1621		1631
1622	sub get_text {	1632	sub get_text {
1623	$_[0]{text}	1633	$_[0]{text}
1624	}	1634	}
…		…
1657	} elsif ($uni) {	1667	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1659	}	1669	}
1660		1670
1661	$self->_set_text ($text);	1671	$self->_set_text ($text);
1662	$self->update;	1672
1663	$self->check_size;	1673	$self->realloc;
1664	}	1674	}
1665		1675
1666	sub focus_in {	1676	sub focus_in {
1667	my ($self) = @_;	1677	my ($self) = @_;
1668		1678
…		…
1795		1805
1796	sub new {	1806	sub new {
1797	my $class = shift;	1807	my $class = shift;
1798		1808
1799	$class->SUPER::new (	1809	$class->SUPER::new (
1800	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1801	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1803	can_hover => 1,	1814	can_hover => 1,
1804	align => 0,	1815	align => 0,
1805	valign => 0,	1816	valign => 0,
…		…
1852		1863
1853	sub new {	1864	sub new {
1854	my $class = shift;	1865	my $class = shift;
1855		1866
1856	$class->SUPER::new (	1867	$class->SUPER::new (
1857	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1858	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1874	state => 0,
…		…
1866	}	1878	}
1867		1879
1868	sub size_request {	1880	sub size_request {
1869	my ($self) = @_;	1881	my ($self) = @_;
1870		1882
1871	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1872	}	1884	}
1873		1885
1874	sub button_down {	1886	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1876		1888
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1881	}	1893	}
1882	}	1894	}
1883		1895
1884	sub _draw {	1896	sub _draw {
1885	my ($self) = @_;	1897	my ($self) = @_;
1886		1898
1887	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1888		1900
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1902
1891	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;
1892		1906
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1908
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1910
…		…
2161	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2168	vertical => 0,	2182	vertical => 0,
2169	can_hover => 1,	2183	can_hover => 1,
2170	inner_pad => 0.02,	2184	inner_pad => 0.02,
2171	@_	2185	@_
2172	);	2186	);
…		…
2175	$self->update;	2189	$self->update;
2176		2190
2177	$self	2191	$self
2178	}	2192	}
2179		2193
		2194	sub changed { }
		2195
2180	sub set_range {	2196	sub set_range {
2181	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2182		2198
2183	($range, $self->{range}) = ($self->{range}, $range);	2199	($range, $self->{range}) = ($self->{range}, $range);
2184		2200
…		…
2210	}	2226	}
2211		2227
2212	sub size_request {	2228	sub size_request {
2213	my ($self) = @_;	2229	my ($self) = @_;
2214		2230
2215	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2232	}
2220		2233
2221	sub button_down {	2234	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2223		2236
…		…
2579	state => 0,	2592	state => 0,
2580	on_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2581	@_	2594	@_
2582	);	2595	);
2583		2596
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2597	$self
2590	}	2598	}
2591		2599
2592	sub toggle_flopper {	2600	sub toggle_flopper {
2593	my ($self) = @_;	2601	my ($self) = @_;
2594		2602
2595	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2596	if ($self->{state} = !$self->{state}) {
2597	$CFClient::UI::ROOT->add ($self->{other});
2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2599	$self->_emit ("open");
2600	} else {
2601	$CFClient::UI::ROOT->remove ($self->{other});
2602	$self->_emit ("close");
2603	}
2604
2605	$self->_emit (changed => $self->{state});
2606	}	2604	}
2607		2605
2608	#############################################################################	2606	#############################################################################
2609		2607
2610	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2623	}	2621	}
2624		2622
2625	sub set_tooltip_from {	2623	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2627		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
2628	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2636	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2638	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2640	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2652
2646	sub size_allocate {	2653	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2648		2655
2649	$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	});
2650	}	2675	}
2651		2676
2652	sub _draw {	2677	sub _draw {
2653	my ($self) = @_;	2678	my ($self) = @_;
2654		2679
…		…
2671	glVertex $w, $h;	2696	glVertex $w, $h;
2672	glVertex $w, 0;	2697	glVertex $w, 0;
2673	glEnd;	2698	glEnd;
2674		2699
2675	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2676	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2677	}	2703	}
2678		2704
2679	#############################################################################	2705	#############################################################################
2680		2706
…		…
2756	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2757	}	2783	}
2758		2784
2759	#############################################################################	2785	#############################################################################
2760		2786
2761	package CFClient::UI::Inventory;
2762
2763	our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765	sub new {
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,
2771	);
2772
2773	$self
2774	}
2775
2776	sub set_items {
2777	my ($self, $items) = @_;
2778
2779	$self->{scrolled}->clear;
2780	return unless $items;
2781
2782	my @items = sort {
2783	($a->{type} <=> $b->{type})
2784	or ($a->{name} cmp $b->{name})
2785	} @$items;
2786
2787	$self->{real_items} = \@items;
2788
2789	my $row = 0;
2790	for my $item (@items) {
2791	CFClient::Item::update_widgets $item;
2792
2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797	$row++;
2798	}
2799	}
2800
2801	sub size_request {
2802	my ($self) = @_;
2803	($self->{req_w}, $self->{req_h});
2804	}
2805
2806	#############################################################################
2807
2808	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2809		2788
2810	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2811		2790
2812	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2850	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2830	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2853		2832
2854	$self->show;	2833	$self->show;
2855	$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);
2856	}	2835	}
2857		2836
2858	sub mouse_motion {	2837	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2860		2839
…		…
2985	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
2986	}	2965	}
2987		2966
2988	#############################################################################	2967	#############################################################################
2989		2968
2990	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
2991		2970
2992	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		2972
2996	sub new {	2973	sub new {
2997	my $class = shift;	2974	my $class = shift;
2998		2975
2999	$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 (
3000	visible => 1,	3270	visible => 1,
3001	@_,	3271	@_,
3002	)	3272	);
3003	}
3004		3273
3005	sub configure {	3274	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3275
3008	$self->{w} = $w;	3276	$self
3009	$self->{h} = $h;
3010	}
3011
3012	sub check_size {
3013	my ($self) = @_;
3014
3015	$self->size_allocate ($self->{w}, $self->{h})
3016	if $self->{w};
3017	}	3277	}
3018		3278
3019	sub size_request {	3279	sub size_request {
3020	my ($self) = @_;	3280	my ($self) = @_;
3021		3281
3022	($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
3023	}	3297	}
3024		3298
3025	sub size_allocate {	3299	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3027		3301
3028	for my $child ($self->children) {	3302	for my $child ($self->children) {
3029	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)};
3030		3304
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3033		3307
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3036
3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039		3310
3040	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3041	}	3312	}
3042	}	3313	}
3043		3314
…		…
3054	}	3325	}
3055		3326
3056	sub update {	3327	sub update {
3057	my ($self) = @_;	3328	my ($self) = @_;
3058		3329
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3061	}	3331	}
3062		3332
3063	sub add {	3333	sub add {
3064	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3065		3335
3066	for (my @widgets = @children; my $w = pop @widgets; ) {
3067	push @widgets, $w->children;
3068	$w->{root} = $self;
3069	$w->{visible} = $self->{visible} + 1;
3070	}
3071
3072	for my $child (@children) {
3073	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3074		3337	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3338
3080	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3081	}	3340	}
3082		3341
3083	sub remove {	3342	sub remove {
3084	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3085		3344
3086	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3087		3349
3088	while (@children) {	3350	while (@children) {
3089	my $w = pop @children;	3351	my $w = pop @children;
3090	push @children, $w->children;	3352	push @children, $w->children;
3091	$w->set_invisible;	3353	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3111	$_->()	3373	$_->()
3112	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3113	}	3375	}
3114		3376
3115	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
		3378	my %queue;
3116	my @queue;	3379	my @queue;
		3380	my $widget;
3117		3381
3118	for (;;) {	3382	outer:
3119	if ($self->{check_size}) {	3383	while () {
3120	#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
3121		3387
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3388	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3124	}	3392	}
3125		3393
		3394	while () {
		3395	@queue or last outer;
		3396
3126	my $widget = pop @queue || last;	3397	$widget = pop @{ $queue[-1] || [] }
3127		3398	and last;
3128	defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131	? @$widget{qw(user_w user_h)}
3132	: $widget->size_request;
3133
3134	if (delete $widget->{force_alloc}
3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137		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}) {
3138	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3140		3417
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3142		3419
3143	$widget->{parent}->check_size
3144	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	}
3145	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3146	}	3430	}
3147	}	3431	}
3148		3432
3149	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	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)};
3152		3441
3153	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3155		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
3156	$widget->{w} = $w;	3452	$widget->{w} = $w;
3157	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3158	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3159	}	3457	}
3160	}	3458	}
3161		3459
3162	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3163	$_->()	3461	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3165	}	3463	}
		3464
3166		3465
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3170		3469

Diff Legend

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