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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		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
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$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.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}
306
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}	373	}
313		374
314	sub children {	375	sub children {
315	}	376	}
316		377
…		…
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398	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	}
399		530
400	sub draw {	531	sub draw {
401	my ($self) = @_;	532	my ($self) = @_;
402		533
403	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
420	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
421	glEnd;	552	glEnd;
422	glDisable GL_BLEND;	553	glDisable GL_BLEND;
423	}	554	}
424		555
425	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	557	glPushMatrix;
427	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	561	glVertex 0 , 0;
…		…
441	my ($self) = @_;	572	my ($self) = @_;
442		573
443	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
444	}	575	}
445		576
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	577	sub DESTROY {
504	my ($self) = @_;	578	my ($self) = @_;
505		579
506	delete $WIDGET{$self+0};	580	delete $WIDGET{$self+0};
507	#$self->deactivate;	581	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
565	}	639	}
566		640
567	sub size_request {	641	sub size_request {
568	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
569	}	645	}
570		646
571	sub draw { }	647	sub draw { }
572		648
573	#############################################################################	649	#############################################################################
…		…
602	$self->{children} = [	678	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
605	];	681	];
606		682
607	$self->check_size (1);	683	$self->realloc;
608	$self->update;
609	}	684	}
610		685
611	sub children {	686	sub children {
612	@{ $_[0]{children} }	687	@{ $_[0]{children} }
613	}	688	}
…		…
618	delete $child->{parent};	693	delete $child->{parent};
619	$child->hide;	694	$child->hide;
620		695
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		697
623	$self->check_size (1);	698	$self->realloc;
624	$self->update;
625	}	699	}
626		700
627	sub clear {	701	sub clear {
628	my ($self) = @_;	702	my ($self) = @_;
629		703
…		…
633	for (@$children) {	707	for (@$children) {
634	delete $_->{parent};	708	delete $_->{parent};
635	$_->hide;	709	$_->hide;
636	}	710	}
637		711
638	$self->check_size;	712	$self->realloc;
639	$self->update;
640	}	713	}
641		714
642	sub find_widget {	715	sub find_widget {
643	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
644		717
…		…
781	}	854	}
782		855
783	sub size_request {	856	sub size_request {
784	my ($self) = @_;	857	my ($self) = @_;
785		858
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		860
788	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
789	}	865	}
790		866
791	sub size_allocate {	867	sub size_allocate {
792	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
793		869
		870	my $child = $self->child;
		871
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		874
797	$self->child->configure (0, 0, $w, $h);	875	$self->child->configure (0, 0, $w, $h);
798	$self->update;	876	$self->update;
799	}	877	}
800		878
…		…
853	my $class = shift;	931	my $class = shift;
854		932
855	my $self;	933	my $self;
856		934
857	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
858	vertical => 1,	936	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	938	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	939	$self->{vp}->set_offset (0, $_[1]);
862	},	940	},
863	;	941	;
864		942
865	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
…		…
871	$self->{vp}->add ($self->{scrolled});	949	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	950	$self->add ($self->{vp});
873	$self->add ($self->{slider});	951	$self->add ($self->{slider});
874		952
875	$self	953	$self
		954	}
		955
		956	sub update {
		957	my ($self) = @_;
		958
		959	$self->SUPER::update;
		960
		961	# todo: overwrite size_allocate of child
		962	my $child = $self->{vp}->child;
		963	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	964	}
877		965
878	sub size_allocate {	966	sub size_allocate {
879	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
880		968
…		…
933		1021
934	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
935		1023
936	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
937		1025
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	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);
941		1033
942	sub new {	1034	sub new {
943	my $class = shift;	1035	my $class = shift;
944
945	# TODO: user_x, user_y, overwrite moveto?
946		1036
947	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1040	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
953	@_	1044	@_
954	);	1045	);
955		1046
956	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
957	align => 0,	1048	align => 0,
…		…
1010	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
1011		1102
1012	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
1014		1105
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1111	};
1020		1112
1021	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1117	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1027		1119
1028	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1029		1121
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1123	};
1033	}	1124	}
1034	}	1125	}
1035		1126
1036	sub button_up {	1127	sub button_up {
…		…
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1147
1057	my $border = $self->border;	1148	my $border = $self->border;
1058		1149
1059	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1155
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1067		1158
1068	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1164	}
1079		1165
1080	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1081		1167
…		…
1111	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1112		1198
1113	$child->set_parent ($self);	1199	$child->set_parent ($self);
1114	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1115		1201
1116	$self->check_size (1);	1202	$self->realloc;
1117	}	1203	}
1118		1204
1119	# 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?
1120	sub clear {	1206	sub clear {
1121	my ($self) = @_;	1207	my ($self) = @_;
…		…
1126	for (@children) {	1212	for (@children) {
1127	delete $_->{parent};	1213	delete $_->{parent};
1128	$_->hide;	1214	$_->hide;
1129	}	1215	}
1130		1216
1131	$self->check_size (1);	1217	$self->realloc;
1132	$self->update;
1133	}	1218	}
1134		1219
1135	sub get_wh {	1220	sub get_wh {
1136	my ($self) = @_;	1221	my ($self) = @_;
1137		1222
…		…
1168	sub size_allocate {	1253	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1254	my ($self, $w, $h) = @_;
1170		1255
1171	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1172		1257
1173	my $req_w = sum @$ws;	1258	my $req_w = (sum @$ws) || 1;
1174	my $req_h = sum @$hs;	1259	my $req_h = (sum @$hs) || 1;
1175		1260
1176	# TODO: nicer code && do row_expand	1261	# TODO: nicer code && do row_expand
1177	my @col_expand = @{$self->{col_expand}};	1262	my @col_expand = @{$self->{col_expand}};
1178	@col_expand = (1) x @$ws unless @col_expand;	1263	@col_expand = (1) x @$ws unless @col_expand;
1179	my $col_expand = (sum @col_expand) || 1;	1264	my $col_expand = (sum @col_expand) || 1;
…		…
1233	}	1318	}
1234	}	1319	}
1235		1320
1236	#############################################################################	1321	#############################################################################
1237		1322
1238	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1239
1240	# TODO: wrap into common Box base class
1241		1324
1242	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1243		1326
1244	sub size_request {	1327	sub size_request {
1245	my ($self) = @_;	1328	my ($self) = @_;
1246		1329
1247	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1248		1331	? (
1249	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1250	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251	(List::Util::max map $_->[1], @alloc),	1334	)
1252	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1253	}	1339	}
1254		1340
1255	sub size_allocate {	1341	sub size_allocate {
1256	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1257		1343
1258	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1259
1260	my $children = $self->{children};	1345	my $children = $self->{children};
1261		1346
1262	my @h = map $_->{req_w}, @$children;	1347	my @req;
1263		1348
1264	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1265		1350	@req = ($space / (@$children || 1)) x @$children;
1266	if ($req_h > $h) {
1267	# ah well, not enough space
1268	$_ *= $h / $req_h for @h;
1269	} 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 {
1270	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271	$exp ||= 1;
1272		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1273	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1274	my $child = $children->[$_];
1275
1276	my $alloc_h = $h[$_];
1277	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278	$h[$_] = $alloc_h;
1279	}	1365	}
1280	}	1366	}
1281		1367
1282	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1283		1369
1284	my $y = 0;	1370	my $pos = 0;
1285	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1286	my $child = $children->[$_];
1287	my $h = $h[$_];	1372	my $alloc = $req[$_];
1288	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289		1374
1290	$y += $h;	1375	$pos += $alloc;
1291	}	1376	}
1292		1377
1293	1	1378	1
1294	}	1379	}
1295		1380
1296	#############################################################################	1381	#############################################################################
1297		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
1298	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1299		1399
1300	# TODO: wrap into common Box base class
1301
1302	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1303		1401
1304	sub size_request {	1402	sub new {
1305	my ($self) = @_;	1403	my $class = shift;
1306		1404
1307	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1308		1406	vertical => 1,
1309	(	1407	@_,
1310	(List::Util::max map $_->[0], @alloc),
1311	(List::Util::sum map $_->[1], @alloc),
1312	)	1408	)
1313	}
1314
1315	sub size_allocate {
1316	my ($self, $w, $h) = @_;
1317
1318	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320	my $children = $self->{children};
1321
1322	my @h = map $_->{req_h}, @$children;
1323
1324	my $req_h = List::Util::sum @h;
1325
1326	if ($req_h > $h) {
1327	# ah well, not enough space
1328	$_ *= $h / $req_h for @h;
1329	} else {
1330	my $exp = List::Util::sum map $_->{expand}, @$children;
1331	$exp ||= 1;
1332
1333	for (0 .. $#$children) {
1334	my $child = $children->[$_];
1335
1336	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337	}
1338	}
1339
1340	CFClient::UI::harmonize \@h;
1341
1342	my $y = 0;
1343	for (0 .. $#$children) {
1344	my $child = $children->[$_];
1345	my $h = $h[$_];
1346	$child->configure (0, $y, $w, $h);
1347
1348	$y += $h;
1349	}
1350
1351	1
1352	}	1409	}
1353		1410
1354	#############################################################################	1411	#############################################################################
1355		1412
1356	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1373	ellipsise => 3, # end	1430	ellipsise => 3, # end
1374	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1375	fontsize => 1,	1432	fontsize => 1,
1376	align => -1,	1433	align => -1,
1377	valign => -1,	1434	valign => -1,
1378	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1379	can_events => 0,	1437	can_events => 0,
1380	%arg	1438	%arg
1381	);	1439	);
1382		1440
1383	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1419	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1420		1478
1421	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1423		1481
		1482	$self->realloc;
1424	$self->update;	1483	$self->update;
1425	$self->check_size;
1426	}	1484	}
1427		1485
1428	sub set_markup {	1486	sub set_markup {
1429	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1430		1488
…		…
1434	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435		1493
1436	$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;
1437	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1438		1496
		1497	$self->realloc;
1439	$self->update;	1498	$self->update;
1440	$self->check_size;
1441	}	1499	}
1442		1500
1443	sub size_request {	1501	sub size_request {
1444	my ($self) = @_;	1502	my ($self) = @_;
1445		1503
…		…
1459		1517
1460	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1461	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1462	}	1520	}
1463		1521
1464	(	1522	($w, $h)
1465	$w + $self->{padding} * 2,
1466	$h + $self->{padding} * 2,
1467	)
1468	}	1523	}
1469		1524
1470	sub size_allocate {	1525	sub size_allocate {
1471	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1472		1527
1473	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1474	}	1530	}
1475		1531
1476	sub set_fontsize {	1532	sub set_fontsize {
1477	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1478		1534
1479	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1480	delete $self->{texture};	1536	delete $self->{texture};
1481		1537
1482	$self->update;	1538	$self->realloc;
1483	$self->check_size;
1484	}	1539	}
1485		1540
1486	sub _draw {	1541	sub _draw {
1487	my ($self) = @_;	1542	my ($self) = @_;
1488		1543
…		…
1496	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498		1553
1499	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1500		1555
1501	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1504		1559
1505	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1508		1563
1509	$tex	1564	$tex
1510	};	1565	};
1511		1566
…		…
1568	sub set_text {	1623	sub set_text {
1569	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1570		1625
1571	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1572	$self->_set_text ($text);	1627	$self->_set_text ($text);
1573	$self->update;	1628
1574	$self->check_size;	1629	$self->realloc;
1575	}	1630	}
1576		1631
1577	sub get_text {	1632	sub get_text {
1578	$_[0]{text}	1633	$_[0]{text}
1579	}	1634	}
…		…
1612	} elsif ($uni) {	1667	} elsif ($uni) {
1613	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1614	}	1669	}
1615		1670
1616	$self->_set_text ($text);	1671	$self->_set_text ($text);
1617	$self->update;	1672
1618	$self->check_size;	1673	$self->realloc;
1619	}	1674	}
1620		1675
1621	sub focus_in {	1676	sub focus_in {
1622	my ($self) = @_;	1677	my ($self) = @_;
1623		1678
…		…
1750		1805
1751	sub new {	1806	sub new {
1752	my $class = shift;	1807	my $class = shift;
1753		1808
1754	$class->SUPER::new (	1809	$class->SUPER::new (
1755	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1756	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1757	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1758	can_hover => 1,	1814	can_hover => 1,
1759	align => 0,	1815	align => 0,
1760	valign => 0,	1816	valign => 0,
…		…
1807		1863
1808	sub new {	1864	sub new {
1809	my $class = shift;	1865	my $class = shift;
1810		1866
1811	$class->SUPER::new (	1867	$class->SUPER::new (
1812	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1813	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1814	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1815	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1816	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1817	state => 0,	1874	state => 0,
…		…
1821	}	1878	}
1822		1879
1823	sub size_request {	1880	sub size_request {
1824	my ($self) = @_;	1881	my ($self) = @_;
1825		1882
1826	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1827	}	1884	}
1828		1885
1829	sub button_down {	1886	sub button_down {
1830	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1831		1888
1832	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1835	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1836	}	1893	}
1837	}	1894	}
1838		1895
1839	sub _draw {	1896	sub _draw {
1840	my ($self) = @_;	1897	my ($self) = @_;
1841		1898
1842	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1843		1900
1844	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845		1902
1846	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;
1847		1906
1848	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849		1908
1850	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1851		1910
…		…
2116	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2117	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2118	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2119	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2120	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2121	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2122	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2123	vertical => 0,	2182	vertical => 0,
2124	can_hover => 1,	2183	can_hover => 1,
2125	inner_pad => 0.02,	2184	inner_pad => 0.02,
2126	@_	2185	@_
2127	);	2186	);
…		…
2130	$self->update;	2189	$self->update;
2131		2190
2132	$self	2191	$self
2133	}	2192	}
2134		2193
		2194	sub changed { }
		2195
2135	sub set_range {	2196	sub set_range {
2136	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2137		2198
2138	$self->{range} = $range;	2199	($range, $self->{range}) = ($self->{range}, $range);
2139		2200
2140	$self->update;	2201	$self->update
		2202	if "@$range" ne "@{$self->{range}}";
2141	}	2203	}
2142		2204
2143	sub set_value {	2205	sub set_value {
2144	my ($self, $value) = @_;	2206	my ($self, $value) = @_;
2145		2207
…		…
2164	}	2226	}
2165		2227
2166	sub size_request {	2228	sub size_request {
2167	my ($self) = @_;	2229	my ($self) = @_;
2168		2230
2169	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2170	my $h = $self->{req_h};
2171
2172	$self->{vertical} ? ($h, $w) : ($w, $h)
2173	}	2232	}
2174		2233
2175	sub button_down {	2234	sub button_down {
2176	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2177		2236
…		…
2528		2587
2529	sub new {	2588	sub new {
2530	my $class = shift;	2589	my $class = shift;
2531		2590
2532	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2533	state => 0,	2592	state => 0,
2534	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2535	@_	2594	@_
2536	);	2595	);
2537		2596
2538	if ($self->{state}) {
2539	$self->{state} = 0;
2540	$self->toggle_flopper;
2541	}
2542
2543	$self	2597	$self
2544	}	2598	}
2545		2599
2546	sub toggle_flopper {	2600	sub toggle_flopper {
2547	my ($self) = @_;	2601	my ($self) = @_;
2548		2602
2549	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2550	if ($self->{state} = !$self->{state}) {
2551	$CFClient::UI::ROOT->add ($self->{other});
2552	$self->{other}->move ($self->coord2global (0, $self->{h}));
2553	$self->_emit ("open");
2554	} else {
2555	$CFClient::UI::ROOT->remove ($self->{other});
2556	$self->_emit ("close");
2557	}
2558
2559	$self->_emit (changed => $self->{state});
2560	}	2604	}
2561		2605
2562	#############################################################################	2606	#############################################################################
2563		2607
2564	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2577	}	2621	}
2578		2622
2579	sub set_tooltip_from {	2623	sub set_tooltip_from {
2580	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2581		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
2582	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2583	markup => $widget->{tooltip},	2636	markup => $tooltip,
2584	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585	fontsize => 0.8,	2638	fontsize => 0.8,
2586	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2587	ellipsise => 0,	2640	ellipsise => 0,
2588	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2599		2652
2600	sub size_allocate {	2653	sub size_allocate {
2601	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2602		2655
2603	$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	});
2604	}	2675	}
2605		2676
2606	sub _draw {	2677	sub _draw {
2607	my ($self) = @_;	2678	my ($self) = @_;
2608		2679
…		…
2625	glVertex $w, $h;	2696	glVertex $w, $h;
2626	glVertex $w, 0;	2697	glVertex $w, 0;
2627	glEnd;	2698	glEnd;
2628		2699
2629	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2630	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2631	}	2703	}
2632		2704
2633	#############################################################################	2705	#############################################################################
2634		2706
…		…
2710	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2711	}	2783	}
2712		2784
2713	#############################################################################	2785	#############################################################################
2714		2786
2715	package CFClient::UI::Inventory;
2716
2717	our @ISA = CFClient::UI::ScrolledWindow::;
2718
2719	sub new {
2720	my $class = shift;
2721
2722	my $self = $class->SUPER::new (
2723	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724	@_,
2725	);
2726
2727	$self
2728	}
2729
2730	sub set_items {
2731	my ($self, $items) = @_;
2732
2733	$self->{scrolled}->clear;
2734	return unless $items;
2735
2736	my @items = sort {
2737	($a->{type} <=> $b->{type})
2738	or ($a->{name} cmp $b->{name})
2739	} @$items;
2740
2741	$self->{real_items} = \@items;
2742
2743	my $row = 0;
2744	for my $item (@items) {
2745	CFClient::Item::update_widgets $item;
2746
2747	$self->{scrolled}->add (0, $row, $item->{face_widget});
2748	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2749	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751	$row++;
2752	}
2753
2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755	}
2756
2757	sub size_request {
2758	my ($self) = @_;
2759	($self->{req_w}, $self->{req_h});
2760	}
2761
2762	#############################################################################
2763
2764	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2765		2788
2766	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2767		2790
2768	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2806	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2807	$GRAB = $self;	2830	$GRAB = $self;
2808	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2809		2832
2810	$self->show;	2833	$self->show;
2811	$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);
2812	}	2835	}
2813		2836
2814	sub mouse_motion {	2837	sub mouse_motion {
2815	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2816		2839
…		…
2941	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
2942	}	2965	}
2943		2966
2944	#############################################################################	2967	#############################################################################
2945		2968
2946	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
2947		2970
2948	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
2949
2950	use CFClient::OpenGL;
2951		2972
2952	sub new {	2973	sub new {
2953	my $class = shift;	2974	my $class = shift;
2954		2975
2955	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2956	@_,	2978	@_,
2957	)	2979	);
2958	}
2959		2980
2960	sub configure {	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 {
2961	my ($self, $x, $y, $w, $h) = @_;	3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2962		3130
2963	$self->{w} = $w;	3131	$self->clear_command_list;
2964	$self->{h} = $h;	3132	$self->{recording} = 0;
2965	}	3133	$self->{rec_btn}->set_text ("start recording");
2966		3134
2967	sub check_size {	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 {
2968	my ($self) = @_;	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	}
2969		3153
2970	$self->size_allocate ($self->{w}, $self->{h})	3154	sub update_binding_widgets {
2971	if $self->{w};	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 (
		3270	visible => 1,
		3271	@_,
		3272	);
		3273
		3274	Scalar::Util::weaken ($self->{root} = $self);
		3275
		3276	$self
2972	}	3277	}
2973		3278
2974	sub size_request {	3279	sub size_request {
2975	my ($self) = @_;	3280	my ($self) = @_;
2976		3281
2977	($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
2978	}	3297	}
2979		3298
2980	sub size_allocate {	3299	sub size_allocate {
2981	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
2982		3301
2983	for my $child ($self->children) {	3302	for my $child ($self->children) {
2984	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)};
2985		3304
2986	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
2987	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
2988		3307
2989	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
2990	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
2991
2992	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994		3310
2995	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
2996	}	3312	}
2997	}	3313	}
2998		3314
…		…
3009	}	3325	}
3010		3326
3011	sub update {	3327	sub update {
3012	my ($self) = @_;	3328	my ($self) = @_;
3013		3329
3014	$self->check_size;
3015	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3016	}	3331	}
3017		3332
3018	sub add {	3333	sub add {
3019	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3020		3335
3021	for (my @widgets = @children; my $w = pop @widgets; ) {
3022	push @widgets, $w->children;
3023	$w->{root} = $self;
3024	$w->{visible} = 1;
3025	}
3026
3027	for my $child (@children) {
3028	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3029		3337	for @children;
3030	# integerise window positions
3031	$child->{x} = int $child->{x};
3032	$child->{y} = int $child->{y};
3033	}
3034		3338
3035	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3036	}	3340	}
3037		3341
3038	sub remove {	3342	sub remove {
3039	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3040		3344
3041	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3042		3349
3043	while (@children) {	3350	while (@children) {
3044	my $w = pop @children;	3351	my $w = pop @children;
3045	push @children, $w->children;	3352	push @children, $w->children;
3046	$w->set_invisible;	3353	$w->set_invisible;
…		…
3065	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3066	$_->()	3373	$_->()
3067	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3068	}	3375	}
3069		3376
3070	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3071	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3072		3381
3073	for (;;) {	3382	outer:
3074	if ($self->{check_size}) {	3383	while () {
3075	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3076	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3077	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	}
3078	}	3392	}
3079		3393
3080	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3081		3396
3082	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3083	? @$widget{qw(user_w user_h)}	3398	and last;
3084	: $widget->size_request;
3085
3086	if (delete $widget->{force_alloc}
3087	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089		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}) {
3090	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3091	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3092		3417
3093	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3094		3419
3095	$widget->{parent}->check_size
3096	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	}
3097	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3098	}	3430	}
3099	}	3431	}
3100		3432
3101	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3102	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3103	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)};
3104		3441
3105	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3106	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3107		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
3108	$widget->{w} = $w;	3452	$widget->{w} = $w;
3109	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3110	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3111	}	3457	}
3112	}	3458	}
3113		3459
3114	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3115	$_->()	3461	$_->()
3116	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3117	}	3463	}
		3464
3118		3465
3119	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3122		3469

Diff Legend

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