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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
		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	}
227
228	sub toggle_visibility {
229	my ($self) = @_;
230
231	if ($self->{visible}) {
232	$self->hide;
233	} else {
234	$self->show;
235	}
236	}	237	}
237		238
238	sub destroy {	239	sub destroy {
239	my ($self) = @_;	240	my ($self) = @_;
240		241
…		…
242	%$self = ();	243	%$self = ();
243	}	244	}
244		245
245	sub show {	246	sub show {
246	my ($self) = @_;	247	my ($self) = @_;
		248
247	return if $self->{parent};	249	return if $self->{parent};
248		250
249	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
250	}	252	}
251		253
252	sub show_centered {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
		256
254	return if $self->{parent};	257	return if $self->{visible};
255		258
256	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
257		261
258	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
259	"centered $self" => sub {	263
260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
261	},	265
262	);	266	$_->set_visible for $self->children;
263	}	267	}
264		268
265	sub set_invisible {	269	sub set_invisible {
266	my ($self) = @_;	270	my ($self) = @_;
267		271
268	return unless $self->{visible};	272	return unless $self->{visible};
269		273
270	# broken show/hide model	274	$_->set_invisible for $self->children;
271		275
272	delete $self->{root};	276	delete $self->{root};
273	delete $self->{visible};	277	delete $self->{visible};
274		278
275	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
276	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
277		281
278	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
279	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
280		284
281	$self->focus_out;	285	$self->focus_out;
282		286
283	$self->emit (visibility_change => 0);	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;
284	}	305	}
285		306
286	sub hide {	307	sub hide {
287	my ($self) = @_;	308	my ($self) = @_;
288		309
…		…
290		311
291	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
292	if $self->{parent};	313	if $self->{parent};
293	}	314	}
294		315
295	sub move {	316	sub move_abs {
296	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
297		318
298	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
299	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
300	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
301		322
302	$self->update;	323	$self->update;
303	}	324	}
304		325
305	sub set_size {	326	sub set_size {
306	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
307		328
308	$self->{user_w} = $w;	329	$self->{force_w} = $w;
309	$self->{user_h} = $h;	330	$self->{force_h} = $h;
310		331
311	$self->check_size;	332	$self->realloc;
312	}	333	}
313		334
314	sub size_request {	335	sub size_request {
315	require Carp;	336	require Carp;
316	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
318		339
319	sub configure {	340	sub configure {
320	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
321		342
322	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
323	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
324	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
325		348
326	# use alignment to adjust x, y	349	# use alignment to adjust x, y
327		350
328	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
329	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
330
331	($w, $h) = ($w2, $h2);
332	}	353	}
333		354
334	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
335	$self->{x} = $x;	356	$self->{x} = $x;
336	$self->{y} = $y;	357	$self->{y} = $y;
337	$self->update;	358	$self->update;
338	}	359	}
339		360
340	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341	$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;
342	}	368	}
343	}	369	}
344		370
345	sub size_allocate {	371	sub size_allocate {
346	# nothing to be done	372	# nothing to be done
347	}
348
349	sub reconfigure {
350	my ($self) = @_;
351
352	$self->check_size (1);
353	$self->update;
354	}	373	}
355		374
356	sub children {	375	sub children {
357	}	376	}
358		377
…		…
431	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
432		451
433	$self->focus_in;	452	$self->focus_in;
434	}	453	}
435		454
436	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
437	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
438	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
439	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
440	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
441		528
442	sub draw {	529	sub draw {
443	my ($self) = @_;	530	my ($self) = @_;
444		531
445	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);
446		543
447	glPushMatrix;	544	glPushMatrix;
448	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
449	$self->_draw;	546	$self->_draw;
450	glPopMatrix;	547	glPopMatrix;
…		…
462	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
463	glEnd;	560	glEnd;
464	glDisable GL_BLEND;	561	glDisable GL_BLEND;
465	}	562	}
466		563
467	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
468	glPushMatrix;	565	glPushMatrix;
469	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
471	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
472	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
483	my ($self) = @_;	580	my ($self) = @_;
484		581
485	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
486	}	583	}
487		584
488	sub find_widget {
489	my ($self, $x, $y) = @_;
490
491	return () unless $self->{can_events};
492
493	return $self
494	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497	()
498	}
499
500	sub set_parent {
501	my ($self, $parent) = @_;
502
503	Scalar::Util::weaken ($self->{parent} = $parent);
504
505	if ($parent->{visible} || 1) {
506	$self->{root} = $parent->{root};
507	$self->{visible} = $parent->{visible} + 1;
508
509	$self->emit (visibility_change => 1)
510	unless $self->{parent}{visible};
511	}
512
513	# TODO: req_w _does_change after ->reconfigure
514	$self->check_size
515	unless exists $self->{req_w};
516
517	$self->show;
518	}
519
520	sub check_size {
521	my ($self, $forced) = @_;
522
523	$self->{force_alloc} = 1 if $forced;
524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
525	}
526
527	sub update {
528	my ($self) = @_;
529
530	$self->{parent}->update
531	if $self->{parent};
532	}
533
534	sub connect {
535	my ($self, $signal, $cb) = @_;
536
537	push @{ $self->{signal_cb}{$signal} }, $cb;
538	}
539
540	sub _emit {
541	my ($self, $signal, @args) = @_;
542
543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544	}
545
546	sub emit {
547	my ($self, $signal, @args) = @_;
548
549	$self->_emit ($signal, @args)
550	|| $self->$signal (@args);
551	}
552
553	sub visibility_change {
554	#my ($self, $visible) = @_;
555	}
556
557	sub DESTROY {	585	sub DESTROY {
558	my ($self) = @_;	586	my ($self) = @_;
559		587
560	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
561	#$self->deactivate;	589	#$self->deactivate;
…		…
617	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
618	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
619	}	647	}
620		648
621	sub size_request {	649	sub size_request {
622	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
623	}	653	}
624		654
625	sub draw { }	655	sub draw { }
626		656
627	#############################################################################	657	#############################################################################
…		…
656	$self->{children} = [	686	$self->{children} = [
657	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
658	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
659	];	689	];
660		690
661	$self->check_size (1);	691	$self->realloc;
662	$self->update;
663	}	692	}
664		693
665	sub children {	694	sub children {
666	@{ $_[0]{children} }	695	@{ $_[0]{children} }
667	}	696	}
…		…
672	delete $child->{parent};	701	delete $child->{parent};
673	$child->hide;	702	$child->hide;
674		703
675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676		705
677	$self->check_size (1);	706	$self->realloc;
678	$self->update;
679	}	707	}
680		708
681	sub clear {	709	sub clear {
682	my ($self) = @_;	710	my ($self) = @_;
683		711
…		…
687	for (@$children) {	715	for (@$children) {
688	delete $_->{parent};	716	delete $_->{parent};
689	$_->hide;	717	$_->hide;
690	}	718	}
691		719
692	$self->check_size;	720	$self->realloc;
693	$self->update;
694	}	721	}
695		722
696	sub find_widget {	723	sub find_widget {
697	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
698		725
…		…
785	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
786	$self->update;	813	$self->update;
787	}	814	}
788		815
789	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
790	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
791	}	820	}
792		821
793	sub render_child {	822	sub render_child {
794	my ($self) = @_;	823	my ($self) = @_;
795		824
796	$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 {
797	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
798	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
799		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
800	$self->_render;	836	$self->_render;
801	};	837	};
802	}	838	}
803		839
804	sub _draw {	840	sub _draw {
805	my ($self) = @_;	841	my ($self) = @_;
806		842
807	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
808		844
809	my $tex = $self->{texture}	845	my $tex = $self->{texture}
810	or return;	846	or return;
811		847
812	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
835	}	871	}
836		872
837	sub size_request {	873	sub size_request {
838	my ($self) = @_;	874	my ($self) = @_;
839		875
840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841		877
842	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
843	}	882	}
844		883
845	sub size_allocate {	884	sub size_allocate {
846	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
847		886
		887	my $child = $self->child;
		888
848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850		891
851	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
852	$self->update;	893	$self->update;
853	}	894	}
854		895
…		…
889	}	930	}
890	}	931	}
891		932
892	sub _render {	933	sub _render {
893	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};
894		938
895	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896		940
897	$self->SUPER::_render;	941	$self->SUPER::_render;
898	}	942	}
…		…
997		1041
998	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
999		1043
1000	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
1001		1045
1002	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 =
1003	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004	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);
1005		1053
1006	sub new {	1054	sub new {
1007	my $class = shift;	1055	my $class = shift;
1008
1009	# TODO: user_x, user_y, overwrite moveto?
1010		1056
1011	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
1012	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
1013	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
1014	border => 0.6,	1060	border => 0.6,
1015	is_toplevel => 1,
1016	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
1017	@_	1064	@_
1018	);	1065	);
1019		1066
1020	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
1021	align => 0,	1068	align => 0,
…		…
1074	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1075		1122
1076	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1077	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1078		1125
1079	$self->{user_x} = $wx + $dx * $mx;
1080	$self->{user_y} = $wy + $dy * $my;
1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083	$self->move ($self->{user_x}, $self->{user_y});	1128
1084	$self->check_size;	1129	$self->realloc;
		1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1085	};	1131	};
1086		1132
1087	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1091	$self->{motion} = sub {	1137	$self->{motion} = sub {
1092	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1093		1139
1094	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1095		1141
1096	$self->{user_x} = $bx + $x - $ox;	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097	$self->{user_y} = $by + $y - $oy;
1098	$self->move ($self->{user_x}, $self->{user_y});
1099	$self->update;
1100	};	1143	};
1101	}	1144	}
1102	}	1145	}
1103		1146
1104	sub button_up {	1147	sub button_up {
…		…
1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124		1167
1125	my $border = $self->border;	1168	my $border = $self->border;
1126		1169
1127	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132		1175
1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1135		1178
1136	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1137	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1138	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1139
1140	glColor @{ $self->{bg} };
1141
1142	$bg->{s} = $rep_x;
1143	$bg->{t} = $rep_y;
1144	$bg->{wrap_mode} = 1;
1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146	}	1184	}
1147		1185
1148	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1149		1187
…		…
1179	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1180		1218
1181	$child->set_parent ($self);	1219	$child->set_parent ($self);
1182	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1183		1221
1184	$self->check_size (1);	1222	$self->realloc;
1185	}	1223	}
1186		1224
1187	# TODO: move to container class maybe? send children a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1188	sub clear {	1226	sub clear {
1189	my ($self) = @_;	1227	my ($self) = @_;
…		…
1194	for (@children) {	1232	for (@children) {
1195	delete $_->{parent};	1233	delete $_->{parent};
1196	$_->hide;	1234	$_->hide;
1197	}	1235	}
1198		1236
1199	$self->check_size (1);	1237	$self->realloc;
1200	$self->update;
1201	}	1238	}
1202		1239
1203	sub get_wh {	1240	sub get_wh {
1204	my ($self) = @_;	1241	my ($self) = @_;
1205		1242
…		…
1301	}	1338	}
1302	}	1339	}
1303		1340
1304	#############################################################################	1341	#############################################################################
1305		1342
1306	package CFClient::UI::HBox;	1343	package CFClient::UI::Box;
1307
1308	# TODO: wrap into common Box base class
1309		1344
1310	our @ISA = CFClient::UI::Container::;	1345	our @ISA = CFClient::UI::Container::;
1311		1346
1312	sub size_request {	1347	sub size_request {
1313	my ($self) = @_;	1348	my ($self) = @_;
1314		1349
1315	my @alloc = map [$_->size_request], @{$self->{children}};	1350	$self->{vertical}
1316		1351	? (
1317	(	1352	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1318	(List::Util::sum map $_->[0], @alloc),	1353	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319	(List::Util::max map $_->[1], @alloc),	1354	)
1320	)	1355	: (
		1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1358	)
1321	}	1359	}
1322		1360
1323	sub size_allocate {	1361	sub size_allocate {
1324	my ($self, $w, $h) = @_;	1362	my ($self, $w, $h) = @_;
1325		1363
1326	($h, $w) = ($w, $h);	1364	my $space = $self->{vertical} ? $h : $w;
1327
1328	my $children = $self->{children};	1365	my $children = $self->{children};
1329		1366
1330	my @h = map $_->{req_w}, @$children;	1367	my @req;
1331		1368
1332	my $req_h = List::Util::sum @h;	1369	if ($self->{homogeneous}) {
1333		1370	@req = ($space / (@$children || 1)) x @$children;
1334	if ($req_h > $h) {
1335	# ah well, not enough space
1336	$_ *= $h / $req_h for @h;
1337	} else {	1371	} else {
		1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1373	my $req = List::Util::sum @req;
		1374
		1375	if ($req > $space) {
		1376	# ah well, not enough space
		1377	$_ *= $space / $req for @req;
		1378	} else {
1338	my $exp = List::Util::sum map $_->{expand}, @$children;	1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339	$exp ||= 1;
1340		1380
		1381	$space = ($space - $req) / $expand; # remaining space to give away
		1382
		1383	$req[$_] += $space * $children->[$_]{expand}
1341	for (0 .. $#$children) {	1384	for 0 .. $#$children;
1342	my $child = $children->[$_];
1343
1344	my $alloc_h = $h[$_];
1345	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346	$h[$_] = $alloc_h;
1347	}	1385	}
1348	}	1386	}
1349		1387
1350	CFClient::UI::harmonize \@h;	1388	CFClient::UI::harmonize \@req;
1351		1389
1352	my $y = 0;	1390	my $pos = 0;
1353	for (0 .. $#$children) {	1391	for (0 .. $#$children) {
1354	my $child = $children->[$_];
1355	my $h = $h[$_];	1392	my $alloc = $req[$_];
1356	$child->configure ($y, 0, $h, $w);	1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357		1394
1358	$y += $h;	1395	$pos += $alloc;
1359	}	1396	}
1360		1397
1361	1	1398	1
1362	}	1399	}
1363		1400
1364	#############################################################################	1401	#############################################################################
1365		1402
		1403	package CFClient::UI::HBox;
		1404
		1405	our @ISA = CFClient::UI::Box::;
		1406
		1407	sub new {
		1408	my $class = shift;
		1409
		1410	$class->SUPER::new (
		1411	vertical => 0,
		1412	@_,
		1413	)
		1414	}
		1415
		1416	#############################################################################
		1417
1366	package CFClient::UI::VBox;	1418	package CFClient::UI::VBox;
1367		1419
1368	# TODO: wrap into common Box base class
1369
1370	our @ISA = CFClient::UI::Container::;	1420	our @ISA = CFClient::UI::Box::;
1371		1421
1372	sub size_request {	1422	sub new {
1373	my ($self) = @_;	1423	my $class = shift;
1374		1424
1375	my @alloc = map [$_->size_request], @{$self->{children}};	1425	$class->SUPER::new (
1376		1426	vertical => 1,
1377	(	1427	@_,
1378	(List::Util::max map $_->[0], @alloc),
1379	(List::Util::sum map $_->[1], @alloc),
1380	)	1428	)
1381	}
1382
1383	sub size_allocate {
1384	my ($self, $w, $h) = @_;
1385
1386	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388	my $children = $self->{children};
1389
1390	my @h = map $_->{req_h}, @$children;
1391
1392	my $req_h = List::Util::sum @h;
1393
1394	if ($req_h > $h) {
1395	# ah well, not enough space
1396	$_ *= $h / $req_h for @h;
1397	} else {
1398	my $exp = List::Util::sum map $_->{expand}, @$children;
1399	$exp ||= 1;
1400
1401	for (0 .. $#$children) {
1402	my $child = $children->[$_];
1403
1404	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405	}
1406	}
1407
1408	CFClient::UI::harmonize \@h;
1409
1410	my $y = 0;
1411	for (0 .. $#$children) {
1412	my $child = $children->[$_];
1413	my $h = $h[$_];
1414	$child->configure (0, $y, $w, $h);
1415
1416	$y += $h;
1417	}
1418
1419	1
1420	}	1429	}
1421		1430
1422	#############################################################################	1431	#############################################################################
1423		1432
1424	package CFClient::UI::Label;	1433	package CFClient::UI::Label;
…		…
1441	ellipsise => 3, # end	1450	ellipsise => 3, # end
1442	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1443	fontsize => 1,	1452	fontsize => 1,
1444	align => -1,	1453	align => -1,
1445	valign => -1,	1454	valign => -1,
1446	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1447	can_events => 0,	1457	can_events => 0,
1448	%arg	1458	%arg
1449	);	1459	);
1450		1460
1451	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1487	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1488		1498
1489	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1491		1501
		1502	$self->realloc;
1492	$self->update;	1503	$self->update;
1493	$self->check_size;
1494	}	1504	}
1495		1505
1496	sub set_markup {	1506	sub set_markup {
1497	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1498		1508
…		…
1502	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503		1513
1504	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1506		1516
		1517	$self->realloc;
1507	$self->update;	1518	$self->update;
1508	$self->check_size;
1509	}	1519	}
1510		1520
1511	sub size_request {	1521	sub size_request {
1512	my ($self) = @_;	1522	my ($self) = @_;
1513		1523
…		…
1527		1537
1528	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1529	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1530	}	1540	}
1531		1541
1532	(	1542	($w, $h)
1533	$w + $self->{padding} * 2,
1534	$h + $self->{padding} * 2,
1535	)
1536	}	1543	}
1537		1544
1538	sub size_allocate {	1545	sub size_allocate {
1539	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1540		1547
1541	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542	}	1550	}
1543		1551
1544	sub set_fontsize {	1552	sub set_fontsize {
1545	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1546		1554
1547	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1548	delete $self->{texture};	1556	delete $self->{texture};
1549		1557
1550	$self->update;	1558	$self->realloc;
1551	$self->check_size;
1552	}	1559	}
1553		1560
1554	sub _draw {	1561	sub _draw {
1555	my ($self) = @_;	1562	my ($self) = @_;
1556		1563
…		…
1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566		1573
1567	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1568		1575
1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1572		1579
1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1576		1583
1577	$tex	1584	$tex
1578	};	1585	};
1579		1586
…		…
1636	sub set_text {	1643	sub set_text {
1637	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1638		1645
1639	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1640	$self->_set_text ($text);	1647	$self->_set_text ($text);
1641	$self->update;	1648
1642	$self->check_size;	1649	$self->realloc;
1643	}	1650	}
1644		1651
1645	sub get_text {	1652	sub get_text {
1646	$_[0]{text}	1653	$_[0]{text}
1647	}	1654	}
…		…
1680	} elsif ($uni) {	1687	} elsif ($uni) {
1681	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1682	}	1689	}
1683		1690
1684	$self->_set_text ($text);	1691	$self->_set_text ($text);
1685	$self->update;	1692
1686	$self->check_size;	1693	$self->realloc;
1687	}	1694	}
1688		1695
1689	sub focus_in {	1696	sub focus_in {
1690	my ($self) = @_;	1697	my ($self) = @_;
1691		1698
…		…
1818		1825
1819	sub new {	1826	sub new {
1820	my $class = shift;	1827	my $class = shift;
1821		1828
1822	$class->SUPER::new (	1829	$class->SUPER::new (
1823	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1824	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1825	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1826	can_hover => 1,	1834	can_hover => 1,
1827	align => 0,	1835	align => 0,
1828	valign => 0,	1836	valign => 0,
…		…
1875		1883
1876	sub new {	1884	sub new {
1877	my $class = shift;	1885	my $class = shift;
1878		1886
1879	$class->SUPER::new (	1887	$class->SUPER::new (
1880	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1881	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1882	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1883	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1884	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1885	state => 0,	1894	state => 0,
…		…
1889	}	1898	}
1890		1899
1891	sub size_request {	1900	sub size_request {
1892	my ($self) = @_;	1901	my ($self) = @_;
1893		1902
1894	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1895	}	1904	}
1896		1905
1897	sub button_down {	1906	sub button_down {
1898	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1899		1908
1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1903	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1904	}	1913	}
1905	}	1914	}
1906		1915
1907	sub _draw {	1916	sub _draw {
1908	my ($self) = @_;	1917	my ($self) = @_;
1909		1918
1910	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1911		1920
1912	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913		1922
1914	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915		1926
1916	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917		1928
1918	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1919		1930
…		…
2184	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2185	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2186	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2187	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2188	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2189	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2190	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2191	vertical => 0,	2202	vertical => 0,
2192	can_hover => 1,	2203	can_hover => 1,
2193	inner_pad => 0.02,	2204	inner_pad => 0.02,
2194	@_	2205	@_
2195	);	2206	);
…		…
2198	$self->update;	2209	$self->update;
2199		2210
2200	$self	2211	$self
2201	}	2212	}
2202		2213
		2214	sub changed { }
		2215
2203	sub set_range {	2216	sub set_range {
2204	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2205		2218
2206	($range, $self->{range}) = ($self->{range}, $range);	2219	($range, $self->{range}) = ($self->{range}, $range);
2207		2220
…		…
2233	}	2246	}
2234		2247
2235	sub size_request {	2248	sub size_request {
2236	my ($self) = @_;	2249	my ($self) = @_;
2237		2250
2238	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2239	my $h = $self->{req_h};
2240
2241	$self->{vertical} ? ($h, $w) : ($w, $h)
2242	}	2252	}
2243		2253
2244	sub button_down {	2254	sub button_down {
2245	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2246		2256
…		…
2631	}	2641	}
2632		2642
2633	sub set_tooltip_from {	2643	sub set_tooltip_from {
2634	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2635		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2636	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2637	markup => $widget->{tooltip},	2656	markup => $tooltip,
2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639	fontsize => 0.8,	2658	fontsize => 0.8,
2640	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2641	ellipsise => 0,	2660	ellipsise => 0,
2642	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2653		2672
2654	sub size_allocate {	2673	sub size_allocate {
2655	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2656		2675
2657	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2658	}	2695	}
2659		2696
2660	sub _draw {	2697	sub _draw {
2661	my ($self) = @_;	2698	my ($self) = @_;
2662		2699
…		…
2679	glVertex $w, $h;	2716	glVertex $w, $h;
2680	glVertex $w, 0;	2717	glVertex $w, 0;
2681	glEnd;	2718	glEnd;
2682		2719
2683	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2684	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2685	}	2723	}
2686		2724
2687	#############################################################################	2725	#############################################################################
2688		2726
…		…
2764	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2765	}	2803	}
2766		2804
2767	#############################################################################	2805	#############################################################################
2768		2806
2769	package CFClient::UI::Inventory;
2770
2771	our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773	sub new {
2774	my $class = shift;
2775
2776	my $self = $class->SUPER::new (
2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778	@_,
2779	);
2780
2781	$self
2782	}
2783
2784	sub set_items {
2785	my ($self, $items) = @_;
2786
2787	$self->{scrolled}->clear;
2788	return unless $items;
2789
2790	my @items = sort {
2791	($a->{type} <=> $b->{type})
2792	or ($a->{name} cmp $b->{name})
2793	} @$items;
2794
2795	$self->{real_items} = \@items;
2796
2797	my $row = 0;
2798	for my $item (@items) {
2799	CFClient::Item::update_widgets $item;
2800
2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805	$row++;
2806	}
2807	}
2808
2809	sub size_request {
2810	my ($self) = @_;
2811	($self->{req_w}, $self->{req_h});
2812	}
2813
2814	#############################################################################
2815
2816	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2817		2808
2818	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2819		2810
2820	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2858	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2850	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2861		2852
2862	$self->show;	2853	$self->show;
2863	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864	}	2855	}
2865		2856
2866	sub mouse_motion {	2857	sub mouse_motion {
2867	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2868		2859
…		…
2993	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2994	}	2985	}
2995		2986
2996	#############################################################################	2987	#############################################################################
2997		2988
2998	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2999		2990
3000	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002	use CFClient::OpenGL;
3003		2992
3004	sub new {	2993	sub new {
3005	my $class = shift;	2994	my $class = shift;
3006		2995
3007	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2998	@_,
		2999	);
		3000
		3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
		3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3150
		3151	$self->clear_command_list;
		3152	$self->{recording} = 0;
		3153	$self->{rec_btn}->set_text ("start recording");
		3154
		3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
		3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
		3173
		3174	sub update_binding_widgets {
		3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
3008	visible => 1,	3290	visible => 1,
3009	@_,	3291	@_,
3010	)	3292	);
3011	}
3012		3293
3013	sub configure {	3294	Scalar::Util::weaken ($self->{root} = $self);
3014	my ($self, $x, $y, $w, $h) = @_;
3015		3295
3016	$self->{w} = $w;	3296	$self
3017	$self->{h} = $h;
3018	}
3019
3020	sub check_size {
3021	my ($self) = @_;
3022
3023	$self->size_allocate ($self->{w}, $self->{h})
3024	if $self->{w};
3025	}	3297	}
3026		3298
3027	sub size_request {	3299	sub size_request {
3028	my ($self) = @_;	3300	my ($self) = @_;
3029		3301
3030	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
3031	}	3317	}
3032		3318
3033	sub size_allocate {	3319	sub size_allocate {
3034	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
3035		3321
3036	for my $child ($self->children) {	3322	for my $child ($self->children) {
3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038		3324
3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3040	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3041		3327
3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3043	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
3044
3045	$X = $self->{user_x} if exists $self->{user_x};
3046	$Y = $self->{user_y} if exists $self->{user_y};
3047
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3330
3051	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3052	}	3332	}
3053	}	3333	}
3054		3334
…		…
3065	}	3345	}
3066		3346
3067	sub update {	3347	sub update {
3068	my ($self) = @_;	3348	my ($self) = @_;
3069		3349
3070	$self->check_size;
3071	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3072	}	3351	}
3073		3352
3074	sub add {	3353	sub add {
3075	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3076		3355
3077	for (my @widgets = @children; my $w = pop @widgets; ) {
3078	push @widgets, $w->children;
3079	$w->{root} = $self;
3080	$w->{visible} = $self->{visible} + 1;
3081	}
3082
3083	for my $child (@children) {
3084	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3085		3357	for @children;
3086	# integerise window positions
3087	$child->{x} = int $child->{x};
3088	$child->{y} = int $child->{y};
3089	}
3090		3358
3091	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3092	}	3360	}
3093		3361
3094	sub remove {	3362	sub remove {
3095	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3096		3364
3097	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3098		3369
3099	while (@children) {	3370	while (@children) {
3100	my $w = pop @children;	3371	my $w = pop @children;
3101	push @children, $w->children;	3372	push @children, $w->children;
3102	$w->set_invisible;	3373	$w->set_invisible;
…		…
3121	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3122	$_->()	3393	$_->()
3123	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3124	}	3395	}
3125		3396
3126	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
		3398	my %queue;
3127	my @queue;	3399	my @queue;
		3400	my $widget;
3128		3401
3129	for (;;) {	3402	outer:
3130	if ($self->{check_size}) {	3403	while () {
3131	#TODO use array-of-depth approach	3404	if (my $realloc = delete $self->{realloc}) {
		3405	for $widget (values %$realloc) {
		3406	$widget->{visible} or next; # do not resize invisible widgets
3132		3407
3133	@queue = sort { $a->{visible} <=> $b->{visible} }	3408	$queue{$widget+0}++ and next; # duplicates are common
3134	@queue, values %{delete $self->{check_size}};	3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3135	}	3412	}
3136		3413
		3414	while () {
		3415	@queue or last outer;
		3416
3137	my $widget = pop @queue || last;	3417	$widget = pop @{ $queue[-1] || [] }
3138		3418	and last;
3139	defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142	? @$widget{qw(user_w user_h)}
3143	: $widget->size_request;
3144
3145	if (delete $widget->{force_alloc}
3146	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3149	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3150	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3151		3437
3152	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3153		3439
3154	$widget->{parent}->check_size
3155	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3156	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3157	}	3450	}
3158	}	3451	}
3159		3452
3160	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3161	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3162	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163		3461
3164	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3165	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3166		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3167	$widget->{w} = $w;	3472	$widget->{w} = $w;
3168	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3169	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3170	}	3477	}
3171	}	3478	}
3172		3479
3173	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3174	$_->()	3481	$_->()
3175	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3176	}	3483	}
		3484
3177		3485
3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3181		3489
…		…
3183	glLoadIdentity;	3491	glLoadIdentity;
3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3186	glLoadIdentity;	3494	glLoadIdentity;
3187		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3188	$self->_draw;	3503	$self->_draw;
3189	}	3504	}
3190		3505
3191	#############################################################################	3506	#############################################################################
3192		3507

Diff Legend

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