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.269 by root, Fri Jun 2 06:22:55 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
		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	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432		543
433	glPushMatrix;	544	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	546	$self->_draw;
436	glPopMatrix;	547	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
449	glEnd;	560	glEnd;
450	glDisable GL_BLEND;	561	glDisable GL_BLEND;
451	}	562	}
452		563
453	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	565	glPushMatrix;
455	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
469	my ($self) = @_;	580	my ($self) = @_;
470		581
471	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
472	}	583	}
473		584
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	585	sub DESTROY {
535	my ($self) = @_;	586	my ($self) = @_;
536		587
537	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
538	#$self->deactivate;	589	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
596	}	647	}
597		648
598	sub size_request {	649	sub size_request {
599	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
600	}	653	}
601		654
602	sub draw { }	655	sub draw { }
603		656
604	#############################################################################	657	#############################################################################
…		…
633	$self->{children} = [	686	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
636	];	689	];
637		690
638	$self->check_size (1);	691	$self->realloc;
639	$self->update;
640	}	692	}
641		693
642	sub children {	694	sub children {
643	@{ $_[0]{children} }	695	@{ $_[0]{children} }
644	}	696	}
…		…
649	delete $child->{parent};	701	delete $child->{parent};
650	$child->hide;	702	$child->hide;
651		703
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		705
654	$self->check_size (1);	706	$self->realloc;
655	$self->update;
656	}	707	}
657		708
658	sub clear {	709	sub clear {
659	my ($self) = @_;	710	my ($self) = @_;
660		711
…		…
664	for (@$children) {	715	for (@$children) {
665	delete $_->{parent};	716	delete $_->{parent};
666	$_->hide;	717	$_->hide;
667	}	718	}
668		719
669	$self->check_size;	720	$self->realloc;
670	$self->update;
671	}	721	}
672		722
673	sub find_widget {	723	sub find_widget {
674	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
675		725
…		…
762	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	813	$self->update;
764	}	814	}
765		815
766	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
767	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
768	}	820	}
769		821
770	sub render_child {	822	sub render_child {
771	my ($self) = @_;	823	my ($self) = @_;
772		824
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
776		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
777	$self->_render;	836	$self->_render;
778	};	837	};
779	}	838	}
780		839
781	sub _draw {	840	sub _draw {
782	my ($self) = @_;	841	my ($self) = @_;
783		842
784	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
785		844
786	my $tex = $self->{texture}	845	my $tex = $self->{texture}
787	or return;	846	or return;
788		847
789	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
812	}	871	}
813		872
814	sub size_request {	873	sub size_request {
815	my ($self) = @_;	874	my ($self) = @_;
816		875
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		877
819	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
820	}	882	}
821		883
822	sub size_allocate {	884	sub size_allocate {
823	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
824		886
		887	my $child = $self->child;
		888
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		891
828	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
829	$self->update;	893	$self->update;
830	}	894	}
831		895
…		…
866	}	930	}
867	}	931	}
868		932
869	sub _render {	933	sub _render {
870	my ($self) = @_;	934	my ($self) = @_;
		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
871		938
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		940
874	$self->SUPER::_render;	941	$self->SUPER::_render;
875	}	942	}
…		…
974		1041
975	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
976		1043
977	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
978		1045
979	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1053
983	sub new {	1054	sub new {
984	my $class = shift;	1055	my ($class, %arg) = @_;
985		1056
986	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
987		1058
988	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1062	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1063	can_events => 1,
994	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
995	);	1067	);
996		1068
997	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
998	align => 0,	1070	align => 0,
999	valign => 1,	1071	valign => 1,
1000	text => $self->{title},	1072	text => $title,
1001	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1002		1075
1003	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004	}	1084	}
1005		1085
1006	sub border {	1086	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1008	}	1088	}
1009		1089
1010	sub size_request {	1090	sub size_request {
1011	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1012		1095
1013	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1014		1097
1015	(	1098	(
1016	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
1019	}	1102	}
1020		1103
1021	sub size_allocate {	1104	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
1023		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
1024	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1026		1117
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1031	}	1119	}
1032		1120
1033	sub button_down {	1121	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1035		1123
…		…
1051	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1052		1140
1053	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1055		1143
1056	$self->{user_x} = $wx + $dx * $mx;
1057	$self->{user_y} = $wy + $dy * $my;
1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060	$self->move ($self->{user_x}, $self->{user_y});	1146
1061	$self->check_size;	1147	$self->realloc;
		1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1062	};	1149	};
1063		1150
1064	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1068	$self->{motion} = sub {	1155	$self->{motion} = sub {
1069	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1070		1157
1071	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1072		1159
1073	$self->{user_x} = $bx + $x - $ox;	1160	$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	};	1161	};
1078	}	1162	}
1079	}	1163	}
1080		1164
1081	sub button_up {	1165	sub button_up {
…		…
1091	}	1175	}
1092		1176
1093	sub _draw {	1177	sub _draw {
1094	my ($self) = @_;	1178	my ($self) = @_;
1095		1179
		1180	my $child = $self->{children}[0];
		1181
1096	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1097	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1098		1184
1099	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1100	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101		1187
1102	my $border = $self->border;	1188	my $border = $self->border;
1103		1189
1104	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1105	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1106	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109		1195
1110	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1112		1198
1113	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1114	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1115	my $rep_y = $ch / $bg->{h};	1202	$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);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123	}	1204	}
1124		1205
1125	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1126		1207
1127	$self->{title}->draw if $self->{title};
1128
1129	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1130	}	1214	}
1131		1215
1132	#############################################################################	1216	#############################################################################
1133		1217
1134	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1156	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1157		1241
1158	$child->set_parent ($self);	1242	$child->set_parent ($self);
1159	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1160		1244
1161	$self->check_size (1);	1245	$self->realloc;
1162	}	1246	}
1163		1247
1164	# TODO: move to container class maybe? send children a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1165	sub clear {	1249	sub clear {
1166	my ($self) = @_;	1250	my ($self) = @_;
…		…
1171	for (@children) {	1255	for (@children) {
1172	delete $_->{parent};	1256	delete $_->{parent};
1173	$_->hide;	1257	$_->hide;
1174	}	1258	}
1175		1259
1176	$self->check_size (1);	1260	$self->realloc;
1177	$self->update;
1178	}	1261	}
1179		1262
1180	sub get_wh {	1263	sub get_wh {
1181	my ($self) = @_;	1264	my ($self) = @_;
1182		1265
…		…
1278	}	1361	}
1279	}	1362	}
1280		1363
1281	#############################################################################	1364	#############################################################################
1282		1365
1283	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1284
1285	# TODO: wrap into common Box base class
1286		1367
1287	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1288		1369
1289	sub size_request {	1370	sub size_request {
1290	my ($self) = @_;	1371	my ($self) = @_;
1291		1372
1292	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1293		1374	? (
1294	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1295	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296	(List::Util::max map $_->[1], @alloc),	1377	)
1297	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1298	}	1382	}
1299		1383
1300	sub size_allocate {	1384	sub size_allocate {
1301	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1302		1386
1303	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1304
1305	my $children = $self->{children};	1388	my $children = $self->{children};
1306		1389
1307	my @h = map $_->{req_w}, @$children;	1390	my @req;
1308		1391
1309	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1310		1393	@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 {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1315	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316	$exp ||= 1;
1317		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1318	for (0 .. $#$children) {	1407	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	}	1408	}
1325	}	1409	}
1326		1410
1327	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1328		1412
1329	my $y = 0;	1413	my $pos = 0;
1330	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1331	my $child = $children->[$_];
1332	my $h = $h[$_];	1415	my $alloc = $req[$_];
1333	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334		1417
1335	$y += $h;	1418	$pos += $alloc;
1336	}	1419	}
1337		1420
1338	1	1421	1
1339	}	1422	}
1340		1423
1341	#############################################################################	1424	#############################################################################
1342		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1343	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1344		1442
1345	# TODO: wrap into common Box base class
1346
1347	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1348		1444
1349	sub size_request {	1445	sub new {
1350	my ($self) = @_;	1446	my $class = shift;
1351		1447
1352	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1353		1449	vertical => 1,
1354	(	1450	@_,
1355	(List::Util::max map $_->[0], @alloc),
1356	(List::Util::sum map $_->[1], @alloc),
1357	)	1451	)
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	}	1452	}
1398		1453
1399	#############################################################################	1454	#############################################################################
1400		1455
1401	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1418	ellipsise => 3, # end	1473	ellipsise => 3, # end
1419	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1420	fontsize => 1,	1475	fontsize => 1,
1421	align => -1,	1476	align => -1,
1422	valign => -1,	1477	valign => -1,
1423	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1424	can_events => 0,	1480	can_events => 0,
1425	%arg	1481	%arg
1426	);	1482	);
1427		1483
1428	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1464	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1465		1521
1466	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1468		1524
		1525	$self->realloc;
1469	$self->update;	1526	$self->update;
1470	$self->check_size;
1471	}	1527	}
1472		1528
1473	sub set_markup {	1529	sub set_markup {
1474	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1475		1531
…		…
1479	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480		1536
1481	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1483		1539
		1540	$self->realloc;
1484	$self->update;	1541	$self->update;
1485	$self->check_size;
1486	}	1542	}
1487		1543
1488	sub size_request {	1544	sub size_request {
1489	my ($self) = @_;	1545	my ($self) = @_;
1490		1546
…		…
1504		1560
1505	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1506	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1507	}	1563	}
1508		1564
1509	(	1565	($w, $h)
1510	$w + $self->{padding} * 2,
1511	$h + $self->{padding} * 2,
1512	)
1513	}	1566	}
1514		1567
1515	sub size_allocate {	1568	sub size_allocate {
1516	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1517		1570
		1571	delete $self->{ox};
		1572
1518	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519	}	1575	}
1520		1576
1521	sub set_fontsize {	1577	sub set_fontsize {
1522	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1523		1579
1524	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1525	delete $self->{texture};	1581	delete $self->{texture};
1526		1582
1527	$self->update;	1583	$self->realloc;
1528	$self->check_size;
1529	}	1584	}
1530		1585
1531	sub _draw {	1586	sub _draw {
1532	my ($self) = @_;	1587	my ($self) = @_;
1533		1588
…		…
1539	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1540	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543		1598
1544	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1545		1601
		1602	unless (exists $self->{ox}) {
1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1549		1606
1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1553
1554	$tex
1555	};	1610	};
1556		1611
1557	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1558	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559		1614
…		…
1613	sub set_text {	1668	sub set_text {
1614	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1615		1670
1616	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1617	$self->_set_text ($text);	1672	$self->_set_text ($text);
1618	$self->update;	1673
1619	$self->check_size;	1674	$self->realloc;
1620	}	1675	}
1621		1676
1622	sub get_text {	1677	sub get_text {
1623	$_[0]{text}	1678	$_[0]{text}
1624	}	1679	}
…		…
1657	} elsif ($uni) {	1712	} elsif ($uni) {
1658	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1659	}	1714	}
1660		1715
1661	$self->_set_text ($text);	1716	$self->_set_text ($text);
1662	$self->update;	1717
1663	$self->check_size;	1718	$self->realloc;
1664	}	1719	}
1665		1720
1666	sub focus_in {	1721	sub focus_in {
1667	my ($self) = @_;	1722	my ($self) = @_;
1668		1723
…		…
1795		1850
1796	sub new {	1851	sub new {
1797	my $class = shift;	1852	my $class = shift;
1798		1853
1799	$class->SUPER::new (	1854	$class->SUPER::new (
1800	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1801	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1802	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1803	can_hover => 1,	1859	can_hover => 1,
1804	align => 0,	1860	align => 0,
1805	valign => 0,	1861	valign => 0,
…		…
1852		1908
1853	sub new {	1909	sub new {
1854	my $class = shift;	1910	my $class = shift;
1855		1911
1856	$class->SUPER::new (	1912	$class->SUPER::new (
1857	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1858	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1859	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1860	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1861	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1862	state => 0,	1919	state => 0,
…		…
1866	}	1923	}
1867		1924
1868	sub size_request {	1925	sub size_request {
1869	my ($self) = @_;	1926	my ($self) = @_;
1870		1927
1871	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1872	}	1929	}
1873		1930
1874	sub button_down {	1931	sub button_down {
1875	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1876		1933
1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1880	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1881	}	1938	}
1882	}	1939	}
1883		1940
1884	sub _draw {	1941	sub _draw {
1885	my ($self) = @_;	1942	my ($self) = @_;
1886		1943
1887	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1888		1945
1889	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890		1947
1891	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892		1951
1893	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894		1953
1895	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1896		1955
…		…
2161	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2162	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2163	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2164	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2165	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2166	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2167	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2168	vertical => 0,	2227	vertical => 0,
2169	can_hover => 1,	2228	can_hover => 1,
2170	inner_pad => 0.02,	2229	inner_pad => 0.02,
2171	@_	2230	@_
2172	);	2231	);
…		…
2175	$self->update;	2234	$self->update;
2176		2235
2177	$self	2236	$self
2178	}	2237	}
2179		2238
		2239	sub changed { }
		2240
2180	sub set_range {	2241	sub set_range {
2181	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2182		2243
2183	($range, $self->{range}) = ($self->{range}, $range);	2244	($range, $self->{range}) = ($self->{range}, $range);
2184		2245
…		…
2210	}	2271	}
2211		2272
2212	sub size_request {	2273	sub size_request {
2213	my ($self) = @_;	2274	my ($self) = @_;
2214		2275
2215	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2216	my $h = $self->{req_h};
2217
2218	$self->{vertical} ? ($h, $w) : ($w, $h)
2219	}	2277	}
2220		2278
2221	sub button_down {	2279	sub button_down {
2222	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2223		2281
…		…
2579	state => 0,	2637	state => 0,
2580	on_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2581	@_	2639	@_
2582	);	2640	);
2583		2641
2584	if ($self->{state}) {
2585	$self->{state} = 0;
2586	$self->toggle_flopper;
2587	}
2588
2589	$self	2642	$self
2590	}	2643	}
2591		2644
2592	sub toggle_flopper {	2645	sub toggle_flopper {
2593	my ($self) = @_;	2646	my ($self) = @_;
2594		2647
2595	# TODO: use animation	2648	$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	}	2649	}
2607		2650
2608	#############################################################################	2651	#############################################################################
2609		2652
2610	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2623	}	2666	}
2624		2667
2625	sub set_tooltip_from {	2668	sub set_tooltip_from {
2626	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2627		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2628	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2629	markup => $widget->{tooltip},	2681	markup => $tooltip,
2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631	fontsize => 0.8,	2683	fontsize => 0.8,
2632	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2633	ellipsise => 0,	2685	ellipsise => 0,
2634	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2645		2697
2646	sub size_allocate {	2698	sub size_allocate {
2647	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2648		2700
2649	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2650	}	2720	}
2651		2721
2652	sub _draw {	2722	sub _draw {
2653	my ($self) = @_;	2723	my ($self) = @_;
2654		2724
…		…
2671	glVertex $w, $h;	2741	glVertex $w, $h;
2672	glVertex $w, 0;	2742	glVertex $w, 0;
2673	glEnd;	2743	glEnd;
2674		2744
2675	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2676	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2677	}	2748	}
2678		2749
2679	#############################################################################	2750	#############################################################################
2680		2751
…		…
2756	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2757	}	2828	}
2758		2829
2759	#############################################################################	2830	#############################################################################
2760		2831
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;	2832	package CFClient::UI::Menu;
2809		2833
2810	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2811		2835
2812	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2850	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2851	$GRAB = $self;	2875	$GRAB = $self;
2852	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2853		2877
2854	$self->show;	2878	$self->show;
2855	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856	}	2880	}
2857		2881
2858	sub mouse_motion {	2882	sub mouse_motion {
2859	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2860		2884
…		…
2985	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2986	}	3010	}
2987		3011
2988	#############################################################################	3012	#############################################################################
2989		3013
2990	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2991		3015
2992	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994	use CFClient::OpenGL;
2995		3017
2996	sub new {	3018	sub new {
2997	my $class = shift;	3019	my $class = shift;
2998		3020
2999	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3023	@_,
		3024	);
		3025
		3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156	# if $commit is true, the binding will be set after the user entered a key combo
		3157	sub ask_for_bind {
		3158	my ($self, $commit) = @_;
		3159
		3160	CFClient::Binder::open_binding_dialog (sub {
		3161	my ($mod, $sym) = @_;
		3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3163	$self->update_binding_widgets;
		3164	$self->commit if $commit;
		3165	});
		3166	}
		3167
		3168	# $mod and $sym are the modifiers and key symbol
		3169	# $cmds is a array ref of strings (the commands)
		3170	# $cb is the callback that is executed on OK
		3171	# $ccb is the callback that is executed on CANCEL and
		3172	# when the binding was unsuccessful on OK
		3173	sub set_binding {
		3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3175
		3176	$self->clear_command_list;
		3177	$self->{recording} = 0;
		3178	$self->{rec_btn}->set_text ("start recording");
		3179
		3180	$self->{binding} = [$mod, $sym];
		3181	$self->{commands} = $cmds;
		3182
		3183	$self->{binding_change} = $cb;
		3184	$self->{binding_cancel} = $ccb;
		3185
		3186	$self->update_binding_widgets;
		3187	}
		3188
		3189	# this is a shortcut method that asks for a binding
		3190	# and then just binds it.
		3191	sub do_quick_binding {
		3192	my ($self, $cmds) = @_;
		3193	$self->set_binding (undef, undef, $cmds, sub {
		3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3195	});
		3196	$self->ask_for_bind (1);
		3197	}
		3198
		3199	sub update_binding_widgets {
		3200	my ($self) = @_;
		3201	my ($mod, $sym, $cmds) = $self->get_binding;
		3202	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3203	$self->set_command_list ($cmds);
		3204	}
		3205
		3206	sub get_binding {
		3207	my ($self) = @_;
		3208	return (
		3209	$self->{binding}->[0],
		3210	$self->{binding}->[1],
		3211	[ grep { defined $_ } @{$self->{commands}} ]
		3212	);
		3213	}
		3214
		3215	sub clear_command_list {
		3216	my ($self) = @_;
		3217	$self->{cmdbox}->clear ();
		3218	}
		3219
		3220	sub set_command_list {
		3221	my ($self, $cmds) = @_;
		3222
		3223	$self->{cmdbox}->clear ();
		3224	$self->{commands} = $cmds;
		3225
		3226	my $idx = 0;
		3227
		3228	for (@$cmds) {
		3229	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3230
		3231	my $i = $idx;
		3232	$hb->add (new CFClient::UI::Label text => $_);
		3233	$hb->add (new CFClient::UI::Button
		3234	text => "delete",
		3235	tooltip => "Deletes the action from the record",
		3236	on_activate => sub {
		3237	$self->{cmdbox}->remove ($hb);
		3238	$cmds->[$i] = undef;
		3239	});
		3240
		3241
		3242	$idx++
		3243	}
		3244	}
		3245
		3246	#############################################################################
		3247
		3248	package CFClient::UI::SpellList;
		3249
		3250	our @ISA = CFClient::UI::FancyFrame::;
		3251
		3252	sub new {
		3253	my $class = shift;
		3254
		3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3256
		3257	$self->add (new CFClient::UI::ScrolledWindow
		3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3259
		3260	$self;
		3261	}
		3262
		3263	# XXX: Do sorting? Argl...
		3264	sub add_spell {
		3265	my ($self, $spell) = @_;
		3266	$self->{spells}->{$spell->{name}} = $spell;
		3267
		3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3269	face => $spell->{face},
		3270	can_hover => 1,
		3271	can_events => 1,
		3272	tooltip => $spell->{message});
		3273
		3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3275	text => $spell->{name},
		3276	can_hover => 1,
		3277	can_events => 1,
		3278	tooltip => $spell->{message},
		3279	expand => 1);
		3280
		3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3283	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3287	text => "bind to key",
		3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3289	}
		3290
		3291	sub rebuild_spell_list {
		3292	my ($self) = @_;
		3293	$self->{tbl_idx} = 0;
		3294	$self->add_spell ($_) for values %{$self->{spells}};
		3295	}
		3296
		3297	sub remove_spell {
		3298	my ($self, $spell) = @_;
		3299	delete $self->{spells}->{$spell->{name}};
		3300	$self->rebuild_spell_list;
		3301	}
		3302
		3303	#############################################################################
		3304
		3305	package CFClient::UI::Root;
		3306
		3307	our @ISA = CFClient::UI::Container::;
		3308
		3309	use CFClient::OpenGL;
		3310
		3311	sub new {
		3312	my $class = shift;
		3313
		3314	my $self = $class->SUPER::new (
3000	visible => 1,	3315	visible => 1,
3001	@_,	3316	@_,
3002	)	3317	);
3003	}
3004		3318
3005	sub configure {	3319	Scalar::Util::weaken ($self->{root} = $self);
3006	my ($self, $x, $y, $w, $h) = @_;
3007		3320
3008	$self->{w} = $w;	3321	$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	}	3322	}
3018		3323
3019	sub size_request {	3324	sub size_request {
3020	my ($self) = @_;	3325	my ($self) = @_;
3021		3326
3022	($self->{w}, $self->{h})	3327	($self->{w}, $self->{h})
		3328	}
		3329
		3330	sub _to_pixel {
		3331	my ($coord, $size, $max) = @_;
		3332
		3333	$coord =
		3334	$coord eq "center" ? ($max - $size) * 0.5
		3335	: $coord eq "max" ? $max
		3336	: $coord;
		3337
		3338	$coord = 0 if $coord < 0;
		3339	$coord = $max - $size if $coord > $max - $size;
		3340
		3341	int $coord + 0.5
3023	}	3342	}
3024		3343
3025	sub size_allocate {	3344	sub size_allocate {
3026	my ($self, $w, $h) = @_;	3345	my ($self, $w, $h) = @_;
3027		3346
3028	for my $child ($self->children) {	3347	for my $child ($self->children) {
3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3348	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030		3349
3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3350	$X = $child->{force_x} if exists $child->{force_x};
3032	if exists $child->{req_x};	3351	$Y = $child->{force_y} if exists $child->{force_y};
3033		3352
3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3353	$X = _to_pixel $X, $W, $self->{w};
3035	if exists $child->{req_y};	3354	$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		3355
3040	$child->configure ($X, $Y, $W, $H);	3356	$child->configure ($X, $Y, $W, $H);
3041	}	3357	}
3042	}	3358	}
3043		3359
…		…
3054	}	3370	}
3055		3371
3056	sub update {	3372	sub update {
3057	my ($self) = @_;	3373	my ($self) = @_;
3058		3374
3059	$self->check_size;
3060	$::WANT_REFRESH++;	3375	$::WANT_REFRESH++;
3061	}	3376	}
3062		3377
3063	sub add {	3378	sub add {
3064	my ($self, @children) = @_;	3379	my ($self, @children) = @_;
3065		3380
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;	3381	$_->{is_toplevel} = 1
3074		3382	for @children;
3075	# integerise window positions
3076	$child->{x} = int $child->{x};
3077	$child->{y} = int $child->{y};
3078	}
3079		3383
3080	$self->SUPER::add (@children);	3384	$self->SUPER::add (@children);
3081	}	3385	}
3082		3386
3083	sub remove {	3387	sub remove {
3084	my ($self, @children) = @_;	3388	my ($self, @children) = @_;
3085		3389
3086	$self->SUPER::remove (@children);	3390	$self->SUPER::remove (@children);
		3391
		3392	delete $self->{is_toplevel}
		3393	for @children;
3087		3394
3088	while (@children) {	3395	while (@children) {
3089	my $w = pop @children;	3396	my $w = pop @children;
3090	push @children, $w->children;	3397	push @children, $w->children;
3091	$w->set_invisible;	3398	$w->set_invisible;
…		…
3110	while ($self->{refresh_hook}) {	3417	while ($self->{refresh_hook}) {
3111	$_->()	3418	$_->()
3112	for values %{delete $self->{refresh_hook}};	3419	for values %{delete $self->{refresh_hook}};
3113	}	3420	}
3114		3421
3115	if ($self->{check_size}) {	3422	if ($self->{realloc}) {
		3423	my %queue;
3116	my @queue;	3424	my @queue;
		3425	my $widget;
3117		3426
3118	for (;;) {	3427	outer:
3119	if ($self->{check_size}) {	3428	while () {
3120	#TODO use array-of-depth approach	3429	if (my $realloc = delete $self->{realloc}) {
		3430	for $widget (values %$realloc) {
		3431	$widget->{visible} or next; # do not resize invisible widgets
3121		3432
3122	@queue = sort { $a->{visible} <=> $b->{visible} }	3433	$queue{$widget+0}++ and next; # duplicates are common
3123	@queue, values %{delete $self->{check_size}};	3434
		3435	push @{ $queue[$widget->{visible}] }, $widget;
		3436	}
3124	}	3437	}
3125		3438
		3439	while () {
		3440	@queue or last outer;
		3441
3126	my $widget = pop @queue || last;	3442	$widget = pop @{ $queue[-1] || [] }
3127		3443	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		3444
		3445	pop @queue;
		3446	}
		3447
		3448	delete $queue{$widget+0};
		3449
		3450	my ($w, $h) = $widget->size_request;
		3451
		3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3453	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3454
		3455	$w = $widget->{force_w} if exists $widget->{force_w};
		3456	$h = $widget->{force_h} if exists $widget->{force_h};
		3457
		3458	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3459	|| delete $widget->{force_realloc}) {
3138	$widget->{req_w} = $w;	3460	$widget->{req_w} = $w;
3139	$widget->{req_h} = $h;	3461	$widget->{req_h} = $h;
3140		3462
3141	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3463	$self->{size_alloc}{$widget+0} = $widget;
3142		3464
3143	$widget->{parent}->check_size
3144	if $widget->{parent};	3465	if (my $parent = $widget->{parent}) {
		3466	$self->{realloc}{$parent+0} = $parent
		3467	unless $queue{$parent+0};
		3468
		3469	$parent->{force_size_alloc} = 1;
		3470	$self->{size_alloc}{$parent+0} = $parent;
		3471	}
3145	}	3472	}
		3473
		3474	delete $self->{realloc}{$widget+0};
3146	}	3475	}
3147	}	3476	}
3148		3477
3149	while ($self->{size_alloc}) {	3478	while (my $size_alloc = delete $self->{size_alloc}) {
3150	for (values %{delete $self->{size_alloc}}) {	3479	my @queue = sort { $b->{visible} <=> $a->{visible} }
3151	my ($widget, $w, $h) = @$_;	3480	values %$size_alloc;
		3481
		3482	while () {
		3483	my $widget = pop @queue || last;
		3484
		3485	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152		3486
3153	$w = 0 if $w < 0;	3487	$w = 0 if $w < 0;
3154	$h = 0 if $h < 0;	3488	$h = 0 if $h < 0;
3155		3489
		3490	$w = int $w + 0.5;
		3491	$h = int $h + 0.5;
		3492
		3493	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3494	$widget->{old_w} = $widget->{w};
		3495	$widget->{old_h} = $widget->{h};
		3496
3156	$widget->{w} = $w;	3497	$widget->{w} = $w;
3157	$widget->{h} = $h;	3498	$widget->{h} = $h;
		3499
3158	$widget->emit (size_allocate => $w, $h);	3500	$widget->emit (size_allocate => $w, $h);
		3501	}
3159	}	3502	}
3160	}	3503	}
3161		3504
3162	while ($self->{post_alloc_hook}) {	3505	while ($self->{post_alloc_hook}) {
3163	$_->()	3506	$_->()
3164	for values %{delete $self->{post_alloc_hook}};	3507	for values %{delete $self->{post_alloc_hook}};
3165	}	3508	}
		3509
3166		3510
3167	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169	glClear GL_COLOR_BUFFER_BIT;	3513	glClear GL_COLOR_BUFFER_BIT;
3170		3514
…		…
3172	glLoadIdentity;	3516	glLoadIdentity;
3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174	glMatrixMode GL_MODELVIEW;	3518	glMatrixMode GL_MODELVIEW;
3175	glLoadIdentity;	3519	glLoadIdentity;
3176		3520
		3521	{
		3522	package CFClient::UI::Base;
		3523
		3524	($draw_x, $draw_y, $draw_w, $draw_h) =
		3525	(0, 0, $self->{w}, $self->{h});
		3526	}
		3527
3177	$self->_draw;	3528	$self->_draw;
3178	}	3529	}
3179		3530
3180	#############################################################################	3531	#############################################################################
3181		3532

Diff Legend

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