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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 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->{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.]+$/;
181	$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};
182	$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};
		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
183	}	189	}
184	}	190	}
185		191
186	reconfigure_widgets;	192	reconfigure_widgets;
187	}	193	}
…		…
196		202
197	sub new {	203	sub new {
198	my $class = shift;	204	my $class = shift;
199		205
200	my $self = bless {	206	my $self = bless {
201	x => 0,	207	x => "center",
202	y => 0,	208	y => "center",
203	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
204	can_events => 1,	212	can_events => 1,
205	@_	213	@_
206	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207		217
208	for (keys %$self) {	218	for (keys %$self) {
209	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
210	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
211	}	221	}
212	}	222	}
213		223
214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220	$self->{def_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};
221	}	234	}
222		235
223	$self	236	$self
224	}
225
226	sub toggle_visibility {
227	my ($self) = @_;
228
229	if ($self->{visible}) {
230	$self->hide;
231	} else {
232	$self->show;
233	}
234	}	237	}
235		238
236	sub destroy {	239	sub destroy {
237	my ($self) = @_;	240	my ($self) = @_;
238		241
…		…
240	%$self = ();	243	%$self = ();
241	}	244	}
242		245
243	sub show {	246	sub show {
244	my ($self) = @_;	247	my ($self) = @_;
		248
245	return if $self->{parent};	249	return if $self->{parent};
246		250
247	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
248	}
249
250	sub show_centered {
251	my ($self) = @_;
252	return if $self->{parent};
253
254	$self->show;
255
256	$CFClient::UI::ROOT->on_post_alloc (
257	"centered $self" => sub {
258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259	},
260	);
261	}	252	}
262		253
263	sub set_visible {	254	sub set_visible {
264	my ($self) = @_;	255	my ($self) = @_;
265		256
266	return if $self->{visible};	257	return if $self->{visible};
267		258
268	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
269	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
270		261
271	$self->emit (visibility_change => 1)	262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
272	}	267	}
273		268
274	sub set_invisible {	269	sub set_invisible {
275	my ($self) = @_;	270	my ($self) = @_;
276		271
277	return unless $self->{visible};	272	return unless $self->{visible};
278		273
279	# broken show/hide model	274	$_->set_invisible for $self->children;
280		275
281	delete $self->{root};	276	delete $self->{root};
282	delete $self->{visible};	277	delete $self->{visible};
283		278
284	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
285	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
286		281
287	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
288	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
289		284
290	$self->focus_out;	285	$self->focus_out;
291		286
292	$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;
293	}	305	}
294		306
295	sub hide {	307	sub hide {
296	my ($self) = @_;	308	my ($self) = @_;
297		309
…		…
299		311
300	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
301	if $self->{parent};	313	if $self->{parent};
302	}	314	}
303		315
304	sub move {	316	sub move_abs {
305	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
306		318
307	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
308	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
309	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
310		322
311	$self->update;	323	$self->update;
312	}	324	}
313		325
314	sub set_size {	326	sub set_size {
315	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
316		328
317	$self->{def_w} = $w;	329	$self->{force_w} = $w;
318	$self->{def_h} = $h;	330	$self->{force_h} = $h;
319		331
320	$self->check_size;	332	$self->realloc;
321	}	333	}
322		334
323	sub size_request {	335	sub size_request {
324	require Carp;	336	require Carp;
325	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
327		339
328	sub configure {	340	sub configure {
329	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
330		342
331	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
332	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
333	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
334		348
335	# use alignment to adjust x, y	349	# use alignment to adjust x, y
336		350
337	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
338	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
339
340	($w, $h) = ($w2, $h2);
341	}	353	}
342		354
343	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
344	$self->{x} = $x;	356	$self->{x} = $x;
345	$self->{y} = $y;	357	$self->{y} = $y;
346	$self->update;	358	$self->update;
347	}	359	}
348		360
349	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350	$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;
351	}	368	}
352	}	369	}
353		370
354	sub size_allocate {	371	sub size_allocate {
355	# nothing to be done	372	# nothing to be done
356	}
357
358	sub reconfigure {
359	my ($self) = @_;
360
361	$self->check_size (1);
362	$self->update;
363	}	373	}
364		374
365	sub children {	375	sub children {
366	}	376	}
367		377
…		…
440	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
441		451
442	$self->focus_in;	452	$self->focus_in;
443	}	453	}
444		454
445	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
446	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
447	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
448	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
449	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
450		528
451	sub draw {	529	sub draw {
452	my ($self) = @_;	530	my ($self) = @_;
453		531
454	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);
455		543
456	glPushMatrix;	544	glPushMatrix;
457	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
458	$self->_draw;	546	$self->_draw;
459	glPopMatrix;	547	glPopMatrix;
…		…
471	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
472	glEnd;	560	glEnd;
473	glDisable GL_BLEND;	561	glDisable GL_BLEND;
474	}	562	}
475		563
476	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
477	glPushMatrix;	565	glPushMatrix;
478	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
480	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
481	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
492	my ($self) = @_;	580	my ($self) = @_;
493		581
494	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
495	}	583	}
496		584
497	sub find_widget {
498	my ($self, $x, $y) = @_;
499
500	return () unless $self->{can_events};
501
502	return $self
503	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506	()
507	}
508
509	sub set_parent {
510	my ($self, $parent) = @_;
511
512	Scalar::Util::weaken ($self->{parent} = $parent);
513
514	$self->set_visible;
515
516	$self->check_size;
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, %arg) = @_;
		1056
		1057	my $title = delete $arg{title};
1008		1058
1009	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
1010	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
1011	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
1012	border => 0.6,	1062	border => 0.6,
1013	is_toplevel => 1,
1014	can_events => 1,	1063	can_events => 1,
1015	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
1016	);	1067	);
1017		1068
1018	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
1019	align => 0,	1070	align => 0,
1020	valign => 1,	1071	valign => 1,
1021	text => $self->{title},	1072	text => $title,
1022	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1023		1075
1024	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1025	}	1084	}
1026		1085
1027	sub border {	1086	sub border {
1028	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1029	}	1088	}
1030		1089
1031	sub size_request {	1090	sub size_request {
1032	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1033		1095
1034	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1035		1097
1036	(	1098	(
1037	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
1040	}	1102	}
1041		1103
1042	sub size_allocate {	1104	sub size_allocate {
1043	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
1044		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
1045	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1046	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1047		1117
1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049	if $self->{title};
1050
1051	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1052	}	1119	}
1053		1120
1054	sub button_down {	1121	sub button_down {
1055	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1056		1123
…		…
1072	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1073		1140
1074	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1075	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1076		1143
1077	$self->{user_x} = $wx + $dx * $mx;
1078	$self->{user_y} = $wy + $dy * $my;
1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081	$self->move ($self->{user_x}, $self->{user_y});	1146
1082	$self->check_size;	1147	$self->realloc;
		1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1083	};	1149	};
1084		1150
1085	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1089	$self->{motion} = sub {	1155	$self->{motion} = sub {
1090	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1091		1157
1092	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1093		1159
1094	$self->{user_x} = $bx + $x - $ox;	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095	$self->{user_y} = $by + $y - $oy;
1096
1097	$self->move ($self->{user_x}, $self->{user_y});
1098	$self->update;
1099	};	1161	};
1100	}	1162	}
1101	}	1163	}
1102		1164
1103	sub button_up {	1165	sub button_up {
…		…
1113	}	1175	}
1114		1176
1115	sub _draw {	1177	sub _draw {
1116	my ($self) = @_;	1178	my ($self) = @_;
1117		1179
		1180	my $child = $self->{children}[0];
		1181
1118	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1119	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1120		1184
1121	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1122	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123		1187
1124	my $border = $self->border;	1188	my $border = $self->border;
1125		1189
1126	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1127	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1128	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131		1195
1132	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1134		1198
1135	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1136	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1137	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1138
1139	glColor @{ $self->{bg} };
1140
1141	$bg->{s} = $rep_x;
1142	$bg->{t} = $rep_y;
1143	$bg->{wrap_mode} = 1;
1144	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145	}	1204	}
1146		1205
1147	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1148		1207
1149	$self->{title}->draw if $self->{title};
1150
1151	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1152	}	1214	}
1153		1215
1154	#############################################################################	1216	#############################################################################
1155		1217
1156	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1178	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1179		1241
1180	$child->set_parent ($self);	1242	$child->set_parent ($self);
1181	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1182		1244
1183	$self->check_size (1);	1245	$self->realloc;
1184	}	1246	}
1185		1247
1186	# TODO: move to container class maybe? send children a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1187	sub clear {	1249	sub clear {
1188	my ($self) = @_;	1250	my ($self) = @_;
…		…
1193	for (@children) {	1255	for (@children) {
1194	delete $_->{parent};	1256	delete $_->{parent};
1195	$_->hide;	1257	$_->hide;
1196	}	1258	}
1197		1259
1198	$self->check_size (1);	1260	$self->realloc;
1199	$self->update;
1200	}	1261	}
1201		1262
1202	sub get_wh {	1263	sub get_wh {
1203	my ($self) = @_;	1264	my ($self) = @_;
1204		1265
…		…
1324	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1325		1386
1326	my $space = $self->{vertical} ? $h : $w;	1387	my $space = $self->{vertical} ? $h : $w;
1327	my $children = $self->{children};	1388	my $children = $self->{children};
1328		1389
1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1390	my @req;
1330	my $req = List::Util::sum @req;
1331		1391
1332	if ($req > $space) {	1392	if ($self->{homogeneous}) {
1333	# ah well, not enough space	1393	@req = ($space / (@$children || 1)) x @$children;
1334	$_ *= $space / $req for @req;
1335	} else {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand	1406	$req[$_] += $space * $children->[$_]{expand}
1339	for 0 .. $#$children;	1407	for 0 .. $#$children;
		1408	}
1340	}	1409	}
1341		1410
1342	CFClient::UI::harmonize \@req;	1411	CFClient::UI::harmonize \@req;
1343		1412
1344	my $pos = 0;	1413	my $pos = 0;
…		…
1404	ellipsise => 3, # end	1473	ellipsise => 3, # end
1405	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1406	fontsize => 1,	1475	fontsize => 1,
1407	align => -1,	1476	align => -1,
1408	valign => -1,	1477	valign => -1,
1409	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1410	can_events => 0,	1480	can_events => 0,
1411	%arg	1481	%arg
1412	);	1482	);
1413		1483
1414	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1450	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1451		1521
1452	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1454		1524
		1525	$self->realloc;
1455	$self->update;	1526	$self->update;
1456	$self->check_size;
1457	}	1527	}
1458		1528
1459	sub set_markup {	1529	sub set_markup {
1460	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1461		1531
…		…
1465	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466		1536
1467	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1469		1539
		1540	$self->realloc;
1470	$self->update;	1541	$self->update;
1471	$self->check_size;
1472	}	1542	}
1473		1543
1474	sub size_request {	1544	sub size_request {
1475	my ($self) = @_;	1545	my ($self) = @_;
1476		1546
…		…
1490		1560
1491	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1492	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1493	}	1563	}
1494		1564
1495	(	1565	($w, $h)
1496	$w + $self->{padding} * 2,
1497	$h + $self->{padding} * 2,
1498	)
1499	}	1566	}
1500		1567
1501	sub size_allocate {	1568	sub size_allocate {
1502	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1503		1570
		1571	delete $self->{ox};
		1572
1504	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505	}	1575	}
1506		1576
1507	sub set_fontsize {	1577	sub set_fontsize {
1508	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1509		1579
1510	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1511	delete $self->{texture};	1581	delete $self->{texture};
1512		1582
1513	$self->update;	1583	$self->realloc;
1514	$self->check_size;
1515	}	1584	}
1516		1585
1517	sub _draw {	1586	sub _draw {
1518	my ($self) = @_;	1587	my ($self) = @_;
1519		1588
…		…
1525	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		1598
1530	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1531		1601
		1602	unless (exists $self->{ox}) {
1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1535		1606
1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1539
1540	$tex
1541	};	1610	};
1542		1611
1543	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545		1614
…		…
1599	sub set_text {	1668	sub set_text {
1600	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1601		1670
1602	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1603	$self->_set_text ($text);	1672	$self->_set_text ($text);
1604	$self->update;	1673
1605	$self->check_size;	1674	$self->realloc;
1606	}	1675	}
1607		1676
1608	sub get_text {	1677	sub get_text {
1609	$_[0]{text}	1678	$_[0]{text}
1610	}	1679	}
…		…
1643	} elsif ($uni) {	1712	} elsif ($uni) {
1644	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1645	}	1714	}
1646		1715
1647	$self->_set_text ($text);	1716	$self->_set_text ($text);
1648	$self->update;	1717
1649	$self->check_size;	1718	$self->realloc;
1650	}	1719	}
1651		1720
1652	sub focus_in {	1721	sub focus_in {
1653	my ($self) = @_;	1722	my ($self) = @_;
1654		1723
…		…
1781		1850
1782	sub new {	1851	sub new {
1783	my $class = shift;	1852	my $class = shift;
1784		1853
1785	$class->SUPER::new (	1854	$class->SUPER::new (
1786	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1787	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1788	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1789	can_hover => 1,	1859	can_hover => 1,
1790	align => 0,	1860	align => 0,
1791	valign => 0,	1861	valign => 0,
…		…
1838		1908
1839	sub new {	1909	sub new {
1840	my $class = shift;	1910	my $class = shift;
1841		1911
1842	$class->SUPER::new (	1912	$class->SUPER::new (
1843	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1844	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1845	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1846	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1847	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1848	state => 0,	1919	state => 0,
…		…
1852	}	1923	}
1853		1924
1854	sub size_request {	1925	sub size_request {
1855	my ($self) = @_;	1926	my ($self) = @_;
1856		1927
1857	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1858	}	1929	}
1859		1930
1860	sub button_down {	1931	sub button_down {
1861	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1862		1933
1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1866	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1867	}	1938	}
1868	}	1939	}
1869		1940
1870	sub _draw {	1941	sub _draw {
1871	my ($self) = @_;	1942	my ($self) = @_;
1872		1943
1873	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1874		1945
1875	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876		1947
1877	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878		1951
1879	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880		1953
1881	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1882		1955
…		…
2147	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2148	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2149	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2150	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2151	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2152	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2153	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2154	vertical => 0,	2227	vertical => 0,
2155	can_hover => 1,	2228	can_hover => 1,
2156	inner_pad => 0.02,	2229	inner_pad => 0.02,
2157	@_	2230	@_
2158	);	2231	);
…		…
2161	$self->update;	2234	$self->update;
2162		2235
2163	$self	2236	$self
2164	}	2237	}
2165		2238
		2239	sub changed { }
		2240
2166	sub set_range {	2241	sub set_range {
2167	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2168		2243
2169	($range, $self->{range}) = ($self->{range}, $range);	2244	($range, $self->{range}) = ($self->{range}, $range);
2170		2245
…		…
2196	}	2271	}
2197		2272
2198	sub size_request {	2273	sub size_request {
2199	my ($self) = @_;	2274	my ($self) = @_;
2200		2275
2201	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2202	my $h = $self->{req_h};
2203
2204	$self->{vertical} ? ($h, $w) : ($w, $h)
2205	}	2277	}
2206		2278
2207	sub button_down {	2279	sub button_down {
2208	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2209		2281
…		…
2594	}	2666	}
2595		2667
2596	sub set_tooltip_from {	2668	sub set_tooltip_from {
2597	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2598		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2599	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2600	markup => $widget->{tooltip},	2681	markup => $tooltip,
2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602	fontsize => 0.8,	2683	fontsize => 0.8,
2603	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2604	ellipsise => 0,	2685	ellipsise => 0,
2605	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2616		2697
2617	sub size_allocate {	2698	sub size_allocate {
2618	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2619		2700
2620	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2621	}	2720	}
2622		2721
2623	sub _draw {	2722	sub _draw {
2624	my ($self) = @_;	2723	my ($self) = @_;
2625		2724
…		…
2642	glVertex $w, $h;	2741	glVertex $w, $h;
2643	glVertex $w, 0;	2742	glVertex $w, 0;
2644	glEnd;	2743	glEnd;
2645		2744
2646	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2647	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2648	}	2748	}
2649		2749
2650	#############################################################################	2750	#############################################################################
2651		2751
…		…
2727	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2728	}	2828	}
2729		2829
2730	#############################################################################	2830	#############################################################################
2731		2831
2732	package CFClient::UI::Inventory;
2733
2734	our @ISA = CFClient::UI::ScrolledWindow::;
2735
2736	sub new {
2737	my $class = shift;
2738
2739	my $self = $class->SUPER::new (
2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741	@_,
2742	);
2743
2744	$self
2745	}
2746
2747	sub set_items {
2748	my ($self, $items) = @_;
2749
2750	$self->{scrolled}->clear;
2751	return unless $items;
2752
2753	my @items = sort {
2754	($a->{type} <=> $b->{type})
2755	or ($a->{name} cmp $b->{name})
2756	} @$items;
2757
2758	$self->{real_items} = \@items;
2759
2760	my $row = 0;
2761	for my $item (@items) {
2762	CFClient::Item::update_widgets $item;
2763
2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768	$row++;
2769	}
2770	}
2771
2772	#############################################################################
2773
2774	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2775		2833
2776	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2777		2835
2778	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2816	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2817	$GRAB = $self;	2875	$GRAB = $self;
2818	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2819		2877
2820	$self->show;	2878	$self->show;
2821	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822	}	2880	}
2823		2881
2824	sub mouse_motion {	2882	sub mouse_motion {
2825	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2826		2884
…		…
2951	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2952	}	3010	}
2953		3011
2954	#############################################################################	3012	#############################################################################
2955		3013
2956	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2957		3015
2958	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960	use CFClient::OpenGL;
2961		3017
2962	sub new {	3018	sub new {
2963	my $class = shift;	3019	my $class = shift;
2964		3020
2965	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3023	@_,
		3024	);
		3025
		3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
		3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3180
		3181	$self->clear_command_list;
		3182	$self->{recording} = 0;
		3183	$self->{rec_btn}->set_text ("start recording");
		3184
		3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
		3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
		3203
		3204	sub update_binding_widgets {
		3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
		3310	package CFClient::UI::Root;
		3311
		3312	our @ISA = CFClient::UI::Container::;
		3313
		3314	use CFClient::OpenGL;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
2966	visible => 1,	3320	visible => 1,
2967	@_,	3321	@_,
2968	)	3322	);
2969	}
2970		3323
2971	sub configure {	3324	Scalar::Util::weaken ($self->{root} = $self);
2972	my ($self, $x, $y, $w, $h) = @_;
2973		3325
2974	$self->{w} = $w;	3326	$self
2975	$self->{h} = $h;
2976	}
2977
2978	sub check_size {
2979	my ($self) = @_;
2980
2981	$self->size_allocate ($self->{w}, $self->{h})
2982	if $self->{w};
2983	}	3327	}
2984		3328
2985	sub size_request {	3329	sub size_request {
2986	my ($self) = @_;	3330	my ($self) = @_;
2987		3331
2988	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
		3333	}
		3334
		3335	sub _to_pixel {
		3336	my ($coord, $size, $max) = @_;
		3337
		3338	$coord =
		3339	$coord eq "center" ? ($max - $size) * 0.5
		3340	: $coord eq "max" ? $max
		3341	: $coord;
		3342
		3343	$coord = 0 if $coord < 0;
		3344	$coord = $max - $size if $coord > $max - $size;
		3345
		3346	int $coord + 0.5
2989	}	3347	}
2990		3348
2991	sub size_allocate {	3349	sub size_allocate {
2992	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
2993		3351
2994	for my $child ($self->children) {	3352	for my $child ($self->children) {
2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996		3354
2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
2998	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
2999		3357
3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
3001	if exists $child->{req_y};	3359	$Y = _to_pixel $Y, $H, $self->{h};
3002
3003	delete @$child{qw(req_x req_y)};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3360
3008	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
3009	}	3362	}
3010	}	3363	}
3011		3364
…		…
3022	}	3375	}
3023		3376
3024	sub update {	3377	sub update {
3025	my ($self) = @_;	3378	my ($self) = @_;
3026		3379
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
3029	}	3381	}
3030		3382
3031	sub add {	3383	sub add {
3032	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
3033		3385
3034	for my $child (@children) {
3035	$child->{is_toplevel} = 1;	3386	$_->{is_toplevel} = 1
3036		3387	for @children;
3037	# integerise window positions
3038	$child->{x} = int $child->{x};
3039	$child->{y} = int $child->{y};
3040	}
3041		3388
3042	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
3043
3044	for (my @widgets = @children; my $w = pop @widgets; ) {
3045	push @widgets, $w->children;
3046	$w->set_visible;
3047	}
3048
3049	}	3390	}
3050		3391
3051	sub remove {	3392	sub remove {
3052	my ($self, @children) = @_;	3393	my ($self, @children) = @_;
3053		3394
3054	$self->SUPER::remove (@children);	3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3055		3399
3056	while (@children) {	3400	while (@children) {
3057	my $w = pop @children;	3401	my $w = pop @children;
3058	push @children, $w->children;	3402	push @children, $w->children;
3059	$w->set_invisible;	3403	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3079	$_->()	3423	$_->()
3080	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3081	}	3425	}
3082		3426
3083	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
		3428	my %queue;
3084	my @queue;	3429	my @queue;
		3430	my $widget;
3085		3431
3086	for (;;) {	3432	outer:
3087	if ($self->{check_size}) {	3433	while () {
3088	#TODO use array-of-depth approach	3434	if (my $realloc = delete $self->{realloc}) {
		3435	for $widget (values %$realloc) {
		3436	$widget->{visible} or next; # do not resize invisible widgets
3089		3437
3090	@queue = sort { $a->{visible} <=> $b->{visible} }	3438	$queue{$widget+0}++ and next; # duplicates are common
3091	@queue, values %{delete $self->{check_size}};	3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3092	}	3442	}
3093		3443
		3444	while () {
		3445	@queue or last outer;
		3446
3094	my $widget = pop @queue || last;	3447	$widget = pop @{ $queue[-1] || [] }
3095		3448	and last;
3096	defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099	? @$widget{qw(def_w def_h)}
3100	: $widget->size_request;
3101
3102	if (delete $widget->{force_alloc}
3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3464	|| delete $widget->{force_realloc}) {
3106	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3107	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3108		3467
3109	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3110		3469
3111	$widget->{parent}->check_size
3112	if $widget->{parent};	3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
3113	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3114	}	3480	}
3115	}	3481	}
3116		3482
3117	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3118	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3119	my ($widget, $w, $h) = @$_;	3485	values %$size_alloc;
		3486
		3487	while () {
		3488	my $widget = pop @queue || last;
		3489
		3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120		3491
3121	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3122	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3123		3494
		3495	$w = int $w + 0.5;
		3496	$h = int $h + 0.5;
		3497
		3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
		3501
3124	$widget->{w} = $w;	3502	$widget->{w} = $w;
3125	$widget->{h} = $h;	3503	$widget->{h} = $h;
		3504
3126	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3127	}	3507	}
3128	}	3508	}
3129		3509
3130	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3131	$_->()	3511	$_->()
3132	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3133	}	3513	}
		3514
3134		3515
3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3138		3519
…		…
3140	glLoadIdentity;	3521	glLoadIdentity;
3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3143	glLoadIdentity;	3524	glLoadIdentity;
3144		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3145	$self->_draw;	3533	$self->_draw;
3146	}	3534	}
3147		3535
3148	#############################################################################	3536	#############################################################################
3149		3537

Diff Legend

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