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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

…		…
9	use CFClient;	9	use CFClient;
10	use CFClient::Texture;	10	use CFClient::Texture;
11		11
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		13
		14	our $LAYOUT;
14	our $ROOT;	15	our $ROOT;
15	our $TOOLTIP;	16	our $TOOLTIP;
16	our $BUTTON_STATE;	17	our $BUTTON_STATE;
17		18
18	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
19		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		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};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
20	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
21	if (!$GRAB) {	47	if (!$GRAB) {
22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
24
25	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
26	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
27		54
28	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
29		56
30	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
31		58
32	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
33	$TOOLTIP->show;	60	$TOOLTIP->show;
34
35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	if $x + $TOOLTIP->{w} > $::WIDTH;
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	61	}
44		62
45	return;	63	return;
46	}	64	}
47	}	65	}
…		…
153	sub rescale_widgets {	171	sub rescale_widgets {
154	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
155		173
156	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
157	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
158	$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.]+$/;
159	$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};
160	$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};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$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.]+$/;
163	$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};
164	$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};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167	}	190	}
168		191
169	reconfigure_widgets;	192	reconfigure_widgets;
170	}	193	}
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		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};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {	263
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
225	},	265
226	);	266	$_->set_visible for $self->children;
227	}	267	}
228		268
229	sub set_invisible {	269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
231		271
232	# broken show/hide model	272	return unless $self->{visible};
233		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
234	delete $self->{visible};	277	delete $self->{visible};
235		278
236	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
237	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
238		281
239	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
240	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
241		284
242	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
243	}	305	}
244		306
245	sub hide {	307	sub hide {
246	my ($self) = @_;	308	my ($self) = @_;
247		309
…		…
249		311
250	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
251	if $self->{parent};	313	if $self->{parent};
252	}	314	}
253		315
254	sub move {	316	sub move_abs {
255	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
256		318
257	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
258	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
259	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
260		322
261	$self->update;	323	$self->update;
262	}	324	}
263		325
264	sub set_size {	326	sub set_size {
265	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
266		328
267	$self->{user_w} = $w;	329	$self->{force_w} = $w;
268	$self->{user_h} = $h;	330	$self->{force_h} = $h;
269		331
270	$self->check_size;	332	$self->realloc;
271	}	333	}
272		334
273	sub size_request {	335	sub size_request {
274	require Carp;	336	require Carp;
275	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
277		339
278	sub configure {	340	sub configure {
279	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
280		342
281	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
282	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
283	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
284		348
285	# use alignment to adjust x, y	349	# use alignment to adjust x, y
286		350
287	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
288	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
289
290	($w, $h) = ($w2, $h2);
291	}	353	}
292		354
293	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
294	$self->{x} = $x;	356	$self->{x} = $x;
295	$self->{y} = $y;	357	$self->{y} = $y;
296	$self->update;	358	$self->update;
297	}	359	}
298		360
299	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300	$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;
301	}	368	}
302	}	369	}
303		370
304	sub size_allocate {	371	sub size_allocate {
305	# nothing to be done	372	# nothing to be done
306	}
307
308	sub reconfigure {
309	my ($self) = @_;
310
311	$self->check_size (1);
312	$self->update;
313	}	373	}
314		374
315	sub children {	375	sub children {
316	}	376	}
317		377
…		…
390	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
391		451
392	$self->focus_in;	452	$self->focus_in;
393	}	453	}
394		454
395	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
396	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
397	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
398	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
399	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
400		528
401	sub draw {	529	sub draw {
402	my ($self) = @_;	530	my ($self) = @_;
403		531
404	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);
405		543
406	glPushMatrix;	544	glPushMatrix;
407	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
408	$self->_draw;	546	$self->_draw;
409	glPopMatrix;	547	glPopMatrix;
…		…
421	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
422	glEnd;	560	glEnd;
423	glDisable GL_BLEND;	561	glDisable GL_BLEND;
424	}	562	}
425		563
426	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
427	glPushMatrix;	565	glPushMatrix;
428	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
431	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
442	my ($self) = @_;	580	my ($self) = @_;
443		581
444	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
445	}	583	}
446		584
447	sub find_widget {
448	my ($self, $x, $y) = @_;
449
450	return () unless $self->{can_events};
451
452	return $self
453	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456	()
457	}
458
459	sub set_parent {
460	my ($self, $parent) = @_;
461
462	Scalar::Util::weaken ($self->{parent} = $parent);
463
464	$self->{root} = $parent->{root};
465	$self->{visible} = $parent->{visible};
466
467	# TODO: req_w _does_change after ->reconfigure
468	$self->check_size
469	unless exists $self->{req_w};
470
471	$self->show;
472	}
473
474	sub check_size {
475	my ($self, $forced) = @_;
476
477	$self->{force_alloc} = 1 if $forced;
478	$CFClient::UI::ROOT->{check_size}{$self} = $self;
479	}
480
481	sub update {
482	my ($self) = @_;
483
484	$self->{parent}->update
485	if $self->{parent};
486	}
487
488	sub connect {
489	my ($self, $signal, $cb) = @_;
490
491	push @{ $self->{signal_cb}{$signal} }, $cb;
492	}
493
494	sub _emit {
495	my ($self, $signal, @args) = @_;
496
497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498	}
499
500	sub emit {
501	my ($self, $signal, @args) = @_;
502
503	$self->_emit ($signal, @args)
504	|| $self->$signal (@args);
505	}
506
507	sub DESTROY {	585	sub DESTROY {
508	my ($self) = @_;	586	my ($self) = @_;
509		587
510	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
511	#$self->deactivate;	589	#$self->deactivate;
…		…
567	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
568	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
569	}	647	}
570		648
571	sub size_request {	649	sub size_request {
572	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
573	}	653	}
574		654
575	sub draw { }	655	sub draw { }
576		656
577	#############################################################################	657	#############################################################################
…		…
606	$self->{children} = [	686	$self->{children} = [
607	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
608	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
609	];	689	];
610		690
611	$self->check_size (1);	691	$self->realloc;
612	$self->update;
613	}	692	}
614		693
615	sub children {	694	sub children {
616	@{ $_[0]{children} }	695	@{ $_[0]{children} }
617	}	696	}
…		…
622	delete $child->{parent};	701	delete $child->{parent};
623	$child->hide;	702	$child->hide;
624		703
625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626		705
627	$self->check_size (1);	706	$self->realloc;
628	$self->update;
629	}	707	}
630		708
631	sub clear {	709	sub clear {
632	my ($self) = @_;	710	my ($self) = @_;
633		711
…		…
637	for (@$children) {	715	for (@$children) {
638	delete $_->{parent};	716	delete $_->{parent};
639	$_->hide;	717	$_->hide;
640	}	718	}
641		719
642	$self->check_size;	720	$self->realloc;
643	$self->update;
644	}	721	}
645		722
646	sub find_widget {	723	sub find_widget {
647	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
648		725
…		…
735	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
736	$self->update;	813	$self->update;
737	}	814	}
738		815
739	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
740	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
741	}	820	}
742		821
743	sub render_child {	822	sub render_child {
744	my ($self) = @_;	823	my ($self) = @_;
745		824
746	$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 {
747	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
748	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
749		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
750	$self->_render;	836	$self->_render;
751	};	837	};
752	}	838	}
753		839
754	sub _draw {	840	sub _draw {
755	my ($self) = @_;	841	my ($self) = @_;
756		842
757	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
758		844
759	my $tex = $self->{texture}	845	my $tex = $self->{texture}
760	or return;	846	or return;
761		847
762	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
785	}	871	}
786		872
787	sub size_request {	873	sub size_request {
788	my ($self) = @_;	874	my ($self) = @_;
789		875
790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791		877
792	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
793	}	882	}
794		883
795	sub size_allocate {	884	sub size_allocate {
796	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
797		886
		887	my $child = $self->child;
		888
798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800		891
801	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
802	$self->update;	893	$self->update;
803	}	894	}
804		895
…		…
840	}	931	}
841		932
842	sub _render {	933	sub _render {
843	my ($self) = @_;	934	my ($self) = @_;
844		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};
		938
845	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846		940
847	$self->SUPER::_render;	941	$self->SUPER::_render;
848	}	942	}
849		943
…		…
857	my $class = shift;	951	my $class = shift;
858		952
859	my $self;	953	my $self;
860		954
861	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
862	vertical => 1,	956	vertical => 1,
863	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
864	connect_changed => sub {	958	on_changed => sub {
865	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
866	},	960	},
867	;	961	;
868		962
869	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
947		1041
948	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
949		1043
950	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
951		1045
952	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 =
953	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954	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);
955		1053
956	sub new {	1054	sub new {
957	my $class = shift;	1055	my $class = shift;
958
959	# TODO: user_x, user_y, overwrite moveto?
960		1056
961	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
962	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
963	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
964	border => 0.6,	1060	border => 0.6,
965	is_toplevel => 1,
966	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
967	@_	1064	@_
968	);	1065	);
969		1066
970	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
971	align => 0,	1068	align => 0,
…		…
1024	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1025		1122
1026	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1027	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1028		1125
1029	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1128
		1129	$self->realloc;
1031	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032	$self->check_size;
1033	};	1131	};
1034		1132
1035	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1036	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1039	$self->{motion} = sub {	1137	$self->{motion} = sub {
1040	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1041		1139
1042	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1043		1141
1044	$self->move ($bx + $x - $ox, $by + $y - $oy);	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045	$self->update;
1046	};	1143	};
1047	}	1144	}
1048	}	1145	}
1049		1146
1050	sub button_up {	1147	sub button_up {
…		…
1069	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070		1167
1071	my $border = $self->border;	1168	my $border = $self->border;
1072		1169
1073	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1074	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1075	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078		1175
1079	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1081		1178
1082	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1083	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1084	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1085
1086	glColor @{ $self->{bg} };
1087
1088	$bg->{s} = $rep_x;
1089	$bg->{t} = $rep_y;
1090	$bg->{wrap_mode} = 1;
1091	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092	}	1184	}
1093		1185
1094	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1095		1187
…		…
1125	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1126		1218
1127	$child->set_parent ($self);	1219	$child->set_parent ($self);
1128	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1129		1221
1130	$self->check_size (1);	1222	$self->realloc;
1131	}	1223	}
1132		1224
1133	# TODO: move to container class maybe? send children a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1134	sub clear {	1226	sub clear {
1135	my ($self) = @_;	1227	my ($self) = @_;
…		…
1140	for (@children) {	1232	for (@children) {
1141	delete $_->{parent};	1233	delete $_->{parent};
1142	$_->hide;	1234	$_->hide;
1143	}	1235	}
1144		1236
1145	$self->check_size (1);	1237	$self->realloc;
1146	$self->update;
1147	}	1238	}
1148		1239
1149	sub get_wh {	1240	sub get_wh {
1150	my ($self) = @_;	1241	my ($self) = @_;
1151		1242
…		…
1247	}	1338	}
1248	}	1339	}
1249		1340
1250	#############################################################################	1341	#############################################################################
1251		1342
1252	package CFClient::UI::HBox;	1343	package CFClient::UI::Box;
1253
1254	# TODO: wrap into common Box base class
1255		1344
1256	our @ISA = CFClient::UI::Container::;	1345	our @ISA = CFClient::UI::Container::;
1257		1346
1258	sub size_request {	1347	sub size_request {
1259	my ($self) = @_;	1348	my ($self) = @_;
1260		1349
1261	my @alloc = map [$_->size_request], @{$self->{children}};	1350	$self->{vertical}
1262		1351	? (
1263	(	1352	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1264	(List::Util::sum map $_->[0], @alloc),	1353	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265	(List::Util::max map $_->[1], @alloc),	1354	)
1266	)	1355	: (
		1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1358	)
1267	}	1359	}
1268		1360
1269	sub size_allocate {	1361	sub size_allocate {
1270	my ($self, $w, $h) = @_;	1362	my ($self, $w, $h) = @_;
1271		1363
1272	($h, $w) = ($w, $h);	1364	my $space = $self->{vertical} ? $h : $w;
1273
1274	my $children = $self->{children};	1365	my $children = $self->{children};
1275		1366
1276	my @h = map $_->{req_w}, @$children;	1367	my @req;
1277		1368
1278	my $req_h = List::Util::sum @h;	1369	if ($self->{homogeneous}) {
1279		1370	@req = ($space / (@$children || 1)) x @$children;
1280	if ($req_h > $h) {
1281	# ah well, not enough space
1282	$_ *= $h / $req_h for @h;
1283	} else {	1371	} else {
		1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1373	my $req = List::Util::sum @req;
		1374
		1375	if ($req > $space) {
		1376	# ah well, not enough space
		1377	$_ *= $space / $req for @req;
		1378	} else {
1284	my $exp = List::Util::sum map $_->{expand}, @$children;	1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285	$exp ||= 1;
1286		1380
		1381	$space = ($space - $req) / $expand; # remaining space to give away
		1382
		1383	$req[$_] += $space * $children->[$_]{expand}
1287	for (0 .. $#$children) {	1384	for 0 .. $#$children;
1288	my $child = $children->[$_];
1289
1290	my $alloc_h = $h[$_];
1291	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292	$h[$_] = $alloc_h;
1293	}	1385	}
1294	}	1386	}
1295		1387
1296	CFClient::UI::harmonize \@h;	1388	CFClient::UI::harmonize \@req;
1297		1389
1298	my $y = 0;	1390	my $pos = 0;
1299	for (0 .. $#$children) {	1391	for (0 .. $#$children) {
1300	my $child = $children->[$_];
1301	my $h = $h[$_];	1392	my $alloc = $req[$_];
1302	$child->configure ($y, 0, $h, $w);	1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303		1394
1304	$y += $h;	1395	$pos += $alloc;
1305	}	1396	}
1306		1397
1307	1	1398	1
1308	}	1399	}
1309		1400
1310	#############################################################################	1401	#############################################################################
1311		1402
		1403	package CFClient::UI::HBox;
		1404
		1405	our @ISA = CFClient::UI::Box::;
		1406
		1407	sub new {
		1408	my $class = shift;
		1409
		1410	$class->SUPER::new (
		1411	vertical => 0,
		1412	@_,
		1413	)
		1414	}
		1415
		1416	#############################################################################
		1417
1312	package CFClient::UI::VBox;	1418	package CFClient::UI::VBox;
1313		1419
1314	# TODO: wrap into common Box base class
1315
1316	our @ISA = CFClient::UI::Container::;	1420	our @ISA = CFClient::UI::Box::;
1317		1421
1318	sub size_request {	1422	sub new {
1319	my ($self) = @_;	1423	my $class = shift;
1320		1424
1321	my @alloc = map [$_->size_request], @{$self->{children}};	1425	$class->SUPER::new (
1322		1426	vertical => 1,
1323	(	1427	@_,
1324	(List::Util::max map $_->[0], @alloc),
1325	(List::Util::sum map $_->[1], @alloc),
1326	)	1428	)
1327	}
1328
1329	sub size_allocate {
1330	my ($self, $w, $h) = @_;
1331
1332	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334	my $children = $self->{children};
1335
1336	my @h = map $_->{req_h}, @$children;
1337
1338	my $req_h = List::Util::sum @h;
1339
1340	if ($req_h > $h) {
1341	# ah well, not enough space
1342	$_ *= $h / $req_h for @h;
1343	} else {
1344	my $exp = List::Util::sum map $_->{expand}, @$children;
1345	$exp ||= 1;
1346
1347	for (0 .. $#$children) {
1348	my $child = $children->[$_];
1349
1350	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351	}
1352	}
1353
1354	CFClient::UI::harmonize \@h;
1355
1356	my $y = 0;
1357	for (0 .. $#$children) {
1358	my $child = $children->[$_];
1359	my $h = $h[$_];
1360	$child->configure (0, $y, $w, $h);
1361
1362	$y += $h;
1363	}
1364
1365	1
1366	}	1429	}
1367		1430
1368	#############################################################################	1431	#############################################################################
1369		1432
1370	package CFClient::UI::Label;	1433	package CFClient::UI::Label;
…		…
1387	ellipsise => 3, # end	1450	ellipsise => 3, # end
1388	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1389	fontsize => 1,	1452	fontsize => 1,
1390	align => -1,	1453	align => -1,
1391	valign => -1,	1454	valign => -1,
1392	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1393	can_events => 0,	1457	can_events => 0,
1394	%arg	1458	%arg
1395	);	1459	);
1396		1460
1397	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1433	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1434		1498
1435	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1437		1501
		1502	$self->realloc;
1438	$self->update;	1503	$self->update;
1439	$self->check_size;
1440	}	1504	}
1441		1505
1442	sub set_markup {	1506	sub set_markup {
1443	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1444		1508
…		…
1448	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449		1513
1450	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1452		1516
		1517	$self->realloc;
1453	$self->update;	1518	$self->update;
1454	$self->check_size;
1455	}	1519	}
1456		1520
1457	sub size_request {	1521	sub size_request {
1458	my ($self) = @_;	1522	my ($self) = @_;
1459		1523
…		…
1473		1537
1474	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1475	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1476	}	1540	}
1477		1541
1478	(	1542	($w, $h)
1479	$w + $self->{padding} * 2,
1480	$h + $self->{padding} * 2,
1481	)
1482	}	1543	}
1483		1544
1484	sub size_allocate {	1545	sub size_allocate {
1485	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1486		1547
1487	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488	}	1550	}
1489		1551
1490	sub set_fontsize {	1552	sub set_fontsize {
1491	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1492		1554
1493	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1494	delete $self->{texture};	1556	delete $self->{texture};
1495		1557
1496	$self->update;	1558	$self->realloc;
1497	$self->check_size;
1498	}	1559	}
1499		1560
1500	sub _draw {	1561	sub _draw {
1501	my ($self) = @_;	1562	my ($self) = @_;
1502		1563
…		…
1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512		1573
1513	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1514		1575
1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1518		1579
1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1522		1583
1523	$tex	1584	$tex
1524	};	1585	};
1525		1586
…		…
1582	sub set_text {	1643	sub set_text {
1583	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1584		1645
1585	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1586	$self->_set_text ($text);	1647	$self->_set_text ($text);
1587	$self->update;	1648
1588	$self->check_size;	1649	$self->realloc;
1589	}	1650	}
1590		1651
1591	sub get_text {	1652	sub get_text {
1592	$_[0]{text}	1653	$_[0]{text}
1593	}	1654	}
…		…
1626	} elsif ($uni) {	1687	} elsif ($uni) {
1627	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1628	}	1689	}
1629		1690
1630	$self->_set_text ($text);	1691	$self->_set_text ($text);
1631	$self->update;	1692
1632	$self->check_size;	1693	$self->realloc;
1633	}	1694	}
1634		1695
1635	sub focus_in {	1696	sub focus_in {
1636	my ($self) = @_;	1697	my ($self) = @_;
1637		1698
…		…
1764		1825
1765	sub new {	1826	sub new {
1766	my $class = shift;	1827	my $class = shift;
1767		1828
1768	$class->SUPER::new (	1829	$class->SUPER::new (
1769	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1770	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1771	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1772	can_hover => 1,	1834	can_hover => 1,
1773	align => 0,	1835	align => 0,
1774	valign => 0,	1836	valign => 0,
…		…
1821		1883
1822	sub new {	1884	sub new {
1823	my $class = shift;	1885	my $class = shift;
1824		1886
1825	$class->SUPER::new (	1887	$class->SUPER::new (
1826	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1827	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1828	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1829	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1830	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1831	state => 0,	1894	state => 0,
…		…
1835	}	1898	}
1836		1899
1837	sub size_request {	1900	sub size_request {
1838	my ($self) = @_;	1901	my ($self) = @_;
1839		1902
1840	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1841	}	1904	}
1842		1905
1843	sub button_down {	1906	sub button_down {
1844	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1845		1908
1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1849	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1850	}	1913	}
1851	}	1914	}
1852		1915
1853	sub _draw {	1916	sub _draw {
1854	my ($self) = @_;	1917	my ($self) = @_;
1855		1918
1856	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1857		1920
1858	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859		1922
1860	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861		1926
1862	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863		1928
1864	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1865		1930
…		…
2130	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2131	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2132	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2133	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2134	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2135	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2136	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2137	vertical => 0,	2202	vertical => 0,
2138	can_hover => 1,	2203	can_hover => 1,
2139	inner_pad => 0.02,	2204	inner_pad => 0.02,
2140	@_	2205	@_
2141	);	2206	);
…		…
2144	$self->update;	2209	$self->update;
2145		2210
2146	$self	2211	$self
2147	}	2212	}
2148		2213
		2214	sub changed { }
		2215
2149	sub set_range {	2216	sub set_range {
2150	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2151		2218
2152	($range, $self->{range}) = ($self->{range}, $range);	2219	($range, $self->{range}) = ($self->{range}, $range);
2153		2220
…		…
2179	}	2246	}
2180		2247
2181	sub size_request {	2248	sub size_request {
2182	my ($self) = @_;	2249	my ($self) = @_;
2183		2250
2184	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2185	my $h = $self->{req_h};
2186
2187	$self->{vertical} ? ($h, $w) : ($w, $h)
2188	}	2252	}
2189		2253
2190	sub button_down {	2254	sub button_down {
2191	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2192		2256
…		…
2543		2607
2544	sub new {	2608	sub new {
2545	my $class = shift;	2609	my $class = shift;
2546		2610
2547	my $self = $class->SUPER::new (	2611	my $self = $class->SUPER::new (
2548	state => 0,	2612	state => 0,
2549	connect_activate => \&toggle_flopper,	2613	on_activate => \&toggle_flopper,
2550	@_	2614	@_
2551	);	2615	);
2552		2616
2553	if ($self->{state}) {
2554	$self->{state} = 0;
2555	$self->toggle_flopper;
2556	}
2557
2558	$self	2617	$self
2559	}	2618	}
2560		2619
2561	sub toggle_flopper {	2620	sub toggle_flopper {
2562	my ($self) = @_;	2621	my ($self) = @_;
2563		2622
2564	# TODO: use animation	2623	$self->{other}->toggle_visibility;
2565	if ($self->{state} = !$self->{state}) {
2566	$CFClient::UI::ROOT->add ($self->{other});
2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2568	$self->_emit ("open");
2569	} else {
2570	$CFClient::UI::ROOT->remove ($self->{other});
2571	$self->_emit ("close");
2572	}
2573
2574	$self->_emit (changed => $self->{state});
2575	}	2624	}
2576		2625
2577	#############################################################################	2626	#############################################################################
2578		2627
2579	package CFClient::UI::Tooltip;	2628	package CFClient::UI::Tooltip;
…		…
2592	}	2641	}
2593		2642
2594	sub set_tooltip_from {	2643	sub set_tooltip_from {
2595	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2596		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2597	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2598	markup => $widget->{tooltip},	2656	markup => $tooltip,
2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600	fontsize => 0.8,	2658	fontsize => 0.8,
2601	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2602	ellipsise => 0,	2660	ellipsise => 0,
2603	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2614		2672
2615	sub size_allocate {	2673	sub size_allocate {
2616	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2617		2675
2618	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2619	}	2695	}
2620		2696
2621	sub _draw {	2697	sub _draw {
2622	my ($self) = @_;	2698	my ($self) = @_;
2623		2699
…		…
2640	glVertex $w, $h;	2716	glVertex $w, $h;
2641	glVertex $w, 0;	2717	glVertex $w, 0;
2642	glEnd;	2718	glEnd;
2643		2719
2644	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2645	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2646	}	2723	}
2647		2724
2648	#############################################################################	2725	#############################################################################
2649		2726
…		…
2725	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2726	}	2803	}
2727		2804
2728	#############################################################################	2805	#############################################################################
2729		2806
2730	package CFClient::UI::Inventory;
2731
2732	our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734	sub new {
2735	my $class = shift;
2736
2737	my $self = $class->SUPER::new (
2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739	@_,
2740	);
2741
2742	$self
2743	}
2744
2745	sub set_items {
2746	my ($self, $items) = @_;
2747
2748	$self->{scrolled}->clear;
2749	return unless $items;
2750
2751	my @items = sort {
2752	($a->{type} <=> $b->{type})
2753	or ($a->{name} cmp $b->{name})
2754	} @$items;
2755
2756	$self->{real_items} = \@items;
2757
2758	my $row = 0;
2759	for my $item (@items) {
2760	CFClient::Item::update_widgets $item;
2761
2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766	$row++;
2767	}
2768	}
2769
2770	sub size_request {
2771	my ($self) = @_;
2772	($self->{req_w}, $self->{req_h});
2773	}
2774
2775	#############################################################################
2776
2777	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2778		2808
2779	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2780		2810
2781	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2819	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2820	$GRAB = $self;	2850	$GRAB = $self;
2821	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2822		2852
2823	$self->show;	2853	$self->show;
2824	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825	}	2855	}
2826		2856
2827	sub mouse_motion {	2857	sub mouse_motion {
2828	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2829		2859
…		…
2954	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2955	}	2985	}
2956		2986
2957	#############################################################################	2987	#############################################################################
2958		2988
2959	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2960		2990
2961	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963	use CFClient::OpenGL;
2964		2992
2965	sub new {	2993	sub new {
2966	my $class = shift;	2994	my $class = shift;
2967		2995
2968	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2969	@_,	2998	@_,
2970	)	2999	);
2971	}
2972		3000
2973	sub configure {	3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
2974	my ($self, $x, $y, $w, $h) = @_;	3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2975		3150
2976	$self->{w} = $w;	3151	$self->clear_command_list;
2977	$self->{h} = $h;	3152	$self->{recording} = 0;
2978	}	3153	$self->{rec_btn}->set_text ("start recording");
2979		3154
2980	sub check_size {	3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
2981	my ($self) = @_;	3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
2982		3173
2983	$self->size_allocate ($self->{w}, $self->{h})	3174	sub update_binding_widgets {
2984	if $self->{w};	3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
		3290	visible => 1,
		3291	@_,
		3292	);
		3293
		3294	Scalar::Util::weaken ($self->{root} = $self);
		3295
		3296	$self
2985	}	3297	}
2986		3298
2987	sub size_request {	3299	sub size_request {
2988	my ($self) = @_;	3300	my ($self) = @_;
2989		3301
2990	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
2991	}	3317	}
2992		3318
2993	sub size_allocate {	3319	sub size_allocate {
2994	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
2995		3321
2996	for my $child ($self->children) {	3322	for my $child ($self->children) {
2997	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998		3324
2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3000	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3001		3327
3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3003	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
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		3330
3008	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3009	}	3332	}
3010	}	3333	}
3011		3334
…		…
3022	}	3345	}
3023		3346
3024	sub update {	3347	sub update {
3025	my ($self) = @_;	3348	my ($self) = @_;
3026		3349
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3029	}	3351	}
3030		3352
3031	sub add {	3353	sub add {
3032	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3033		3355
3034	for (my @widgets = @children; my $w = pop @widgets; ) {
3035	push @widgets, $w->children;
3036	$w->{root} = $self;
3037	$w->{visible} = 1;
3038	}
3039
3040	for my $child (@children) {
3041	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3042		3357	for @children;
3043	# integerise window positions
3044	$child->{x} = int $child->{x};
3045	$child->{y} = int $child->{y};
3046	}
3047		3358
3048	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3049	}	3360	}
3050		3361
3051	sub remove {	3362	sub remove {
3052	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3053		3364
3054	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3055		3369
3056	while (@children) {	3370	while (@children) {
3057	my $w = pop @children;	3371	my $w = pop @children;
3058	push @children, $w->children;	3372	push @children, $w->children;
3059	$w->set_invisible;	3373	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3079	$_->()	3393	$_->()
3080	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3081	}	3395	}
3082		3396
3083	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
3084	my @queue = ([], []);	3398	my %queue;
		3399	my @queue;
		3400	my $widget;
3085		3401
3086	for (;;) {	3402	outer:
3087	if ($self->{check_size}) {	3403	while () {
3088	# heuristic: check containers last	3404	if (my $realloc = delete $self->{realloc}) {
3089	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3405	for $widget (values %$realloc) {
3090	for values %{delete $self->{check_size}}	3406	$widget->{visible} or next; # do not resize invisible widgets
		3407
		3408	$queue{$widget+0}++ and next; # duplicates are common
		3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3091	}	3412	}
3092		3413
3093	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3414	while () {
		3415	@queue or last outer;
3094		3416
3095	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3417	$widget = pop @{ $queue[-1] || [] }
3096	? @$widget{qw(user_w user_h)}	3418	and last;
3097	: $widget->size_request;
3098
3099	if (delete $widget->{force_alloc}
3100	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3103	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3104	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3105		3437
3106	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3107		3439
3108	$widget->{parent}->check_size
3109	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3110	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3111	}	3450	}
3112	}	3451	}
3113		3452
3114	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3115	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3116	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117		3461
3118	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3119	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3120		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3121	$widget->{w} = $w;	3472	$widget->{w} = $w;
3122	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3123	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3124	}	3477	}
3125	}	3478	}
3126		3479
3127	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3128	$_->()	3481	$_->()
3129	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3130	}	3483	}
		3484
3131		3485
3132	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3135		3489
…		…
3137	glLoadIdentity;	3491	glLoadIdentity;
3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3140	glLoadIdentity;	3494	glLoadIdentity;
3141		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3142	$self->_draw;	3503	$self->_draw;
3143	}	3504	}
3144		3505
3145	#############################################################################	3506	#############################################################################
3146		3507

Diff Legend

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