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

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

Diff Legend

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