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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
209		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
417	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
418		451
419	$self->focus_in;	452	$self->focus_in;
420	}	453	}
421		454
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
426	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427		528
428	sub draw {	529	sub draw {
429	my ($self) = @_;	530	my ($self) = @_;
430		531
431	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432		543
433	glPushMatrix;	544	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	546	$self->_draw;
436	glPopMatrix;	547	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
449	glEnd;	560	glEnd;
450	glDisable GL_BLEND;	561	glDisable GL_BLEND;
451	}	562	}
452		563
453	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	565	glPushMatrix;
455	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
469	my ($self) = @_;	580	my ($self) = @_;
470		581
471	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
472	}	583	}
473		584
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	585	sub DESTROY {
535	my ($self) = @_;	586	my ($self) = @_;
536		587
537	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
538	#$self->deactivate;	589	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
596	}	647	}
597		648
598	sub size_request {	649	sub size_request {
599	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
600	}	653	}
601		654
602	sub draw { }	655	sub draw { }
603		656
604	#############################################################################	657	#############################################################################
…		…
633	$self->{children} = [	686	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
636	];	689	];
637		690
638	$self->check_size (1);	691	$self->realloc;
639	$self->update;
640	}	692	}
641		693
642	sub children {	694	sub children {
643	@{ $_[0]{children} }	695	@{ $_[0]{children} }
644	}	696	}
…		…
649	delete $child->{parent};	701	delete $child->{parent};
650	$child->hide;	702	$child->hide;
651		703
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		705
654	$self->check_size (1);	706	$self->realloc;
655	$self->update;
656	}	707	}
657		708
658	sub clear {	709	sub clear {
659	my ($self) = @_;	710	my ($self) = @_;
660		711
…		…
664	for (@$children) {	715	for (@$children) {
665	delete $_->{parent};	716	delete $_->{parent};
666	$_->hide;	717	$_->hide;
667	}	718	}
668		719
669	$self->check_size;	720	$self->realloc;
670	$self->update;
671	}	721	}
672		722
673	sub find_widget {	723	sub find_widget {
674	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
675		725
…		…
762	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	813	$self->update;
764	}	814	}
765		815
766	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
767	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
768	}	820	}
769		821
770	sub render_child {	822	sub render_child {
771	my ($self) = @_;	823	my ($self) = @_;
772		824
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
776		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
777	$self->_render;	836	$self->_render;
778	};	837	};
779	}	838	}
780		839
781	sub _draw {	840	sub _draw {
782	my ($self) = @_;	841	my ($self) = @_;
783		842
784	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
785		844
786	my $tex = $self->{texture}	845	my $tex = $self->{texture}
787	or return;	846	or return;
788		847
789	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
812	}	871	}
813		872
814	sub size_request {	873	sub size_request {
815	my ($self) = @_;	874	my ($self) = @_;
816		875
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		877
819	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
820	}	882	}
821		883
822	sub size_allocate {	884	sub size_allocate {
823	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
824		886
		887	my $child = $self->child;
		888
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		891
828	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
829	$self->update;	893	$self->update;
830	}	894	}
831		895
…		…
867	}	931	}
868		932
869	sub _render {	933	sub _render {
870	my ($self) = @_;	934	my ($self) = @_;
871		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		940
874	$self->SUPER::_render;	941	$self->SUPER::_render;
875	}	942	}
876		943
…		…
884	my $class = shift;	951	my $class = shift;
885		952
886	my $self;	953	my $self;
887		954
888	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
889	vertical => 1,	956	vertical => 1,
890	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
891	connect_changed => sub {	958	on_changed => sub {
892	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
893	},	960	},
894	;	961	;
895		962
896	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
974		1041
975	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
976		1043
977	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
978		1045
979	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1053
983	sub new {	1054	sub new {
984	my $class = shift;	1055	my $class = shift;
985
986	# TODO: user_x, user_y, overwrite moveto?
987		1056
988	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1060	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
994	@_	1064	@_
995	);	1065	);
996		1066
997	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
998	align => 0,	1068	align => 0,
…		…
1051	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1052		1122
1053	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1055		1125
1056	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1128
		1129	$self->realloc;
1058	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059	$self->check_size;
1060	};	1131	};
1061		1132
1062	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1063	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1066	$self->{motion} = sub {	1137	$self->{motion} = sub {
1067	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1068		1139
1069	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1070		1141
1071	$self->move ($bx + $x - $ox, $by + $y - $oy);	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072	$self->update;
1073	};	1143	};
1074	}	1144	}
1075	}	1145	}
1076		1146
1077	sub button_up {	1147	sub button_up {
…		…
1096	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097		1167
1098	my $border = $self->border;	1168	my $border = $self->border;
1099		1169
1100	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1101	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1102	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105		1175
1106	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1108		1178
1109	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1110	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1111	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1112
1113	glColor @{ $self->{bg} };
1114
1115	$bg->{s} = $rep_x;
1116	$bg->{t} = $rep_y;
1117	$bg->{wrap_mode} = 1;
1118	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119	}	1184	}
1120		1185
1121	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1122		1187
…		…
1152	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1153		1218
1154	$child->set_parent ($self);	1219	$child->set_parent ($self);
1155	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1156		1221
1157	$self->check_size (1);	1222	$self->realloc;
1158	}	1223	}
1159		1224
1160	# TODO: move to container class maybe? send children a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1161	sub clear {	1226	sub clear {
1162	my ($self) = @_;	1227	my ($self) = @_;
…		…
1167	for (@children) {	1232	for (@children) {
1168	delete $_->{parent};	1233	delete $_->{parent};
1169	$_->hide;	1234	$_->hide;
1170	}	1235	}
1171		1236
1172	$self->check_size (1);	1237	$self->realloc;
1173	$self->update;
1174	}	1238	}
1175		1239
1176	sub get_wh {	1240	sub get_wh {
1177	my ($self) = @_;	1241	my ($self) = @_;
1178		1242
…		…
1274	}	1338	}
1275	}	1339	}
1276		1340
1277	#############################################################################	1341	#############################################################################
1278		1342
1279	package CFClient::UI::HBox;	1343	package CFClient::UI::Box;
1280
1281	# TODO: wrap into common Box base class
1282		1344
1283	our @ISA = CFClient::UI::Container::;	1345	our @ISA = CFClient::UI::Container::;
1284		1346
1285	sub size_request {	1347	sub size_request {
1286	my ($self) = @_;	1348	my ($self) = @_;
1287		1349
1288	my @alloc = map [$_->size_request], @{$self->{children}};	1350	$self->{vertical}
1289		1351	? (
1290	(	1352	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1291	(List::Util::sum map $_->[0], @alloc),	1353	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292	(List::Util::max map $_->[1], @alloc),	1354	)
1293	)	1355	: (
		1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1358	)
1294	}	1359	}
1295		1360
1296	sub size_allocate {	1361	sub size_allocate {
1297	my ($self, $w, $h) = @_;	1362	my ($self, $w, $h) = @_;
1298		1363
1299	($h, $w) = ($w, $h);	1364	my $space = $self->{vertical} ? $h : $w;
1300
1301	my $children = $self->{children};	1365	my $children = $self->{children};
1302		1366
1303	my @h = map $_->{req_w}, @$children;	1367	my @req;
1304		1368
1305	my $req_h = List::Util::sum @h;	1369	if ($self->{homogeneous}) {
1306		1370	@req = ($space / (@$children || 1)) x @$children;
1307	if ($req_h > $h) {
1308	# ah well, not enough space
1309	$_ *= $h / $req_h for @h;
1310	} else {	1371	} else {
		1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1373	my $req = List::Util::sum @req;
		1374
		1375	if ($req > $space) {
		1376	# ah well, not enough space
		1377	$_ *= $space / $req for @req;
		1378	} else {
1311	my $exp = List::Util::sum map $_->{expand}, @$children;	1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312	$exp ||= 1;
1313		1380
		1381	$space = ($space - $req) / $expand; # remaining space to give away
		1382
		1383	$req[$_] += $space * $children->[$_]{expand}
1314	for (0 .. $#$children) {	1384	for 0 .. $#$children;
1315	my $child = $children->[$_];
1316
1317	my $alloc_h = $h[$_];
1318	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319	$h[$_] = $alloc_h;
1320	}	1385	}
1321	}	1386	}
1322		1387
1323	CFClient::UI::harmonize \@h;	1388	CFClient::UI::harmonize \@req;
1324		1389
1325	my $y = 0;	1390	my $pos = 0;
1326	for (0 .. $#$children) {	1391	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];	1392	my $alloc = $req[$_];
1329	$child->configure ($y, 0, $h, $w);	1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330		1394
1331	$y += $h;	1395	$pos += $alloc;
1332	}	1396	}
1333		1397
1334	1	1398	1
1335	}	1399	}
1336		1400
1337	#############################################################################	1401	#############################################################################
1338		1402
		1403	package CFClient::UI::HBox;
		1404
		1405	our @ISA = CFClient::UI::Box::;
		1406
		1407	sub new {
		1408	my $class = shift;
		1409
		1410	$class->SUPER::new (
		1411	vertical => 0,
		1412	@_,
		1413	)
		1414	}
		1415
		1416	#############################################################################
		1417
1339	package CFClient::UI::VBox;	1418	package CFClient::UI::VBox;
1340		1419
1341	# TODO: wrap into common Box base class
1342
1343	our @ISA = CFClient::UI::Container::;	1420	our @ISA = CFClient::UI::Box::;
1344		1421
1345	sub size_request {	1422	sub new {
1346	my ($self) = @_;	1423	my $class = shift;
1347		1424
1348	my @alloc = map [$_->size_request], @{$self->{children}};	1425	$class->SUPER::new (
1349		1426	vertical => 1,
1350	(	1427	@_,
1351	(List::Util::max map $_->[0], @alloc),
1352	(List::Util::sum map $_->[1], @alloc),
1353	)	1428	)
1354	}
1355
1356	sub size_allocate {
1357	my ($self, $w, $h) = @_;
1358
1359	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361	my $children = $self->{children};
1362
1363	my @h = map $_->{req_h}, @$children;
1364
1365	my $req_h = List::Util::sum @h;
1366
1367	if ($req_h > $h) {
1368	# ah well, not enough space
1369	$_ *= $h / $req_h for @h;
1370	} else {
1371	my $exp = List::Util::sum map $_->{expand}, @$children;
1372	$exp ||= 1;
1373
1374	for (0 .. $#$children) {
1375	my $child = $children->[$_];
1376
1377	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378	}
1379	}
1380
1381	CFClient::UI::harmonize \@h;
1382
1383	my $y = 0;
1384	for (0 .. $#$children) {
1385	my $child = $children->[$_];
1386	my $h = $h[$_];
1387	$child->configure (0, $y, $w, $h);
1388
1389	$y += $h;
1390	}
1391
1392	1
1393	}	1429	}
1394		1430
1395	#############################################################################	1431	#############################################################################
1396		1432
1397	package CFClient::UI::Label;	1433	package CFClient::UI::Label;
…		…
1414	ellipsise => 3, # end	1450	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1416	fontsize => 1,	1452	fontsize => 1,
1417	align => -1,	1453	align => -1,
1418	valign => -1,	1454	valign => -1,
1419	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1420	can_events => 0,	1457	can_events => 0,
1421	%arg	1458	%arg
1422	);	1459	);
1423		1460
1424	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1461		1498
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1464		1501
		1502	$self->realloc;
1465	$self->update;	1503	$self->update;
1466	$self->check_size;
1467	}	1504	}
1468		1505
1469	sub set_markup {	1506	sub set_markup {
1470	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1471		1508
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1513
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1479		1516
		1517	$self->realloc;
1480	$self->update;	1518	$self->update;
1481	$self->check_size;
1482	}	1519	}
1483		1520
1484	sub size_request {	1521	sub size_request {
1485	my ($self) = @_;	1522	my ($self) = @_;
1486		1523
…		…
1500		1537
1501	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1503	}	1540	}
1504		1541
1505	(	1542	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1543	}
1510		1544
1511	sub size_allocate {	1545	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1513		1547
1514	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1550	}
1516		1551
1517	sub set_fontsize {	1552	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1519		1554
1520	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1556	delete $self->{texture};
1522		1557
1523	$self->update;	1558	$self->realloc;
1524	$self->check_size;
1525	}	1559	}
1526		1560
1527	sub _draw {	1561	sub _draw {
1528	my ($self) = @_;	1562	my ($self) = @_;
1529		1563
…		…
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1573
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1541		1575
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1545		1579
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1549		1583
1550	$tex	1584	$tex
1551	};	1585	};
1552		1586
…		…
1609	sub set_text {	1643	sub set_text {
1610	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1611		1645
1612	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1647	$self->_set_text ($text);
1614	$self->update;	1648
1615	$self->check_size;	1649	$self->realloc;
1616	}	1650	}
1617		1651
1618	sub get_text {	1652	sub get_text {
1619	$_[0]{text}	1653	$_[0]{text}
1620	}	1654	}
…		…
1653	} elsif ($uni) {	1687	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1655	}	1689	}
1656		1690
1657	$self->_set_text ($text);	1691	$self->_set_text ($text);
1658	$self->update;	1692
1659	$self->check_size;	1693	$self->realloc;
1660	}	1694	}
1661		1695
1662	sub focus_in {	1696	sub focus_in {
1663	my ($self) = @_;	1697	my ($self) = @_;
1664		1698
…		…
1791		1825
1792	sub new {	1826	sub new {
1793	my $class = shift;	1827	my $class = shift;
1794		1828
1795	$class->SUPER::new (	1829	$class->SUPER::new (
1796	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1797	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1799	can_hover => 1,	1834	can_hover => 1,
1800	align => 0,	1835	align => 0,
1801	valign => 0,	1836	valign => 0,
…		…
1848		1883
1849	sub new {	1884	sub new {
1850	my $class = shift;	1885	my $class = shift;
1851		1886
1852	$class->SUPER::new (	1887	$class->SUPER::new (
1853	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1854	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1894	state => 0,
…		…
1862	}	1898	}
1863		1899
1864	sub size_request {	1900	sub size_request {
1865	my ($self) = @_;	1901	my ($self) = @_;
1866		1902
1867	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1868	}	1904	}
1869		1905
1870	sub button_down {	1906	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1872		1908
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1877	}	1913	}
1878	}	1914	}
1879		1915
1880	sub _draw {	1916	sub _draw {
1881	my ($self) = @_;	1917	my ($self) = @_;
1882		1918
1883	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1884		1920
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1922
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1926
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1928
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1930
…		…
2157	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2164	vertical => 0,	2202	vertical => 0,
2165	can_hover => 1,	2203	can_hover => 1,
2166	inner_pad => 0.02,	2204	inner_pad => 0.02,
2167	@_	2205	@_
2168	);	2206	);
…		…
2171	$self->update;	2209	$self->update;
2172		2210
2173	$self	2211	$self
2174	}	2212	}
2175		2213
		2214	sub changed { }
		2215
2176	sub set_range {	2216	sub set_range {
2177	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2178		2218
2179	($range, $self->{range}) = ($self->{range}, $range);	2219	($range, $self->{range}) = ($self->{range}, $range);
2180		2220
…		…
2206	}	2246	}
2207		2247
2208	sub size_request {	2248	sub size_request {
2209	my ($self) = @_;	2249	my ($self) = @_;
2210		2250
2211	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2252	}
2216		2253
2217	sub button_down {	2254	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2219		2256
…		…
2570		2607
2571	sub new {	2608	sub new {
2572	my $class = shift;	2609	my $class = shift;
2573		2610
2574	my $self = $class->SUPER::new (	2611	my $self = $class->SUPER::new (
2575	state => 0,	2612	state => 0,
2576	connect_activate => \&toggle_flopper,	2613	on_activate => \&toggle_flopper,
2577	@_	2614	@_
2578	);	2615	);
2579		2616
2580	if ($self->{state}) {
2581	$self->{state} = 0;
2582	$self->toggle_flopper;
2583	}
2584
2585	$self	2617	$self
2586	}	2618	}
2587		2619
2588	sub toggle_flopper {	2620	sub toggle_flopper {
2589	my ($self) = @_;	2621	my ($self) = @_;
2590		2622
2591	# TODO: use animation	2623	$self->{other}->toggle_visibility;
2592	if ($self->{state} = !$self->{state}) {
2593	$CFClient::UI::ROOT->add ($self->{other});
2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2595	$self->_emit ("open");
2596	} else {
2597	$CFClient::UI::ROOT->remove ($self->{other});
2598	$self->_emit ("close");
2599	}
2600
2601	$self->_emit (changed => $self->{state});
2602	}	2624	}
2603		2625
2604	#############################################################################	2626	#############################################################################
2605		2627
2606	package CFClient::UI::Tooltip;	2628	package CFClient::UI::Tooltip;
…		…
2619	}	2641	}
2620		2642
2621	sub set_tooltip_from {	2643	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2623		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2624	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2656	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2658	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2660	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2641		2672
2642	sub size_allocate {	2673	sub size_allocate {
2643	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2644		2675
2645	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2646	}	2695	}
2647		2696
2648	sub _draw {	2697	sub _draw {
2649	my ($self) = @_;	2698	my ($self) = @_;
2650		2699
…		…
2667	glVertex $w, $h;	2716	glVertex $w, $h;
2668	glVertex $w, 0;	2717	glVertex $w, 0;
2669	glEnd;	2718	glEnd;
2670		2719
2671	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2672	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2673	}	2723	}
2674		2724
2675	#############################################################################	2725	#############################################################################
2676		2726
…		…
2752	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2753	}	2803	}
2754		2804
2755	#############################################################################	2805	#############################################################################
2756		2806
2757	package CFClient::UI::Inventory;
2758
2759	our @ISA = CFClient::UI::ScrolledWindow::;
2760
2761	sub new {
2762	my $class = shift;
2763
2764	my $self = $class->SUPER::new (
2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766	@_,
2767	);
2768
2769	$self
2770	}
2771
2772	sub set_items {
2773	my ($self, $items) = @_;
2774
2775	$self->{scrolled}->clear;
2776	return unless $items;
2777
2778	my @items = sort {
2779	($a->{type} <=> $b->{type})
2780	or ($a->{name} cmp $b->{name})
2781	} @$items;
2782
2783	$self->{real_items} = \@items;
2784
2785	my $row = 0;
2786	for my $item (@items) {
2787	CFClient::Item::update_widgets $item;
2788
2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793	$row++;
2794	}
2795	}
2796
2797	sub size_request {
2798	my ($self) = @_;
2799	($self->{req_w}, $self->{req_h});
2800	}
2801
2802	#############################################################################
2803
2804	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2805		2808
2806	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2807		2810
2808	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2846	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2847	$GRAB = $self;	2850	$GRAB = $self;
2848	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2849		2852
2850	$self->show;	2853	$self->show;
2851	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852	}	2855	}
2853		2856
2854	sub mouse_motion {	2857	sub mouse_motion {
2855	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2856		2859
…		…
2981	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2982	}	2985	}
2983		2986
2984	#############################################################################	2987	#############################################################################
2985		2988
2986	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2987		2990
2988	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990	use CFClient::OpenGL;
2991		2992
2992	sub new {	2993	sub new {
2993	my $class = shift;	2994	my $class = shift;
2994		2995
2995	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2998	@_,
		2999	);
		3000
		3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
		3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3150
		3151	$self->clear_command_list;
		3152	$self->{recording} = 0;
		3153	$self->{rec_btn}->set_text ("start recording");
		3154
		3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
		3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
		3173
		3174	sub update_binding_widgets {
		3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
2996	visible => 1,	3290	visible => 1,
2997	@_,	3291	@_,
2998	)	3292	);
2999	}
3000		3293
3001	sub configure {	3294	Scalar::Util::weaken ($self->{root} = $self);
3002	my ($self, $x, $y, $w, $h) = @_;
3003		3295
3004	$self->{w} = $w;	3296	$self
3005	$self->{h} = $h;
3006	}
3007
3008	sub check_size {
3009	my ($self) = @_;
3010
3011	$self->size_allocate ($self->{w}, $self->{h})
3012	if $self->{w};
3013	}	3297	}
3014		3298
3015	sub size_request {	3299	sub size_request {
3016	my ($self) = @_;	3300	my ($self) = @_;
3017		3301
3018	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
3019	}	3317	}
3020		3318
3021	sub size_allocate {	3319	sub size_allocate {
3022	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
3023		3321
3024	for my $child ($self->children) {	3322	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3324
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3029		3327
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3330
3036	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3037	}	3332	}
3038	}	3333	}
3039		3334
…		…
3050	}	3345	}
3051		3346
3052	sub update {	3347	sub update {
3053	my ($self) = @_;	3348	my ($self) = @_;
3054		3349
3055	$self->check_size;
3056	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3057	}	3351	}
3058		3352
3059	sub add {	3353	sub add {
3060	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3061		3355
3062	for (my @widgets = @children; my $w = pop @widgets; ) {
3063	push @widgets, $w->children;
3064	$w->{root} = $self;
3065	$w->{visible} = $self->{visible} + 1;
3066	}
3067
3068	for my $child (@children) {
3069	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3070		3357	for @children;
3071	# integerise window positions
3072	$child->{x} = int $child->{x};
3073	$child->{y} = int $child->{y};
3074	}
3075		3358
3076	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3077	}	3360	}
3078		3361
3079	sub remove {	3362	sub remove {
3080	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3081		3364
3082	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3083		3369
3084	while (@children) {	3370	while (@children) {
3085	my $w = pop @children;	3371	my $w = pop @children;
3086	push @children, $w->children;	3372	push @children, $w->children;
3087	$w->set_invisible;	3373	$w->set_invisible;
…		…
3106	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3107	$_->()	3393	$_->()
3108	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3109	}	3395	}
3110		3396
3111	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
3112	my @queue = ([], []);	3398	my %queue;
		3399	my @queue;
		3400	my $widget;
3113		3401
3114	for (;;) {	3402	outer:
3115	if ($self->{check_size}) {	3403	while () {
3116	# heuristic: check containers last	3404	if (my $realloc = delete $self->{realloc}) {
3117	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3405	for $widget (values %$realloc) {
3118	for values %{delete $self->{check_size}}	3406	$widget->{visible} or next; # do not resize invisible widgets
		3407
		3408	$queue{$widget+0}++ and next; # duplicates are common
		3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3119	}	3412	}
3120		3413
3121	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3414	while () {
		3415	@queue or last outer;
3122		3416
3123	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3417	$widget = pop @{ $queue[-1] || [] }
3124	? @$widget{qw(user_w user_h)}	3418	and last;
3125	: $widget->size_request;
3126
3127	if (delete $widget->{force_alloc}
3128	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3131	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3132	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3133		3437
3134	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3135		3439
3136	$widget->{parent}->check_size
3137	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3138	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3139	}	3450	}
3140	}	3451	}
3141		3452
3142	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3143	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3144	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145		3461
3146	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3147	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3148		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3149	$widget->{w} = $w;	3472	$widget->{w} = $w;
3150	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3151	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3152	}	3477	}
3153	}	3478	}
3154		3479
3155	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3156	$_->()	3481	$_->()
3157	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3158	}	3483	}
		3484
3159		3485
3160	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3163		3489
…		…
3165	glLoadIdentity;	3491	glLoadIdentity;
3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3168	glLoadIdentity;	3494	glLoadIdentity;
3169		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3170	$self->_draw;	3503	$self->_draw;
3171	}	3504	}
3172		3505
3173	#############################################################################	3506	#############################################################################
3174		3507

Diff Legend

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