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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

…		…
9	use CFClient;	9	use CFClient;
10	use CFClient::Texture;	10	use CFClient::Texture;
11		11
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		13
		14	our $LAYOUT;
14	our $ROOT;	15	our $ROOT;
15	our $TOOLTIP;	16	our $TOOLTIP;
16	our $BUTTON_STATE;	17	our $BUTTON_STATE;
17		18
18	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
19		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		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};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
20	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
21	if (!$GRAB) {	47	if (!$GRAB) {
22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
24
25	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
26	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
27		54
28	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
29		56
30	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
31		58
32	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
33	$TOOLTIP->show;	60	$TOOLTIP->show;
34
35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	if $x + $TOOLTIP->{w} > $::WIDTH;
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	61	}
44		62
45	return;	63	return;
46	}	64	}
47	}	65	}
…		…
153	sub rescale_widgets {	171	sub rescale_widgets {
154	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
155		173
156	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
157	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
158	$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.]+$/;
159	$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};
160	$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};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$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.]+$/;
163	$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};
164	$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};
165	$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
166	}	189	}
167	}	190	}
168		191
169	reconfigure_widgets;	192	reconfigure_widgets;
170	}	193	}
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		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};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {	263
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
225	},	265
226	);	266	$_->set_visible for $self->children;
227	}	267	}
228		268
229	sub set_invisible {	269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
231		271
232	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
233		275
234	delete $self->{root};	276	delete $self->{root};
235	delete $self->{visible};	277	delete $self->{visible};
236		278
237	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
238	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
239		281
240	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
241	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
242		284
243	$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;
244	}	305	}
245		306
246	sub hide {	307	sub hide {
247	my ($self) = @_;	308	my ($self) = @_;
248		309
…		…
250		311
251	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
252	if $self->{parent};	313	if $self->{parent};
253	}	314	}
254		315
255	sub move {	316	sub move_abs {
256	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
257		318
258	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
259	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
260	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
261		322
262	$self->update;	323	$self->update;
263	}	324	}
264		325
265	sub set_size {	326	sub set_size {
266	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
267		328
268	$self->{user_w} = $w;	329	$self->{force_w} = $w;
269	$self->{user_h} = $h;	330	$self->{force_h} = $h;
270		331
271	$self->check_size;	332	$self->realloc;
272	}	333	}
273		334
274	sub size_request {	335	sub size_request {
275	require Carp;	336	require Carp;
276	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
278		339
279	sub configure {	340	sub configure {
280	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
281		342
282	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
283	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
284	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
285		348
286	# use alignment to adjust x, y	349	# use alignment to adjust x, y
287		350
288	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
289	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
290
291	($w, $h) = ($w2, $h2);
292	}	353	}
293		354
294	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
295	$self->{x} = $x;	356	$self->{x} = $x;
296	$self->{y} = $y;	357	$self->{y} = $y;
297	$self->update;	358	$self->update;
298	}	359	}
299		360
300	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301	$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;
302	}	368	}
303	}	369	}
304		370
305	sub size_allocate {	371	sub size_allocate {
306	# nothing to be done	372	# nothing to be done
307	}
308
309	sub reconfigure {
310	my ($self) = @_;
311
312	$self->check_size (1);
313	$self->update;
314	}	373	}
315		374
316	sub children {	375	sub children {
317	}	376	}
318		377
…		…
396	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
397	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
398	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
399	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
400	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	}
401		530
402	sub draw {	531	sub draw {
403	my ($self) = @_;	532	my ($self) = @_;
404		533
405	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
422	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
423	glEnd;	552	glEnd;
424	glDisable GL_BLEND;	553	glDisable GL_BLEND;
425	}	554	}
426		555
427	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
428	glPushMatrix;	557	glPushMatrix;
429	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
430	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
431	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
432	glVertex 0 , 0;	561	glVertex 0 , 0;
…		…
443	my ($self) = @_;	572	my ($self) = @_;
444		573
445	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
446	}	575	}
447		576
448	sub find_widget {
449	my ($self, $x, $y) = @_;
450
451	return () unless $self->{can_events};
452
453	return $self
454	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457	()
458	}
459
460	sub set_parent {
461	my ($self, $parent) = @_;
462
463	Scalar::Util::weaken ($self->{parent} = $parent);
464
465	$self->{root} = $parent->{root};
466	$self->{visible} = $parent->{visible} + 1;
467
468	# TODO: req_w _does_change after ->reconfigure
469	$self->check_size
470	unless exists $self->{req_w};
471
472	$self->show;
473	}
474
475	sub check_size {
476	my ($self, $forced) = @_;
477
478	$self->{force_alloc} = 1 if $forced;
479	$CFClient::UI::ROOT->{check_size}{$self} = $self;
480	}
481
482	sub update {
483	my ($self) = @_;
484
485	$self->{parent}->update
486	if $self->{parent};
487	}
488
489	sub connect {
490	my ($self, $signal, $cb) = @_;
491
492	push @{ $self->{signal_cb}{$signal} }, $cb;
493	}
494
495	sub _emit {
496	my ($self, $signal, @args) = @_;
497
498	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499	}
500
501	sub emit {
502	my ($self, $signal, @args) = @_;
503
504	$self->_emit ($signal, @args)
505	|| $self->$signal (@args);
506	}
507
508	sub DESTROY {	577	sub DESTROY {
509	my ($self) = @_;	578	my ($self) = @_;
510		579
511	delete $WIDGET{$self+0};	580	delete $WIDGET{$self+0};
512	#$self->deactivate;	581	#$self->deactivate;
…		…
568	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
569	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
570	}	639	}
571		640
572	sub size_request {	641	sub size_request {
573	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
574	}	645	}
575		646
576	sub draw { }	647	sub draw { }
577		648
578	#############################################################################	649	#############################################################################
…		…
607	$self->{children} = [	678	$self->{children} = [
608	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
609	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
610	];	681	];
611		682
612	$self->check_size (1);	683	$self->realloc;
613	$self->update;
614	}	684	}
615		685
616	sub children {	686	sub children {
617	@{ $_[0]{children} }	687	@{ $_[0]{children} }
618	}	688	}
…		…
623	delete $child->{parent};	693	delete $child->{parent};
624	$child->hide;	694	$child->hide;
625		695
626	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627		697
628	$self->check_size (1);	698	$self->realloc;
629	$self->update;
630	}	699	}
631		700
632	sub clear {	701	sub clear {
633	my ($self) = @_;	702	my ($self) = @_;
634		703
…		…
638	for (@$children) {	707	for (@$children) {
639	delete $_->{parent};	708	delete $_->{parent};
640	$_->hide;	709	$_->hide;
641	}	710	}
642		711
643	$self->check_size;	712	$self->realloc;
644	$self->update;
645	}	713	}
646		714
647	sub find_widget {	715	sub find_widget {
648	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
649		717
…		…
786	}	854	}
787		855
788	sub size_request {	856	sub size_request {
789	my ($self) = @_;	857	my ($self) = @_;
790		858
791	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792		860
793	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
794	}	865	}
795		866
796	sub size_allocate {	867	sub size_allocate {
797	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
798		869
		870	my $child = $self->child;
		871
799	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801		874
802	$self->child->configure (0, 0, $w, $h);	875	$self->child->configure (0, 0, $w, $h);
803	$self->update;	876	$self->update;
804	}	877	}
805		878
…		…
858	my $class = shift;	931	my $class = shift;
859		932
860	my $self;	933	my $self;
861		934
862	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
863	vertical => 1,	936	vertical => 1,
864	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
865	connect_changed => sub {	938	on_changed => sub {
866	$self->{vp}->set_offset (0, $_[1]);	939	$self->{vp}->set_offset (0, $_[1]);
867	},	940	},
868	;	941	;
869		942
870	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
…		…
948		1021
949	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
950		1023
951	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
952		1025
953	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 =
954	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955	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);
956		1033
957	sub new {	1034	sub new {
958	my $class = shift;	1035	my $class = shift;
959
960	# TODO: user_x, user_y, overwrite moveto?
961		1036
962	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
963	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
964	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
965	border => 0.6,	1040	border => 0.6,
966	is_toplevel => 1,
967	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
968	@_	1044	@_
969	);	1045	);
970		1046
971	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
972	align => 0,	1048	align => 0,
…		…
1025	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
1026		1102
1027	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
1028	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
1029		1105
1030	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
1032	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033	$self->check_size;
1034	};	1111	};
1035		1112
1036	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1037	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1040	$self->{motion} = sub {	1117	$self->{motion} = sub {
1041	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1042		1119
1043	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1044		1121
1045	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046	$self->update;
1047	};	1123	};
1048	}	1124	}
1049	}	1125	}
1050		1126
1051	sub button_up {	1127	sub button_up {
…		…
1070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071		1147
1072	my $border = $self->border;	1148	my $border = $self->border;
1073		1149
1074	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1075	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1076	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079		1155
1080	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1082		1158
1083	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1084	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1085	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1086
1087	glColor @{ $self->{bg} };
1088
1089	$bg->{s} = $rep_x;
1090	$bg->{t} = $rep_y;
1091	$bg->{wrap_mode} = 1;
1092	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093	}	1164	}
1094		1165
1095	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1096		1167
…		…
1126	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1127		1198
1128	$child->set_parent ($self);	1199	$child->set_parent ($self);
1129	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1130		1201
1131	$self->check_size (1);	1202	$self->realloc;
1132	}	1203	}
1133		1204
1134	# 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?
1135	sub clear {	1206	sub clear {
1136	my ($self) = @_;	1207	my ($self) = @_;
…		…
1141	for (@children) {	1212	for (@children) {
1142	delete $_->{parent};	1213	delete $_->{parent};
1143	$_->hide;	1214	$_->hide;
1144	}	1215	}
1145		1216
1146	$self->check_size (1);	1217	$self->realloc;
1147	$self->update;
1148	}	1218	}
1149		1219
1150	sub get_wh {	1220	sub get_wh {
1151	my ($self) = @_;	1221	my ($self) = @_;
1152		1222
…		…
1248	}	1318	}
1249	}	1319	}
1250		1320
1251	#############################################################################	1321	#############################################################################
1252		1322
1253	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1254
1255	# TODO: wrap into common Box base class
1256		1324
1257	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1258		1326
1259	sub size_request {	1327	sub size_request {
1260	my ($self) = @_;	1328	my ($self) = @_;
1261		1329
1262	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1263		1331	? (
1264	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1265	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266	(List::Util::max map $_->[1], @alloc),	1334	)
1267	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1268	}	1339	}
1269		1340
1270	sub size_allocate {	1341	sub size_allocate {
1271	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1272		1343
1273	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1274
1275	my $children = $self->{children};	1345	my $children = $self->{children};
1276		1346
1277	my @h = map $_->{req_w}, @$children;	1347	my @req;
1278		1348
1279	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1280		1350	@req = ($space / (@$children || 1)) x @$children;
1281	if ($req_h > $h) {
1282	# ah well, not enough space
1283	$_ *= $h / $req_h for @h;
1284	} 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 {
1285	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286	$exp ||= 1;
1287		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1288	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1289	my $child = $children->[$_];
1290
1291	my $alloc_h = $h[$_];
1292	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293	$h[$_] = $alloc_h;
1294	}	1365	}
1295	}	1366	}
1296		1367
1297	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1298		1369
1299	my $y = 0;	1370	my $pos = 0;
1300	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1301	my $child = $children->[$_];
1302	my $h = $h[$_];	1372	my $alloc = $req[$_];
1303	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304		1374
1305	$y += $h;	1375	$pos += $alloc;
1306	}	1376	}
1307		1377
1308	1	1378	1
1309	}	1379	}
1310		1380
1311	#############################################################################	1381	#############################################################################
1312		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
1313	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1314		1399
1315	# TODO: wrap into common Box base class
1316
1317	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1318		1401
1319	sub size_request {	1402	sub new {
1320	my ($self) = @_;	1403	my $class = shift;
1321		1404
1322	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1323		1406	vertical => 1,
1324	(	1407	@_,
1325	(List::Util::max map $_->[0], @alloc),
1326	(List::Util::sum map $_->[1], @alloc),
1327	)	1408	)
1328	}
1329
1330	sub size_allocate {
1331	my ($self, $w, $h) = @_;
1332
1333	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335	my $children = $self->{children};
1336
1337	my @h = map $_->{req_h}, @$children;
1338
1339	my $req_h = List::Util::sum @h;
1340
1341	if ($req_h > $h) {
1342	# ah well, not enough space
1343	$_ *= $h / $req_h for @h;
1344	} else {
1345	my $exp = List::Util::sum map $_->{expand}, @$children;
1346	$exp ||= 1;
1347
1348	for (0 .. $#$children) {
1349	my $child = $children->[$_];
1350
1351	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352	}
1353	}
1354
1355	CFClient::UI::harmonize \@h;
1356
1357	my $y = 0;
1358	for (0 .. $#$children) {
1359	my $child = $children->[$_];
1360	my $h = $h[$_];
1361	$child->configure (0, $y, $w, $h);
1362
1363	$y += $h;
1364	}
1365
1366	1
1367	}	1409	}
1368		1410
1369	#############################################################################	1411	#############################################################################
1370		1412
1371	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1388	ellipsise => 3, # end	1430	ellipsise => 3, # end
1389	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1390	fontsize => 1,	1432	fontsize => 1,
1391	align => -1,	1433	align => -1,
1392	valign => -1,	1434	valign => -1,
1393	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1394	can_events => 0,	1437	can_events => 0,
1395	%arg	1438	%arg
1396	);	1439	);
1397		1440
1398	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1434	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1435		1478
1436	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1438		1481
		1482	$self->realloc;
1439	$self->update;	1483	$self->update;
1440	$self->check_size;
1441	}	1484	}
1442		1485
1443	sub set_markup {	1486	sub set_markup {
1444	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1445		1488
…		…
1449	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450		1493
1451	$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;
1452	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1453		1496
		1497	$self->realloc;
1454	$self->update;	1498	$self->update;
1455	$self->check_size;
1456	}	1499	}
1457		1500
1458	sub size_request {	1501	sub size_request {
1459	my ($self) = @_;	1502	my ($self) = @_;
1460		1503
…		…
1474		1517
1475	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1476	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1477	}	1520	}
1478		1521
1479	(	1522	($w, $h)
1480	$w + $self->{padding} * 2,
1481	$h + $self->{padding} * 2,
1482	)
1483	}	1523	}
1484		1524
1485	sub size_allocate {	1525	sub size_allocate {
1486	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1487		1527
1488	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489	}	1530	}
1490		1531
1491	sub set_fontsize {	1532	sub set_fontsize {
1492	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1493		1534
1494	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1495	delete $self->{texture};	1536	delete $self->{texture};
1496		1537
1497	$self->update;	1538	$self->realloc;
1498	$self->check_size;
1499	}	1539	}
1500		1540
1501	sub _draw {	1541	sub _draw {
1502	my ($self) = @_;	1542	my ($self) = @_;
1503		1543
…		…
1511	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513		1553
1514	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1515		1555
1516	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1519		1559
1520	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1523		1563
1524	$tex	1564	$tex
1525	};	1565	};
1526		1566
…		…
1583	sub set_text {	1623	sub set_text {
1584	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1585		1625
1586	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1587	$self->_set_text ($text);	1627	$self->_set_text ($text);
1588	$self->update;	1628
1589	$self->check_size;	1629	$self->realloc;
1590	}	1630	}
1591		1631
1592	sub get_text {	1632	sub get_text {
1593	$_[0]{text}	1633	$_[0]{text}
1594	}	1634	}
…		…
1627	} elsif ($uni) {	1667	} elsif ($uni) {
1628	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1629	}	1669	}
1630		1670
1631	$self->_set_text ($text);	1671	$self->_set_text ($text);
1632	$self->update;	1672
1633	$self->check_size;	1673	$self->realloc;
1634	}	1674	}
1635		1675
1636	sub focus_in {	1676	sub focus_in {
1637	my ($self) = @_;	1677	my ($self) = @_;
1638		1678
…		…
1765		1805
1766	sub new {	1806	sub new {
1767	my $class = shift;	1807	my $class = shift;
1768		1808
1769	$class->SUPER::new (	1809	$class->SUPER::new (
1770	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1771	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1772	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1773	can_hover => 1,	1814	can_hover => 1,
1774	align => 0,	1815	align => 0,
1775	valign => 0,	1816	valign => 0,
…		…
1822		1863
1823	sub new {	1864	sub new {
1824	my $class = shift;	1865	my $class = shift;
1825		1866
1826	$class->SUPER::new (	1867	$class->SUPER::new (
1827	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1828	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1829	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1830	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1831	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1832	state => 0,	1874	state => 0,
…		…
1836	}	1878	}
1837		1879
1838	sub size_request {	1880	sub size_request {
1839	my ($self) = @_;	1881	my ($self) = @_;
1840		1882
1841	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1842	}	1884	}
1843		1885
1844	sub button_down {	1886	sub button_down {
1845	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1846		1888
1847	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1850	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1851	}	1893	}
1852	}	1894	}
1853		1895
1854	sub _draw {	1896	sub _draw {
1855	my ($self) = @_;	1897	my ($self) = @_;
1856		1898
1857	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1858		1900
1859	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860		1902
1861	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;
1862		1906
1863	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864		1908
1865	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1866		1910
…		…
2131	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2132	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2133	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2134	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2135	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2136	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2137	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2138	vertical => 0,	2182	vertical => 0,
2139	can_hover => 1,	2183	can_hover => 1,
2140	inner_pad => 0.02,	2184	inner_pad => 0.02,
2141	@_	2185	@_
2142	);	2186	);
…		…
2145	$self->update;	2189	$self->update;
2146		2190
2147	$self	2191	$self
2148	}	2192	}
2149		2193
		2194	sub changed { }
		2195
2150	sub set_range {	2196	sub set_range {
2151	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2152		2198
2153	($range, $self->{range}) = ($self->{range}, $range);	2199	($range, $self->{range}) = ($self->{range}, $range);
2154		2200
…		…
2180	}	2226	}
2181		2227
2182	sub size_request {	2228	sub size_request {
2183	my ($self) = @_;	2229	my ($self) = @_;
2184		2230
2185	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2186	my $h = $self->{req_h};
2187
2188	$self->{vertical} ? ($h, $w) : ($w, $h)
2189	}	2232	}
2190		2233
2191	sub button_down {	2234	sub button_down {
2192	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2193		2236
…		…
2544		2587
2545	sub new {	2588	sub new {
2546	my $class = shift;	2589	my $class = shift;
2547		2590
2548	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2549	state => 0,	2592	state => 0,
2550	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2551	@_	2594	@_
2552	);	2595	);
2553		2596
2554	if ($self->{state}) {
2555	$self->{state} = 0;
2556	$self->toggle_flopper;
2557	}
2558
2559	$self	2597	$self
2560	}	2598	}
2561		2599
2562	sub toggle_flopper {	2600	sub toggle_flopper {
2563	my ($self) = @_;	2601	my ($self) = @_;
2564		2602
2565	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2566	if ($self->{state} = !$self->{state}) {
2567	$CFClient::UI::ROOT->add ($self->{other});
2568	$self->{other}->move ($self->coord2global (0, $self->{h}));
2569	$self->_emit ("open");
2570	} else {
2571	$CFClient::UI::ROOT->remove ($self->{other});
2572	$self->_emit ("close");
2573	}
2574
2575	$self->_emit (changed => $self->{state});
2576	}	2604	}
2577		2605
2578	#############################################################################	2606	#############################################################################
2579		2607
2580	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2593	}	2621	}
2594		2622
2595	sub set_tooltip_from {	2623	sub set_tooltip_from {
2596	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2597		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
2598	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2599	markup => $widget->{tooltip},	2636	markup => $tooltip,
2600	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601	fontsize => 0.8,	2638	fontsize => 0.8,
2602	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2603	ellipsise => 0,	2640	ellipsise => 0,
2604	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2615		2652
2616	sub size_allocate {	2653	sub size_allocate {
2617	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2618		2655
2619	$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	});
2620	}	2675	}
2621		2676
2622	sub _draw {	2677	sub _draw {
2623	my ($self) = @_;	2678	my ($self) = @_;
2624		2679
…		…
2641	glVertex $w, $h;	2696	glVertex $w, $h;
2642	glVertex $w, 0;	2697	glVertex $w, 0;
2643	glEnd;	2698	glEnd;
2644		2699
2645	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2646	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2647	}	2703	}
2648		2704
2649	#############################################################################	2705	#############################################################################
2650		2706
…		…
2726	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2727	}	2783	}
2728		2784
2729	#############################################################################	2785	#############################################################################
2730		2786
2731	package CFClient::UI::Inventory;
2732
2733	our @ISA = CFClient::UI::ScrolledWindow::;
2734
2735	sub new {
2736	my $class = shift;
2737
2738	my $self = $class->SUPER::new (
2739	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740	@_,
2741	);
2742
2743	$self
2744	}
2745
2746	sub set_items {
2747	my ($self, $items) = @_;
2748
2749	$self->{scrolled}->clear;
2750	return unless $items;
2751
2752	my @items = sort {
2753	($a->{type} <=> $b->{type})
2754	or ($a->{name} cmp $b->{name})
2755	} @$items;
2756
2757	$self->{real_items} = \@items;
2758
2759	my $row = 0;
2760	for my $item (@items) {
2761	CFClient::Item::update_widgets $item;
2762
2763	$self->{scrolled}->add (0, $row, $item->{face_widget});
2764	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2765	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767	$row++;
2768	}
2769	}
2770
2771	sub size_request {
2772	my ($self) = @_;
2773	($self->{req_w}, $self->{req_h});
2774	}
2775
2776	#############################################################################
2777
2778	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2779		2788
2780	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2781		2790
2782	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2820	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2821	$GRAB = $self;	2830	$GRAB = $self;
2822	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2823		2832
2824	$self->show;	2833	$self->show;
2825	$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);
2826	}	2835	}
2827		2836
2828	sub mouse_motion {	2837	sub mouse_motion {
2829	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2830		2839
…		…
2955	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
2956	}	2965	}
2957		2966
2958	#############################################################################	2967	#############################################################################
2959		2968
2960	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
2961		2970
2962	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964	use CFClient::OpenGL;
2965		2972
2966	sub new {	2973	sub new {
2967	my $class = shift;	2974	my $class = shift;
2968		2975
2969	$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 (
2970	visible => 1,	3270	visible => 1,
2971	@_,	3271	@_,
2972	)	3272	);
2973	}
2974		3273
2975	sub configure {	3274	Scalar::Util::weaken ($self->{root} = $self);
2976	my ($self, $x, $y, $w, $h) = @_;
2977		3275
2978	$self->{w} = $w;	3276	$self
2979	$self->{h} = $h;
2980	}
2981
2982	sub check_size {
2983	my ($self) = @_;
2984
2985	$self->size_allocate ($self->{w}, $self->{h})
2986	if $self->{w};
2987	}	3277	}
2988		3278
2989	sub size_request {	3279	sub size_request {
2990	my ($self) = @_;	3280	my ($self) = @_;
2991		3281
2992	($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
2993	}	3297	}
2994		3298
2995	sub size_allocate {	3299	sub size_allocate {
2996	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
2997		3301
2998	for my $child ($self->children) {	3302	for my $child ($self->children) {
2999	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)};
3000		3304
3001	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3002	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3003		3307
3004	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3005	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3006
3007	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009		3310
3010	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3011	}	3312	}
3012	}	3313	}
3013		3314
…		…
3024	}	3325	}
3025		3326
3026	sub update {	3327	sub update {
3027	my ($self) = @_;	3328	my ($self) = @_;
3028		3329
3029	$self->check_size;
3030	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3031	}	3331	}
3032		3332
3033	sub add {	3333	sub add {
3034	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3035		3335
3036	for (my @widgets = @children; my $w = pop @widgets; ) {
3037	push @widgets, $w->children;
3038	$w->{root} = $self;
3039	$w->{visible} = $self->{visible} + 1;
3040	}
3041
3042	for my $child (@children) {
3043	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3044		3337	for @children;
3045	# integerise window positions
3046	$child->{x} = int $child->{x};
3047	$child->{y} = int $child->{y};
3048	}
3049		3338
3050	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3051	}	3340	}
3052		3341
3053	sub remove {	3342	sub remove {
3054	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3055		3344
3056	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3057		3349
3058	while (@children) {	3350	while (@children) {
3059	my $w = pop @children;	3351	my $w = pop @children;
3060	push @children, $w->children;	3352	push @children, $w->children;
3061	$w->set_invisible;	3353	$w->set_invisible;
…		…
3080	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3081	$_->()	3373	$_->()
3082	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3083	}	3375	}
3084		3376
3085	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3086	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3087		3381
3088	for (;;) {	3382	outer:
3089	if ($self->{check_size}) {	3383	while () {
3090	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3091	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3092	for values %{delete $self->{check_size}}	3386	$widget->{visible} or next; # do not resize invisible widgets
		3387
		3388	$queue{$widget+0}++ and next; # duplicates are common
		3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3093	}	3392	}
3094		3393
3095	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3096		3396
3097	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3098	? @$widget{qw(user_w user_h)}	3398	and last;
3099	: $widget->size_request;
3100
3101	if (delete $widget->{force_alloc}
3102	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104		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}) {
3105	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3106	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3107		3417
3108	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3109		3419
3110	$widget->{parent}->check_size
3111	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	}
3112	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3113	}	3430	}
3114	}	3431	}
3115		3432
3116	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3117	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3118	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)};
3119		3441
3120	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3121	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3122		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
3123	$widget->{w} = $w;	3452	$widget->{w} = $w;
3124	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3125	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3126	}	3457	}
3127	}	3458	}
3128		3459
3129	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3130	$_->()	3461	$_->()
3131	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3132	}	3463	}
		3464
3133		3465
3134	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3137		3469

Diff Legend

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