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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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