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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

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

Diff Legend

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