ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.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;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
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
…		…
866	}	928	}
867	}	929	}
868		930
869	sub _render {	931	sub _render {
870	my ($self) = @_;	932	my ($self) = @_;
		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};
871		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	}
…		…
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_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1126
1061	$self->check_size;	1127	$self->realloc;
		1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1129	};
1063		1130
1064	} elsif ($lr ^ $td) {	1131	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1133	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1135	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1136	my ($ev, $x, $y) = @_;
1070		1137
1071	($x, $y) = ($ev->{x}, $ev->{y});	1138	($x, $y) = ($ev->{x}, $ev->{y});
1072		1139
1073	$self->{user_x} = $bx + $x - $ox;	1140	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074	$self->{user_y} = $by + $y - $oy;
1075	$self->move ($self->{user_x}, $self->{user_y});
1076	$self->update;
1077	};	1141	};
1078	}	1142	}
1079	}	1143	}
1080		1144
1081	sub button_up {	1145	sub button_up {
…		…
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1165
1102	my $border = $self->border;	1166	my $border = $self->border;
1103		1167
1104	glColor @{ $self->{border_bg} };	1168	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1173
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1175	glColor @{ $self->{bg} };
1112		1176
1113	# TODO: repeat texture not scale	1177	# TODO: repeat texture not scale
		1178	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1179	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1180	$bg->{t} = $ch / $bg->{h};
1116
1117	glColor @{ $self->{bg} };
1118
1119	$bg->{s} = $rep_x;
1120	$bg->{t} = $rep_y;
1121	$bg->{wrap_mode} = 1;
1122	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1182	}
1124		1183
1125	glDisable GL_TEXTURE_2D;	1184	glDisable GL_TEXTURE_2D;
1126		1185
…		…
1156	my ($self, $x, $y, $child) = @_;	1215	my ($self, $x, $y, $child) = @_;
1157		1216
1158	$child->set_parent ($self);	1217	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1218	$self->{children}[$y][$x] = $child;
1160		1219
1161	$self->check_size (1);	1220	$self->realloc;
1162	}	1221	}
1163		1222
1164	# 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?
1165	sub clear {	1224	sub clear {
1166	my ($self) = @_;	1225	my ($self) = @_;
…		…
1171	for (@children) {	1230	for (@children) {
1172	delete $_->{parent};	1231	delete $_->{parent};
1173	$_->hide;	1232	$_->hide;
1174	}	1233	}
1175		1234
1176	$self->check_size (1);	1235	$self->realloc;
1177	$self->update;
1178	}	1236	}
1179		1237
1180	sub get_wh {	1238	sub get_wh {
1181	my ($self) = @_;	1239	my ($self) = @_;
1182		1240
…		…
1278	}	1336	}
1279	}	1337	}
1280		1338
1281	#############################################################################	1339	#############################################################################
1282		1340
1283	package CFClient::UI::HBox;	1341	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1342
1287	our @ISA = CFClient::UI::Container::;	1343	our @ISA = CFClient::UI::Container::;
1288		1344
1289	sub size_request {	1345	sub size_request {
1290	my ($self) = @_;	1346	my ($self) = @_;
1291		1347
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1348	$self->{vertical}
1293		1349	? (
1294	(	1350	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1351	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1352	)
1297	)	1353	: (
		1354	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1356	)
1298	}	1357	}
1299		1358
1300	sub size_allocate {	1359	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1360	my ($self, $w, $h) = @_;
1302		1361
1303	($h, $w) = ($w, $h);	1362	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1363	my $children = $self->{children};
1306		1364
1307	my @h = map $_->{req_w}, @$children;	1365	my @req;
1308		1366
1309	my $req_h = List::Util::sum @h;	1367	if ($self->{homogeneous}) {
1310		1368	@req = ($space / (@$children || 1)) x @$children;
1311	if ($req_h > $h) {
1312	# ah well, not enough space
1313	$_ *= $h / $req_h for @h;
1314	} else {	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 {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1377	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1378
		1379	$space = ($space - $req) / $expand; # remaining space to give away
		1380
		1381	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1382	for 0 .. $#$children;
1319	my $child = $children->[$_];
1320
1321	my $alloc_h = $h[$_];
1322	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323	$h[$_] = $alloc_h;
1324	}	1383	}
1325	}	1384	}
1326		1385
1327	CFClient::UI::harmonize \@h;	1386	CFClient::UI::harmonize \@req;
1328		1387
1329	my $y = 0;	1388	my $pos = 0;
1330	for (0 .. $#$children) {	1389	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1390	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1391	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1392
1335	$y += $h;	1393	$pos += $alloc;
1336	}	1394	}
1337		1395
1338	1	1396	1
1339	}	1397	}
1340		1398
1341	#############################################################################	1399	#############################################################################
1342		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
1343	package CFClient::UI::VBox;	1416	package CFClient::UI::VBox;
1344		1417
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1418	our @ISA = CFClient::UI::Box::;
1348		1419
1349	sub size_request {	1420	sub new {
1350	my ($self) = @_;	1421	my $class = shift;
1351		1422
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1423	$class->SUPER::new (
1353		1424	vertical => 1,
1354	(	1425	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1426	)
1358	}
1359
1360	sub size_allocate {
1361	my ($self, $w, $h) = @_;
1362
1363	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365	my $children = $self->{children};
1366
1367	my @h = map $_->{req_h}, @$children;
1368
1369	my $req_h = List::Util::sum @h;
1370
1371	if ($req_h > $h) {
1372	# ah well, not enough space
1373	$_ *= $h / $req_h for @h;
1374	} else {
1375	my $exp = List::Util::sum map $_->{expand}, @$children;
1376	$exp ||= 1;
1377
1378	for (0 .. $#$children) {
1379	my $child = $children->[$_];
1380
1381	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382	}
1383	}
1384
1385	CFClient::UI::harmonize \@h;
1386
1387	my $y = 0;
1388	for (0 .. $#$children) {
1389	my $child = $children->[$_];
1390	my $h = $h[$_];
1391	$child->configure (0, $y, $w, $h);
1392
1393	$y += $h;
1394	}
1395
1396	1
1397	}	1427	}
1398		1428
1399	#############################################################################	1429	#############################################################################
1400		1430
1401	package CFClient::UI::Label;	1431	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1448	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1420	fontsize => 1,	1450	fontsize => 1,
1421	align => -1,	1451	align => -1,
1422	valign => -1,	1452	valign => -1,
1423	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1424	can_events => 0,	1455	can_events => 0,
1425	%arg	1456	%arg
1426	);	1457	);
1427		1458
1428	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1495	$self->{text} = "T$text";
1465		1496
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1498	$self->{layout}->set_text ($text);
1468		1499
		1500	$self->realloc;
1469	$self->update;	1501	$self->update;
1470	$self->check_size;
1471	}	1502	}
1472		1503
1473	sub set_markup {	1504	sub set_markup {
1474	my ($self, $markup) = @_;	1505	my ($self, $markup) = @_;
1475		1506
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1511
1481	$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;
1482	$self->{layout}->set_markup ($markup);	1513	$self->{layout}->set_markup ($markup);
1483		1514
		1515	$self->realloc;
1484	$self->update;	1516	$self->update;
1485	$self->check_size;
1486	}	1517	}
1487		1518
1488	sub size_request {	1519	sub size_request {
1489	my ($self) = @_;	1520	my ($self) = @_;
1490		1521
…		…
1504		1535
1505	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1507	}	1538	}
1508		1539
1509	(	1540	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1541	}
1514		1542
1515	sub size_allocate {	1543	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1517		1545
1518	delete $self->{texture};	1546	delete $self->{texture}
		1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1548	}
1520		1549
1521	sub set_fontsize {	1550	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1523		1552
1524	$self->{fontsize} = $fontsize;	1553	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1554	delete $self->{texture};
1526		1555
1527	$self->update;	1556	$self->realloc;
1528	$self->check_size;
1529	}	1557	}
1530		1558
1531	sub _draw {	1559	sub _draw {
1532	my ($self) = @_;	1560	my ($self) = @_;
1533		1561
…		…
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1571
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1545		1573
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1549		1577
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1553		1581
1554	$tex	1582	$tex
1555	};	1583	};
1556		1584
…		…
1613	sub set_text {	1641	sub set_text {
1614	my ($self, $text) = @_;	1642	my ($self, $text) = @_;
1615		1643
1616	$self->{cursor} = length $text;	1644	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1645	$self->_set_text ($text);
1618	$self->update;	1646
1619	$self->check_size;	1647	$self->realloc;
1620	}	1648	}
1621		1649
1622	sub get_text {	1650	sub get_text {
1623	$_[0]{text}	1651	$_[0]{text}
1624	}	1652	}
…		…
1657	} elsif ($uni) {	1685	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1686	substr $text, $self->{cursor}++, 0, chr $uni;
1659	}	1687	}
1660		1688
1661	$self->_set_text ($text);	1689	$self->_set_text ($text);
1662	$self->update;	1690
1663	$self->check_size;	1691	$self->realloc;
1664	}	1692	}
1665		1693
1666	sub focus_in {	1694	sub focus_in {
1667	my ($self) = @_;	1695	my ($self) = @_;
1668		1696
…		…
1795		1823
1796	sub new {	1824	sub new {
1797	my $class = shift;	1825	my $class = shift;
1798		1826
1799	$class->SUPER::new (	1827	$class->SUPER::new (
1800	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1801	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1803	can_hover => 1,	1832	can_hover => 1,
1804	align => 0,	1833	align => 0,
1805	valign => 0,	1834	valign => 0,
…		…
1852		1881
1853	sub new {	1882	sub new {
1854	my $class = shift;	1883	my $class = shift;
1855		1884
1856	$class->SUPER::new (	1885	$class->SUPER::new (
1857	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1858	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1892	state => 0,
…		…
1866	}	1896	}
1867		1897
1868	sub size_request {	1898	sub size_request {
1869	my ($self) = @_;	1899	my ($self) = @_;
1870		1900
1871	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1872	}	1902	}
1873		1903
1874	sub button_down {	1904	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1876		1906
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1881	}	1911	}
1882	}	1912	}
1883		1913
1884	sub _draw {	1914	sub _draw {
1885	my ($self) = @_;	1915	my ($self) = @_;
1886		1916
1887	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1888		1918
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1920
1891	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;
1892		1924
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1926
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1928
…		…
2161	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2168	vertical => 0,	2200	vertical => 0,
2169	can_hover => 1,	2201	can_hover => 1,
2170	inner_pad => 0.02,	2202	inner_pad => 0.02,
2171	@_	2203	@_
2172	);	2204	);
…		…
2175	$self->update;	2207	$self->update;
2176		2208
2177	$self	2209	$self
2178	}	2210	}
2179		2211
		2212	sub changed { }
		2213
2180	sub set_range {	2214	sub set_range {
2181	my ($self, $range) = @_;	2215	my ($self, $range) = @_;
2182		2216
2183	($range, $self->{range}) = ($self->{range}, $range);	2217	($range, $self->{range}) = ($self->{range}, $range);
2184		2218
…		…
2210	}	2244	}
2211		2245
2212	sub size_request {	2246	sub size_request {
2213	my ($self) = @_;	2247	my ($self) = @_;
2214		2248
2215	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2250	}
2220		2251
2221	sub button_down {	2252	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2223		2254
…		…
2579	state => 0,	2610	state => 0,
2580	on_activate => \&toggle_flopper,	2611	on_activate => \&toggle_flopper,
2581	@_	2612	@_
2582	);	2613	);
2583		2614
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2615	$self
2590	}	2616	}
2591		2617
2592	sub toggle_flopper {	2618	sub toggle_flopper {
2593	my ($self) = @_;	2619	my ($self) = @_;
2594		2620
2595	# TODO: use animation	2621	$self->{other}->toggle_visibility;
2596	if ($self->{state} = !$self->{state}) {
2597	$CFClient::UI::ROOT->add ($self->{other});
2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2599	$self->_emit ("open");
2600	} else {
2601	$CFClient::UI::ROOT->remove ($self->{other});
2602	$self->_emit ("close");
2603	}
2604
2605	$self->_emit (changed => $self->{state});
2606	}	2622	}
2607		2623
2608	#############################################################################	2624	#############################################################################
2609		2625
2610	package CFClient::UI::Tooltip;	2626	package CFClient::UI::Tooltip;
…		…
2623	}	2639	}
2624		2640
2625	sub set_tooltip_from {	2641	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2627		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
2628	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2654	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2656	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2658	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2659	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2670
2646	sub size_allocate {	2671	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2672	my ($self, $w, $h) = @_;
2648		2673
2649	$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	});
2650	}	2693	}
2651		2694
2652	sub _draw {	2695	sub _draw {
2653	my ($self) = @_;	2696	my ($self) = @_;
2654		2697
…		…
2671	glVertex $w, $h;	2714	glVertex $w, $h;
2672	glVertex $w, 0;	2715	glVertex $w, 0;
2673	glEnd;	2716	glEnd;
2674		2717
2675	glTranslate 2 - 0.375, 2 - 0.375;	2718	glTranslate 2 - 0.375, 2 - 0.375;
		2719
2676	$self->SUPER::_draw;	2720	$self->SUPER::_draw;
2677	}	2721	}
2678		2722
2679	#############################################################################	2723	#############################################################################
2680		2724
…		…
2756	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2757	}	2801	}
2758		2802
2759	#############################################################################	2803	#############################################################################
2760		2804
2761	package CFClient::UI::Inventory;
2762
2763	our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765	sub new {
2766	my $class = shift;
2767
2768	my $self = $class->SUPER::new (
2769	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770	@_,
2771	);
2772
2773	$self
2774	}
2775
2776	sub set_items {
2777	my ($self, $items) = @_;
2778
2779	$self->{scrolled}->clear;
2780	return unless $items;
2781
2782	my @items = sort {
2783	($a->{type} <=> $b->{type})
2784	or ($a->{name} cmp $b->{name})
2785	} @$items;
2786
2787	$self->{real_items} = \@items;
2788
2789	my $row = 0;
2790	for my $item (@items) {
2791	CFClient::Item::update_widgets $item;
2792
2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797	$row++;
2798	}
2799	}
2800
2801	sub size_request {
2802	my ($self) = @_;
2803	($self->{req_w}, $self->{req_h});
2804	}
2805
2806	#############################################################################
2807
2808	package CFClient::UI::Menu;	2805	package CFClient::UI::Menu;
2809		2806
2810	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2811		2808
2812	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2850	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2848	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2853		2850
2854	$self->show;	2851	$self->show;
2855	$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);
2856	}	2853	}
2857		2854
2858	sub mouse_motion {	2855	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2860		2857
…		…
2985	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
2986	}	2983	}
2987		2984
2988	#############################################################################	2985	#############################################################################
2989		2986
2990	package CFClient::UI::Root;	2987	package CFClient::UI::Inventory;
2991		2988
2992	our @ISA = CFClient::UI::Container::;	2989	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		2990
2996	sub new {	2991	sub new {
2997	my $class = shift;	2992	my $class = shift;
2998		2993
2999	$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 (
3000	visible => 1,	3288	visible => 1,
3001	@_,	3289	@_,
3002	)	3290	);
3003	}
3004		3291
3005	sub configure {	3292	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3293
3008	$self->{w} = $w;	3294	$self
3009	$self->{h} = $h;
3010	}
3011
3012	sub check_size {
3013	my ($self) = @_;
3014
3015	$self->size_allocate ($self->{w}, $self->{h})
3016	if $self->{w};
3017	}	3295	}
3018		3296
3019	sub size_request {	3297	sub size_request {
3020	my ($self) = @_;	3298	my ($self) = @_;
3021		3299
3022	($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
3023	}	3315	}
3024		3316
3025	sub size_allocate {	3317	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3318	my ($self, $w, $h) = @_;
3027		3319
3028	for my $child ($self->children) {	3320	for my $child ($self->children) {
3029	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)};
3030		3322
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3323	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3324	$Y = $child->{force_y} if exists $child->{force_y};
3033		3325
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3326	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3327	$Y = _to_pixel $Y, $H, $self->{h};
3036
3037	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039		3328
3040	$child->configure ($X, $Y, $W, $H);	3329	$child->configure ($X, $Y, $W, $H);
3041	}	3330	}
3042	}	3331	}
3043		3332
…		…
3054	}	3343	}
3055		3344
3056	sub update {	3345	sub update {
3057	my ($self) = @_;	3346	my ($self) = @_;
3058		3347
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3348	$::WANT_REFRESH++;
3061	}	3349	}
3062		3350
3063	sub add {	3351	sub add {
3064	my ($self, @children) = @_;	3352	my ($self, @children) = @_;
3065		3353
3066	for (my @widgets = @children; my $w = pop @widgets; ) {
3067	push @widgets, $w->children;
3068	$w->{root} = $self;
3069	$w->{visible} = $self->{visible} + 1;
3070	}
3071
3072	for my $child (@children) {
3073	$child->{is_toplevel} = 1;	3354	$_->{is_toplevel} = 1
3074		3355	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3356
3080	$self->SUPER::add (@children);	3357	$self->SUPER::add (@children);
3081	}	3358	}
3082		3359
3083	sub remove {	3360	sub remove {
3084	my ($self, @children) = @_;	3361	my ($self, @children) = @_;
3085		3362
3086	$self->SUPER::remove (@children);	3363	$self->SUPER::remove (@children);
		3364
		3365	delete $self->{is_toplevel}
		3366	for @children;
3087		3367
3088	while (@children) {	3368	while (@children) {
3089	my $w = pop @children;	3369	my $w = pop @children;
3090	push @children, $w->children;	3370	push @children, $w->children;
3091	$w->set_invisible;	3371	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3390	while ($self->{refresh_hook}) {
3111	$_->()	3391	$_->()
3112	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3113	}	3393	}
3114		3394
3115	if ($self->{check_size}) {	3395	if ($self->{realloc}) {
		3396	my %queue;
3116	my @queue;	3397	my @queue;
		3398	my $widget;
3117		3399
3118	for (;;) {	3400	outer:
3119	if ($self->{check_size}) {	3401	while () {
3120	#TODO use array-of-depth approach	3402	if (my $realloc = delete $self->{realloc}) {
		3403	for $widget (values %$realloc) {
		3404	$widget->{visible} or next; # do not resize invisible widgets
3121		3405
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3406	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3407
		3408	push @{ $queue[$widget->{visible}] }, $widget;
		3409	}
3124	}	3410	}
3125		3411
		3412	while () {
		3413	@queue or last outer;
		3414
3126	my $widget = pop @queue || last;	3415	$widget = pop @{ $queue[-1] || [] }
3127		3416	and last;
3128	defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131	? @$widget{qw(user_w user_h)}
3132	: $widget->size_request;
3133
3134	if (delete $widget->{force_alloc}
3135	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137		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}) {
3138	$widget->{req_w} = $w;	3433	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3434	$widget->{req_h} = $h;
3140		3435
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3436	$self->{size_alloc}{$widget+0} = $widget;
3142		3437
3143	$widget->{parent}->check_size
3144	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	}
3145	}	3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
3146	}	3448	}
3147	}	3449	}
3148		3450
3149	while ($self->{size_alloc}) {	3451	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	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)};
3152		3459
3153	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3155		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
3156	$widget->{w} = $w;	3470	$widget->{w} = $w;
3157	$widget->{h} = $h;	3471	$widget->{h} = $h;
		3472
3158	$widget->emit (size_allocate => $w, $h);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3159	}	3475	}
3160	}	3476	}
3161		3477
3162	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3163	$_->()	3479	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3165	}	3481	}
		3482
3166		3483
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3170		3487
…		…
3172	glLoadIdentity;	3489	glLoadIdentity;
3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3175	glLoadIdentity;	3492	glLoadIdentity;
3176		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
3177	$self->_draw;	3501	$self->_draw;
3178	}	3502	}
3179		3503
3180	#############################################################################	3504	#############################################################################
3181		3505

Diff Legend

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