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.267 by root, Thu Jun 1 04:10:29 2006 UTC

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

Diff Legend

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