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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 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
		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	}
18		43
19	sub check_tooltip {	44	sub check_tooltip {
20	if (!$GRAB) {	45	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	47	if (length $widget->{tooltip}) {
23		48
24	if ($TOOLTIP->{owner} != $widget) {	49	if ($TOOLTIP->{owner} != $widget) {
		50	$TOOLTIP->hide;
		51
25	$TOOLTIP->{owner} = $widget;	52	$TOOLTIP->{owner} = $widget;
26		53
27	my $tip = $widget->{tooltip};	54	my $tip = $widget->{tooltip};
28		55
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	56	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		57
31	$TOOLTIP->set_tooltip_from ($widget);	58	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	59	$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	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
152	sub rescale_widgets {	170	sub rescale_widgets {
153	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
154		172
155	for my $widget (values %WIDGET) {	173	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	174	if ($widget->{is_toplevel}) {
		175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		177
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	178	$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};	179	$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};	180	$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};	181	$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};	182	$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};	183	$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};	184
		185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		187
165	}	188	}
166	}	189	}
167		190
168	reconfigure_widgets;	191	reconfigure_widgets;
169	}	192	}
…		…
178		201
179	sub new {	202	sub new {
180	my $class = shift;	203	my $class = shift;
181		204
182	my $self = bless {	205	my $self = bless {
183	x => 0,	206	x => "center",
184	y => 0,	207	y => "center",
185	z => 0,	208	z => 0,
		209	w => undef,
		210	h => undef,
186	can_events => 1,	211	can_events => 1,
187	@_	212	@_
188	}, $class;	213	}, $class;
189		214
		215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		216
190	for (keys %$self) {	217	for (keys %$self) {
191	if (/^connect_(.*)$/) {	218	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	219	$self->connect ($1 => delete $self->{$_});
193	}	220	}
194	}	221	}
195		222
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		228
		229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		231
		232	$self->show if $layout->{show};
		233	}
197		234
198	$self	235	$self
199	}	236	}
200		237
201	sub destroy {	238	sub destroy {
…		…
205	%$self = ();	242	%$self = ();
206	}	243	}
207		244
208	sub show {	245	sub show {
209	my ($self) = @_;	246	my ($self) = @_;
		247
210	return if $self->{parent};	248	return if $self->{parent};
211		249
212	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
213	}	251	}
214		252
215	sub show_centered {	253	sub set_visible {
216	my ($self) = @_;	254	my ($self) = @_;
		255
217	return if $self->{parent};	256	return if $self->{visible};
218		257
219	$self->show;	258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
220		260
221	$CFClient::UI::ROOT->on_post_alloc (	261	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	262
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	263	$self->realloc if !exists $self->{req_w};
224	},	264
225	);	265	$_->set_visible for $self->children;
226	}	266	}
227		267
228	sub set_invisible {	268	sub set_invisible {
229	my ($self) = @_;	269	my ($self) = @_;
230		270
231	# broken show/hide model	271	return unless $self->{visible};
232		272
		273	$_->set_invisible for $self->children;
		274
		275	delete $self->{root};
233	delete $self->{visible};	276	delete $self->{visible};
234		277
235	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
237		280
		281	CFClient::UI::check_tooltip
		282	if $TOOLTIP->{owner} == $self;
		283
238	$self->focus_out;	284	$self->focus_out;
		285
		286	$self->emit (visibility_change => 0);
		287	}
		288
		289	sub set_visibility {
		290	my ($self, $visible) = @_;
		291
		292	return if $self->{visible} == $visible;
		293
		294	$visible ? $self->hide
		295	: $self->show;
		296	}
		297
		298	sub toggle_visibility {
		299	my ($self) = @_;
		300
		301	$self->{visible}
		302	? $self->hide
		303	: $self->show;
239	}	304	}
240		305
241	sub hide {	306	sub hide {
242	my ($self) = @_;	307	my ($self) = @_;
243		308
…		…
245		310
246	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
247	if $self->{parent};	312	if $self->{parent};
248	}	313	}
249		314
250	sub move {	315	sub move_abs {
251	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
252		317
253	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
254	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
255	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
256		321
257	$self->update;	322	$self->update;
258	}	323	}
259		324
260	sub set_size {	325	sub set_size {
261	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
262		327
263	$self->{user_w} = $w;	328	$self->{force_w} = $w;
264	$self->{user_h} = $h;	329	$self->{force_h} = $h;
265		330
266	$self->check_size;	331	$self->realloc;
267	}	332	}
268		333
269	sub size_request {	334	sub size_request {
270	require Carp;	335	require Carp;
271	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
273		338
274	sub configure {	339	sub configure {
275	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
276		341
277	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
278	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
279	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
280		347
281	# use alignment to adjust x, y	348	# use alignment to adjust x, y
282		349
283	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
284	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
285
286	($w, $h) = ($w2, $h2);
287	}	352	}
288		353
289	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
290	$self->{x} = $x;	355	$self->{x} = $x;
291	$self->{y} = $y;	356	$self->{y} = $y;
292	$self->update;	357	$self->update;
293	}	358	}
294		359
295	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{w} != $w || $self->{h} != $h) {
		361	return unless $self->{visible};
		362
296	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
297	}	364	}
298	}	365	}
299		366
300	sub size_allocate {	367	sub size_allocate {
301	# nothing to be done	368	# nothing to be done
302	}	369	}
303		370
304	sub reconfigure {
305	my ($self) = @_;
306
307	$self->check_size (1);
308	$self->update;
309	}
310
311	sub children {	371	sub children {
312	}	372	}
313		373
314	sub set_max_size {	374	sub set_max_size {
315	my ($self, $w, $h) = @_;	375	my ($self, $w, $h) = @_;
…		…
318	delete $self->{max_h}; $self->{max_h} = $h if $h;	378	delete $self->{max_h}; $self->{max_h} = $h if $h;
319	}	379	}
320		380
321	sub set_tooltip {	381	sub set_tooltip {
322	my ($self, $tooltip) = @_;	382	my ($self, $tooltip) = @_;
		383
		384	$tooltip =~ s/^\s+//;
		385	$tooltip =~ s/\s+$//;
		386
		387	return if $self->{tooltip} eq $tooltip;
323		388
324	$self->{tooltip} = $tooltip;	389	$self->{tooltip} = $tooltip;
325		390
326	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327	delete $CFClient::UI::TOOLTIP->{owner};	392	delete $CFClient::UI::TOOLTIP->{owner};
…		…
386	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
387	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
388	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
389	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
390	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		456
		457	sub find_widget {
		458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self};
		504
		505	$self->{root}{realloc}{$self} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	}
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
		518
		519	sub reconfigure {
		520	my ($self) = @_;
		521
		522	$self->realloc;
		523	$self->update;
		524	}
391		525
392	sub draw {	526	sub draw {
393	my ($self) = @_;	527	my ($self) = @_;
394		528
395	return unless $self->{h} && $self->{w};	529	return unless $self->{h} && $self->{w};
…		…
412	glVertex $x , $y + $self->{h};	546	glVertex $x , $y + $self->{h};
413	glEnd;	547	glEnd;
414	glDisable GL_BLEND;	548	glDisable GL_BLEND;
415	}	549	}
416		550
417	if ($ENV{PCLIENT_DEBUG}) {	551	if ($ENV{CFPLUS_DEBUG}) {
418	glPushMatrix;	552	glPushMatrix;
419	glColor 1, 1, 0, 1;	553	glColor 1, 1, 0, 1;
420	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421	glBegin GL_LINE_LOOP;	555	glBegin GL_LINE_LOOP;
422	glVertex 0 , 0;	556	glVertex 0 , 0;
423	glVertex $self->{w}, 0;	557	glVertex $self->{w} - 1, 0;
424	glVertex $self->{w}, $self->{h};	558	glVertex $self->{w} - 1, $self->{h} - 1;
425	glVertex 0 , $self->{h};	559	glVertex 0 , $self->{h} - 1;
426	glEnd;	560	glEnd;
427	glPopMatrix;	561	glPopMatrix;
428	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429	}	563	}
430	}	564	}
431		565
432	sub _draw {	566	sub _draw {
433	my ($self) = @_;	567	my ($self) = @_;
434		568
435	warn "no draw defined for $self\n";	569	warn "no draw defined for $self\n";
436	}
437
438	sub find_widget {
439	my ($self, $x, $y) = @_;
440
441	return () unless $self->{can_events};
442
443	return $self
444	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447	()
448	}
449
450	sub set_parent {
451	my ($self, $parent) = @_;
452
453	Scalar::Util::weaken ($self->{parent} = $parent);
454
455	# TODO: req_w _does_change after ->reconfigure
456	$self->check_size
457	unless exists $self->{req_w};
458
459	$self->show;
460	}
461
462	sub check_size {
463	my ($self, $forced) = @_;
464
465	$self->{force_alloc} = 1 if $forced;
466	$CFClient::UI::ROOT->{check_size}{$self} = $self;
467	}
468
469	sub update {
470	my ($self) = @_;
471
472	$self->{parent}->update
473	if $self->{parent};
474	}
475
476	sub connect {
477	my ($self, $signal, $cb) = @_;
478
479	push @{ $self->{signal_cb}{$signal} }, $cb;
480	}
481
482	sub _emit {
483	my ($self, $signal, @args) = @_;
484
485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486	}
487
488	sub emit {
489	my ($self, $signal, @args) = @_;
490
491	$self->_emit ($signal, @args)
492	|| $self->$signal (@args);
493	}	570	}
494		571
495	sub DESTROY {	572	sub DESTROY {
496	my ($self) = @_;	573	my ($self) = @_;
497		574
…		…
555	my ($class, %arg) = @_;	632	my ($class, %arg) = @_;
556	$class->SUPER::new (can_events => 0, %arg);	633	$class->SUPER::new (can_events => 0, %arg);
557	}	634	}
558		635
559	sub size_request {	636	sub size_request {
560	(0, 0)	637	my ($self) = @_;
		638
		639	($self->{w} + 0, $self->{h} + 0)
561	}	640	}
562		641
563	sub draw { }	642	sub draw { }
564		643
565	#############################################################################	644	#############################################################################
…		…
594	$self->{children} = [	673	$self->{children} = [
595	sort { $a->{z} <=> $b->{z} }	674	sort { $a->{z} <=> $b->{z} }
596	@{$self->{children}}, @widgets	675	@{$self->{children}}, @widgets
597	];	676	];
598		677
599	$self->check_size (1);	678	$self->realloc;
600	$self->update;
601	}	679	}
602		680
603	sub children {	681	sub children {
604	@{ $_[0]{children} }	682	@{ $_[0]{children} }
605	}	683	}
…		…
610	delete $child->{parent};	688	delete $child->{parent};
611	$child->hide;	689	$child->hide;
612		690
613	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	691	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614		692
615	$self->check_size;	693	$self->realloc;
616	$self->update;
617	}	694	}
618		695
619	sub clear {	696	sub clear {
620	my ($self) = @_;	697	my ($self) = @_;
621		698
…		…
625	for (@$children) {	702	for (@$children) {
626	delete $_->{parent};	703	delete $_->{parent};
627	$_->hide;	704	$_->hide;
628	}	705	}
629		706
630	$self->check_size;	707	$self->realloc;
631	$self->update;
632	}	708	}
633		709
634	sub find_widget {	710	sub find_widget {
635	my ($self, $x, $y) = @_;	711	my ($self, $x, $y) = @_;
636		712
…		…
689	sub size_request {	765	sub size_request {
690	$_[0]{children}[0]->size_request	766	$_[0]{children}[0]->size_request
691	}	767	}
692		768
693	sub size_allocate {	769	sub size_allocate {
694	my ($self, $w, $h) = @_;	770	my ($self, $w, $h, $changed) = @_;
695		771
696	$self->{children}[0]->configure (0, 0, $w, $h);	772	$self->{children}[0]->configure (0, 0, $w, $h);
697	}	773	}
698		774
699	#############################################################################	775	#############################################################################
…		…
716	$ROOT->on_post_alloc ($self => sub { $self->render_child });	792	$ROOT->on_post_alloc ($self => sub { $self->render_child });
717	$self->SUPER::update;	793	$self->SUPER::update;
718	}	794	}
719		795
720	sub size_allocate {	796	sub size_allocate {
721	my ($self, $w, $h) = @_;	797	my ($self, $w, $h, $changed) = @_;
722		798
723	$self->SUPER::size_allocate ($w, $h);	799	$self->SUPER::size_allocate ($w, $h, $changed);
724	$self->update;	800	$self->update
		801	if $changed;
725	}	802	}
726		803
727	sub _render {	804	sub _render {
728	$_[0]{children}[0]->draw;	805	$_[0]{children}[0]->draw;
729	}	806	}
…		…
760		837
761	package CFClient::UI::ViewPort;	838	package CFClient::UI::ViewPort;
762		839
763	our @ISA = CFClient::UI::Window::;	840	our @ISA = CFClient::UI::Window::;
764		841
		842	sub new {
		843	my $class = shift;
		844
		845	$class->SUPER::new (
		846	scroll_x => 0,
		847	scroll_y => 1,
		848	@_,
		849	)
		850	}
		851
765	sub size_request {	852	sub size_request {
766	my ($self) = @_;	853	my ($self) = @_;
767		854
768	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
769		856
770	@$self{qw(child_w child_h)}	857	$w = 10 if $self->{scroll_x};
		858	$h = 10 if $self->{scroll_y};
		859
		860	($w, $h)
771	}	861	}
772		862
773	sub size_allocate {	863	sub size_allocate {
774	my ($self, $w, $h) = @_;	864	my ($self, $w, $h, $changed) = @_;
775		865
776	my ($cw, $ch) = @$self{qw(child_w child_h)};	866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777	# $w = $self->{w};	867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		868
778	$self->child->configure (0, 0, $cw, $ch);	869	$self->child->configure (0, 0, $w, $h);
779	$self->update;	870	$self->update;
780	}	871	}
781		872
782	sub set_offset {	873	sub set_offset {
783	my ($self, $x, $y) = @_;	874	my ($self, $x, $y) = @_;
…		…
834	my $class = shift;	925	my $class = shift;
835		926
836	my $self;	927	my $self;
837		928
838	my $slider = new CFClient::UI::Slider	929	my $slider = new CFClient::UI::Slider
839	vertical => 1,	930	vertical => 1,
840	range => [0, 0, 1, 0.01], # HACK fix	931	range => [0, 0, 1, 0.01], # HACK fix
841	connect_changed => sub {	932	on_changed => sub {
842	$self->{vp}->set_offset (0, $_[1]);	933	$self->{vp}->set_offset (0, $_[1]);
843	},	934	},
844	;	935	;
845		936
846	$self = $class->SUPER::new (	937	$self = $class->SUPER::new (
…		…
854	$self->add ($self->{slider});	945	$self->add ($self->{slider});
855		946
856	$self	947	$self
857	}	948	}
858		949
		950	sub update {
		951	my ($self) = @_;
		952
		953	$self->SUPER::update;
		954
		955	# todo: overwrite size_allocate of child
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		958	}
		959
859	sub size_allocate {	960	sub size_allocate {
860	my ($self, $w, $h) = @_;	961	my ($self, $w, $h, $changed) = @_;
861		962
862	$self->SUPER::size_allocate ($w, $h);	963	$self->SUPER::size_allocate ($w, $h, $changed);
863		964
864	my $child = $self->{vp}->child;	965	my $child = $self->{vp}->child;
865	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
866	}	967	}
867		968
…		…
914		1015
915	our @ISA = CFClient::UI::Bin::;	1016	our @ISA = CFClient::UI::Bin::;
916		1017
917	use CFClient::OpenGL;	1018	use CFClient::OpenGL;
918		1019
919	my @tex =	1020	my $bg =
		1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1022	mipmap => 1, wrap => 1;
		1023
		1024	my @border =
920	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922		1027
923	sub new {	1028	sub new {
924	my $class = shift;	1029	my $class = shift;
925
926	# TODO: user_x, user_y, overwrite moveto?
927		1030
928	my $self = $class->SUPER::new (	1031	my $self = $class->SUPER::new (
929	bg => [1, 1, 1, 1],	1032	bg => [1, 1, 1, 1],
930	border_bg => [1, 1, 1, 1],	1033	border_bg => [1, 1, 1, 1],
931	border => 0.6,	1034	border => 0.6,
932	is_toplevel => 1,
933	can_events => 1,	1035	can_events => 1,
		1036	min_w => 16,
		1037	min_h => 16,
934	@_	1038	@_
935	);	1039	);
936		1040
937	$self->{title} &&= new CFClient::UI::Label	1041	$self->{title} &&= new CFClient::UI::Label
938	align => 0,	1042	align => 0,
…		…
957	$h + $self->border * 2,	1061	$h + $self->border * 2,
958	)	1062	)
959	}	1063	}
960		1064
961	sub size_allocate {	1065	sub size_allocate {
962	my ($self, $w, $h) = @_;	1066	my ($self, $w, $h, $changed) = @_;
		1067
		1068	return unless $changed;
963		1069
964	$h -= List::Util::max 0, $self->border * 2;	1070	$h -= List::Util::max 0, $self->border * 2;
965	$w -= List::Util::max 0, $self->border * 2;	1071	$w -= List::Util::max 0, $self->border * 2;
966		1072
967	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
991	my ($ev, $x, $y) = @_;	1097	my ($ev, $x, $y) = @_;
992		1098
993	my $dx = $ev->{x} - $ox;	1099	my $dx = $ev->{x} - $ox;
994	my $dy = $ev->{y} - $oy;	1100	my $dy = $ev->{y} - $oy;
995		1101
996	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1104
		1105	$self->realloc;
998	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999	$self->check_size;
1000	};	1107	};
1001		1108
1002	} elsif ($lr ^ $td) {	1109	} elsif ($lr ^ $td) {
1003	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004	my ($bx, $by) = ($self->{x}, $self->{y});	1111	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1006	$self->{motion} = sub {	1113	$self->{motion} = sub {
1007	my ($ev, $x, $y) = @_;	1114	my ($ev, $x, $y) = @_;
1008		1115
1009	($x, $y) = ($ev->{x}, $ev->{y});	1116	($x, $y) = ($ev->{x}, $ev->{y});
1010		1117
1011	$self->move ($bx + $x - $ox, $by + $y - $oy);	1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012	$self->update;
1013	};	1119	};
1014	}	1120	}
1015	}	1121	}
1016		1122
1017	sub button_up {	1123	sub button_up {
…		…
1036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037		1143
1038	my $border = $self->border;	1144	my $border = $self->border;
1039		1145
1040	glColor @{ $self->{border_bg} };	1146	glColor @{ $self->{border_bg} };
1041	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1042	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045		1151
1046	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047	my $bg = $tex[0];	1153	glColor @{ $self->{bg} };
1048		1154
1049	# TODO: repeat texture not scale	1155	# TODO: repeat texture not scale
		1156	# solve this better(?)
1050	my $rep_x = $cw / $bg->{w};	1157	$bg->{s} = $cw / $bg->{w};
1051	my $rep_y = $ch / $bg->{h};	1158	$bg->{t} = $ch / $bg->{h};
1052
1053	glColor @{ $self->{bg} };
1054
1055	$bg->{s} = $rep_x;
1056	$bg->{t} = $rep_y;
1057	$bg->{wrap_mode} = 1;
1058	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059	}	1160	}
1060		1161
1061	glDisable GL_TEXTURE_2D;	1162	glDisable GL_TEXTURE_2D;
1062		1163
…		…
1078	sub new {	1179	sub new {
1079	my $class = shift;	1180	my $class = shift;
1080		1181
1081	$class->SUPER::new (	1182	$class->SUPER::new (
1082	col_expand => [],	1183	col_expand => [],
1083	@_	1184	@_,
1084	)	1185	)
		1186	}
		1187
		1188	sub children {
		1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085	}	1190	}
1086		1191
1087	sub add {	1192	sub add {
1088	my ($self, $x, $y, $child) = @_;	1193	my ($self, $x, $y, $child) = @_;
1089		1194
1090	$child->set_parent ($self);	1195	$child->set_parent ($self);
1091	$self->{children}[$y][$x] = $child;	1196	$self->{children}[$y][$x] = $child;
1092		1197
1093	$child->check_size;	1198	$self->realloc;
1094	}	1199	}
1095		1200
1096	sub children {
1097	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098	}
1099
1100	# TODO: move to container class maybe? send childs a signal on removal?	1201	# TODO: move to container class maybe? send children a signal on removal?
1101	sub clear {	1202	sub clear {
1102	my ($self) = @_;	1203	my ($self) = @_;
1103		1204
1104	my @children = $self->children;	1205	my @children = $self->children;
1105	delete $self->{children};	1206	delete $self->{children};
…		…
1107	for (@children) {	1208	for (@children) {
1108	delete $_->{parent};	1209	delete $_->{parent};
1109	$_->hide;	1210	$_->hide;
1110	}	1211	}
1111		1212
1112	$self->update;	1213	$self->realloc;
1113	}	1214	}
1114		1215
1115	sub get_wh {	1216	sub get_wh {
1116	my ($self) = @_;	1217	my ($self) = @_;
1117		1218
…		…
1144	(sum @$hs),	1245	(sum @$hs),
1145	)	1246	)
1146	}	1247	}
1147		1248
1148	sub size_allocate {	1249	sub size_allocate {
1149	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h, $changed) = @_;
1150		1251
1151	my ($ws, $hs) = $self->get_wh;	1252	my ($ws, $hs) = $self->get_wh;
1152		1253
1153	my $req_w = sum @$ws;	1254	my $req_w = (sum @$ws) || 1;
1154	my $req_h = sum @$hs;	1255	my $req_h = (sum @$hs) || 1;
1155		1256
1156	# TODO: nicer code && do row_expand	1257	# TODO: nicer code && do row_expand
1157	my @col_expand = @{$self->{col_expand}};	1258	my @col_expand = @{$self->{col_expand}};
1158	@col_expand = (1) x @$ws unless @col_expand;	1259	@col_expand = (1) x @$ws unless @col_expand;
1159	my $col_expand = (sum @col_expand) || 1;	1260	my $col_expand = (sum @col_expand) || 1;
…		…
1213	}	1314	}
1214	}	1315	}
1215		1316
1216	#############################################################################	1317	#############################################################################
1217		1318
		1319	package CFClient::UI::Box;
		1320
		1321	our @ISA = CFClient::UI::Container::;
		1322
		1323	sub size_request {
		1324	my ($self) = @_;
		1325
		1326	$self->{vertical}
		1327	? (
		1328	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	: (
		1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1334	)
		1335	}
		1336
		1337	sub size_allocate {
		1338	my ($self, $w, $h, $changed) = @_;
		1339
		1340	my $space = $self->{vertical} ? $h : $w;
		1341	my $children = $self->{children};
		1342
		1343	my @req;
		1344
		1345	if ($self->{homogeneous}) {
		1346	@req = ($space / (@$children || 1)) x @$children;
		1347	} else {
		1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1349	my $req = List::Util::sum @req;
		1350
		1351	if ($req > $space) {
		1352	# ah well, not enough space
		1353	$_ *= $space / $req for @req;
		1354	} else {
		1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1356
		1357	$space = ($space - $req) / $expand; # remaining space to give away
		1358
		1359	$req[$_] += $space * $children->[$_]{expand}
		1360	for 0 .. $#$children;
		1361	}
		1362	}
		1363
		1364	CFClient::UI::harmonize \@req;
		1365
		1366	my $pos = 0;
		1367	for (0 .. $#$children) {
		1368	my $alloc = $req[$_];
		1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1370
		1371	$pos += $alloc;
		1372	}
		1373
		1374	1
		1375	}
		1376
		1377	#############################################################################
		1378
1218	package CFClient::UI::HBox;	1379	package CFClient::UI::HBox;
1219		1380
1220	# TODO: wrap into common Box base class
1221
1222	our @ISA = CFClient::UI::Container::;	1381	our @ISA = CFClient::UI::Box::;
1223		1382
1224	sub size_request {	1383	sub new {
1225	my ($self) = @_;	1384	my $class = shift;
1226		1385
1227	my @alloc = map [$_->size_request], @{$self->{children}};	1386	$class->SUPER::new (
1228		1387	vertical => 0,
1229	(	1388	@_,
1230	(List::Util::sum map $_->[0], @alloc),
1231	(List::Util::max map $_->[1], @alloc),
1232	)	1389	)
1233	}	1390	}
1234		1391
1235	sub size_allocate {
1236	my ($self, $w, $h) = @_;
1237
1238	($h, $w) = ($w, $h);
1239
1240	my $children = $self->{children};
1241
1242	my @h = map $_->{req_w}, @$children;
1243
1244	my $req_h = List::Util::sum @h;
1245
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;
1251	$exp ||= 1;
1252
1253	for (0 .. $#$children) {
1254	my $child = $children->[$_];
1255
1256	my $alloc_h = $h[$_];
1257	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258	$h[$_] = $alloc_h;
1259	}
1260	}
1261
1262	CFClient::UI::harmonize \@h;
1263
1264	my $y = 0;
1265	for (0 .. $#$children) {
1266	my $child = $children->[$_];
1267	my $h = $h[$_];
1268	$child->configure ($y, 0, $h, $w);
1269
1270	$y += $h;
1271	}
1272
1273	1
1274	}
1275
1276	#############################################################################	1392	#############################################################################
1277		1393
1278	package CFClient::UI::VBox;	1394	package CFClient::UI::VBox;
1279		1395
1280	# TODO: wrap into common Box base class
1281
1282	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Box::;
1283		1397
1284	sub size_request {	1398	sub new {
1285	my ($self) = @_;	1399	my $class = shift;
1286		1400
1287	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$class->SUPER::new (
1288		1402	vertical => 1,
1289	(	1403	@_,
1290	(List::Util::max map $_->[0], @alloc),
1291	(List::Util::sum map $_->[1], @alloc),
1292	)	1404	)
1293	}
1294
1295	sub size_allocate {
1296	my ($self, $w, $h) = @_;
1297
1298	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300	my $children = $self->{children};
1301
1302	my @h = map $_->{req_h}, @$children;
1303
1304	my $req_h = List::Util::sum @h;
1305
1306	if ($req_h > $h) {
1307	# ah well, not enough space
1308	$_ *= $h / $req_h for @h;
1309	} else {
1310	my $exp = List::Util::sum map $_->{expand}, @$children;
1311	$exp ||= 1;
1312
1313	for (0 .. $#$children) {
1314	my $child = $children->[$_];
1315
1316	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317	}
1318	}
1319
1320	CFClient::UI::harmonize \@h;
1321
1322	my $y = 0;
1323	for (0 .. $#$children) {
1324	my $child = $children->[$_];
1325	my $h = $h[$_];
1326	$child->configure (0, $y, $w, $h);
1327
1328	$y += $h;
1329	}
1330
1331	1
1332	}	1405	}
1333		1406
1334	#############################################################################	1407	#############################################################################
1335		1408
1336	package CFClient::UI::Label;	1409	package CFClient::UI::Label;
…		…
1353	ellipsise => 3, # end	1426	ellipsise => 3, # end
1354	layout => (new CFClient::Layout),	1427	layout => (new CFClient::Layout),
1355	fontsize => 1,	1428	fontsize => 1,
1356	align => -1,	1429	align => -1,
1357	valign => -1,	1430	valign => -1,
1358	padding => 2,	1431	padding_x => 2,
		1432	padding_y => 2,
1359	can_events => 0,	1433	can_events => 0,
1360	%arg	1434	%arg
1361	);	1435	);
1362		1436
1363	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1399	$self->{text} = "T$text";	1473	$self->{text} = "T$text";
1400		1474
1401	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402	$self->{layout}->set_text ($text);	1476	$self->{layout}->set_text ($text);
1403		1477
		1478	$self->realloc;
1404	$self->update;	1479	$self->update;
1405	$self->check_size;
1406	}	1480	}
1407		1481
1408	sub set_markup {	1482	sub set_markup {
1409	my ($self, $markup) = @_;	1483	my ($self, $markup) = @_;
1410		1484
…		…
1414	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415		1489
1416	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417	$self->{layout}->set_markup ($markup);	1491	$self->{layout}->set_markup ($markup);
1418		1492
		1493	$self->realloc;
1419	$self->update;	1494	$self->update;
1420	$self->check_size;
1421	}	1495	}
1422		1496
1423	sub size_request {	1497	sub size_request {
1424	my ($self) = @_;	1498	my ($self) = @_;
1425		1499
…		…
1439		1513
1440	$w = List::Util::max $w, $w2;	1514	$w = List::Util::max $w, $w2;
1441	$h = List::Util::max $h, $h2;	1515	$h = List::Util::max $h, $h2;
1442	}	1516	}
1443		1517
1444	(	1518	($w, $h)
1445	$w + $self->{padding} * 2,
1446	$h + $self->{padding} * 2,
1447	)
1448	}	1519	}
1449		1520
1450	sub size_allocate {	1521	sub size_allocate {
1451	my ($self, $w, $h) = @_;	1522	my ($self, $w, $h, $changed) = @_;
1452		1523
1453	delete $self->{texture};	1524	delete $self->{texture}
		1525	if $changed;
1454	}	1526	}
1455		1527
1456	sub set_fontsize {	1528	sub set_fontsize {
1457	my ($self, $fontsize) = @_;	1529	my ($self, $fontsize) = @_;
1458		1530
1459	$self->{fontsize} = $fontsize;	1531	$self->{fontsize} = $fontsize;
1460	delete $self->{texture};	1532	delete $self->{texture};
1461		1533
1462	$self->update;	1534	$self->realloc;
1463	$self->check_size;
1464	}	1535	}
1465		1536
1466	sub _draw {	1537	sub _draw {
1467	my ($self) = @_;	1538	my ($self) = @_;
1468		1539
…		…
1476	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478		1549
1479	my $tex = new_from_layout CFClient::Texture $self->{layout};	1550	my $tex = new_from_layout CFClient::Texture $self->{layout};
1480		1551
1481	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483	: ($self->{w} - $tex->{w}) * 0.5);	1554	: ($self->{w} - $tex->{w}) * 0.5);
1484		1555
1485	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487	: ($self->{h} - $tex->{h}) * 0.5);	1558	: ($self->{h} - $tex->{h}) * 0.5);
1488		1559
1489	$tex	1560	$tex
1490	};	1561	};
1491		1562
…		…
1548	sub set_text {	1619	sub set_text {
1549	my ($self, $text) = @_;	1620	my ($self, $text) = @_;
1550		1621
1551	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1552	$self->_set_text ($text);	1623	$self->_set_text ($text);
1553	$self->update;	1624
1554	$self->check_size;	1625	$self->realloc;
1555	}	1626	}
1556		1627
1557	sub get_text {	1628	sub get_text {
1558	$_[0]{text}	1629	$_[0]{text}
1559	}	1630	}
…		…
1562	my ($self) = @_;	1633	my ($self) = @_;
1563		1634
1564	my ($w, $h) = $self->SUPER::size_request;	1635	my ($w, $h) = $self->SUPER::size_request;
1565		1636
1566	($w + 1, $h) # add 1 for cursor	1637	($w + 1, $h) # add 1 for cursor
1567	}
1568
1569	sub size_allocate {
1570	my ($self, $w, $h) = @_;
1571
1572	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573	}	1638	}
1574		1639
1575	sub key_down {	1640	sub key_down {
1576	my ($self, $ev) = @_;	1641	my ($self, $ev) = @_;
1577		1642
…		…
1598	} elsif ($uni) {	1663	} elsif ($uni) {
1599	substr $text, $self->{cursor}++, 0, chr $uni;	1664	substr $text, $self->{cursor}++, 0, chr $uni;
1600	}	1665	}
1601		1666
1602	$self->_set_text ($text);	1667	$self->_set_text ($text);
1603	$self->update;	1668
1604	$self->check_size;	1669	$self->realloc;
1605	}	1670	}
1606		1671
1607	sub focus_in {	1672	sub focus_in {
1608	my ($self) = @_;	1673	my ($self) = @_;
1609		1674
…		…
1736		1801
1737	sub new {	1802	sub new {
1738	my $class = shift;	1803	my $class = shift;
1739		1804
1740	$class->SUPER::new (	1805	$class->SUPER::new (
1741	padding => 4,	1806	padding_x => 4,
		1807	padding_y => 4,
1742	fg => [1, 1, 1],	1808	fg => [1, 1, 1],
1743	active_fg => [0, 0, 1],	1809	active_fg => [0, 0, 1],
1744	can_hover => 1,	1810	can_hover => 1,
1745	align => 0,	1811	align => 0,
1746	valign => 0,	1812	valign => 0,
…		…
1793		1859
1794	sub new {	1860	sub new {
1795	my $class = shift;	1861	my $class = shift;
1796		1862
1797	$class->SUPER::new (	1863	$class->SUPER::new (
1798	padding => 2,	1864	padding_x => 2,
		1865	padding_y => 2,
1799	fg => [1, 1, 1],	1866	fg => [1, 1, 1],
1800	active_fg => [1, 1, 0],	1867	active_fg => [1, 1, 0],
1801	bg => [0, 0, 0, 0.2],	1868	bg => [0, 0, 0, 0.2],
1802	active_bg => [1, 1, 1, 0.5],	1869	active_bg => [1, 1, 1, 0.5],
1803	state => 0,	1870	state => 0,
…		…
1807	}	1874	}
1808		1875
1809	sub size_request {	1876	sub size_request {
1810	my ($self) = @_;	1877	my ($self) = @_;
1811		1878
1812	($self->{padding} * 2 + 6) x 2	1879	(6) x 2
1813	}	1880	}
1814		1881
1815	sub button_down {	1882	sub button_down {
1816	my ($self, $ev, $x, $y) = @_;	1883	my ($self, $ev, $x, $y) = @_;
1817		1884
1818	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820	$self->{state} = !$self->{state};	1887	$self->{state} = !$self->{state};
1821	$self->_emit (changed => $self->{state});	1888	$self->_emit (changed => $self->{state});
1822	}	1889	}
1823	}	1890	}
1824		1891
1825	sub _draw {	1892	sub _draw {
1826	my ($self) = @_;	1893	my ($self) = @_;
1827		1894
1828	$self->SUPER::_draw;	1895	$self->SUPER::_draw;
1829		1896
1830	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1897	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831		1898
1832	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1899	my ($w, $h) = @$self{qw(w h)};
		1900
		1901	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833		1902
1834	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1903	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835		1904
1836	my $tex = $self->{state} ? $tex[1] : $tex[0];	1905	my $tex = $self->{state} ? $tex[1] : $tex[0];
1837		1906
…		…
2102	fg => [1, 1, 1],	2171	fg => [1, 1, 1],
2103	active_fg => [0, 0, 0],	2172	active_fg => [0, 0, 0],
2104	bg => [0, 0, 0, 0.2],	2173	bg => [0, 0, 0, 0.2],
2105	active_bg => [1, 1, 1, 0.5],	2174	active_bg => [1, 1, 1, 0.5],
2106	range => [0, 0, 100, 10, 0],	2175	range => [0, 0, 100, 10, 0],
2107	req_w => $::WIDTH / 80,	2176	min_w => $::WIDTH / 80,
2108	req_h => $::WIDTH / 80,	2177	min_h => $::WIDTH / 80,
2109	vertical => 0,	2178	vertical => 0,
2110	can_hover => 1,	2179	can_hover => 1,
2111	inner_pad => 0.02,	2180	inner_pad => 0.02,
2112	@_	2181	@_
2113	);	2182	);
…		…
2116	$self->update;	2185	$self->update;
2117		2186
2118	$self	2187	$self
2119	}	2188	}
2120		2189
		2190	sub changed { }
		2191
2121	sub set_range {	2192	sub set_range {
2122	my ($self, $range) = @_;	2193	my ($self, $range) = @_;
2123		2194
2124	$self->{range} = $range;	2195	($range, $self->{range}) = ($self->{range}, $range);
2125		2196
2126	$self->update;	2197	$self->update
		2198	if "@$range" ne "@{$self->{range}}";
2127	}	2199	}
2128		2200
2129	sub set_value {	2201	sub set_value {
2130	my ($self, $value) = @_;	2202	my ($self, $value) = @_;
2131		2203
…		…
2150	}	2222	}
2151		2223
2152	sub size_request {	2224	sub size_request {
2153	my ($self) = @_;	2225	my ($self) = @_;
2154		2226
2155	my $w = $self->{req_w};	2227	($self->{req_w}, $self->{req_h})
2156	my $h = $self->{req_h};
2157
2158	$self->{vertical} ? ($h, $w) : ($w, $h)
2159	}	2228	}
2160		2229
2161	sub button_down {	2230	sub button_down {
2162	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
2163		2232
…		…
2313	$self->{fontsize} = $fontsize;	2382	$self->{fontsize} = $fontsize;
2314	$self->reflow;	2383	$self->reflow;
2315	}	2384	}
2316		2385
2317	sub size_allocate {	2386	sub size_allocate {
2318	my ($self, $w, $h) = @_;	2387	my ($self, $w, $h, $changed) = @_;
2319		2388
2320	$self->SUPER::size_allocate ($w, $h);	2389	$self->SUPER::size_allocate ($w, $h, $changed);
		2390
		2391	return unless $changed;
2321		2392
2322	$self->{layout}->set_font ($self->{font}) if $self->{font};	2393	$self->{layout}->set_font ($self->{font}) if $self->{font};
2323	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2324	$self->{layout}->set_width ($self->{children}[0]{w});	2395	$self->{layout}->set_width ($self->{children}[0]{w});
2325		2396
…		…
2514		2585
2515	sub new {	2586	sub new {
2516	my $class = shift;	2587	my $class = shift;
2517		2588
2518	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2519	state => 0,	2590	state => 0,
2520	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2521	@_	2592	@_
2522	);	2593	);
2523		2594
2524	if ($self->{state}) {
2525	$self->{state} = 0;
2526	$self->toggle_flopper;
2527	}
2528
2529	$self	2595	$self
2530	}	2596	}
2531		2597
2532	sub toggle_flopper {	2598	sub toggle_flopper {
2533	my ($self) = @_;	2599	my ($self) = @_;
2534		2600
2535	# TODO: use animation	2601	$self->{other}->toggle_visibility;
2536	if ($self->{state} = !$self->{state}) {
2537	$CFClient::UI::ROOT->add ($self->{other});
2538	$self->{other}->move ($self->coord2global (0, $self->{h}));
2539	$self->_emit ("open");
2540	} else {
2541	$CFClient::UI::ROOT->remove ($self->{other});
2542	$self->_emit ("close");
2543	}
2544
2545	$self->_emit (changed => $self->{state});
2546	}	2602	}
2547		2603
2548	#############################################################################	2604	#############################################################################
2549		2605
2550	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2582		2638
2583	($w + 4, $h + 4)	2639	($w + 4, $h + 4)
2584	}	2640	}
2585		2641
2586	sub size_allocate {	2642	sub size_allocate {
2587	my ($self, $w, $h) = @_;	2643	my ($self, $w, $h, $changed) = @_;
2588		2644
		2645	return unless $changed;
		2646
2589	$self->SUPER::size_allocate ($w - 4, $h - 4);	2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2648	}
		2649
		2650	sub visibility_change {
		2651	my ($self, $visible) = @_;
		2652
		2653	return unless $visible;
		2654
		2655	$self->{root}->on_post_alloc ("move_$self" => sub {
		2656	my $widget = $self->{owner}
		2657	or return;
		2658
		2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2660
		2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2662	if $x + $self->{w} > $::WIDTH;
		2663
		2664	$self->move_abs ($x, $y);
		2665	});
2590	}	2666	}
2591		2667
2592	sub _draw {	2668	sub _draw {
2593	my ($self) = @_;	2669	my ($self) = @_;
2594		2670
…		…
2611	glVertex $w, $h;	2687	glVertex $w, $h;
2612	glVertex $w, 0;	2688	glVertex $w, 0;
2613	glEnd;	2689	glEnd;
2614		2690
2615	glTranslate 2 - 0.375, 2 - 0.375;	2691	glTranslate 2 - 0.375, 2 - 0.375;
		2692
2616	$self->SUPER::_draw;	2693	$self->SUPER::_draw;
2617	}	2694	}
2618		2695
2619	#############################################################################	2696	#############################################################################
2620		2697
…		…
2626		2703
2627	sub new {	2704	sub new {
2628	my $class = shift;	2705	my $class = shift;
2629		2706
2630	my $self = $class->SUPER::new (	2707	my $self = $class->SUPER::new (
2631	aspect => 1,	2708	aspect => 1,
		2709	can_events => 0,
2632	@_,	2710	@_,
2633	);	2711	);
2634		2712
2635	if ($self->{anim} && $self->{animspeed}) {	2713	if ($self->{anim} && $self->{animspeed}) {
2636	Scalar::Util::weaken (my $widget = $self);	2714	Scalar::Util::weaken (my $widget = $self);
…		…
2695	$self->SUPER::DESTROY;	2773	$self->SUPER::DESTROY;
2696	}	2774	}
2697		2775
2698	#############################################################################	2776	#############################################################################
2699		2777
2700	package CFClient::UI::InventoryItem;	2778	package CFClient::UI::Inventory;
2701		2779
2702	our @ISA = CFClient::UI::HBox::;	2780	our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704	sub _item_to_desc {
2705	my ($item) = @_;
2706
2707	my $desc =
2708	$item->{nrof} < 2
2709	? $item->{name}
2710	: "$item->{nrof} × $item->{name_pl}";
2711
2712	$item->{flags} & Crossfire::Protocol::F_OPEN
2713	and $desc .= " (open)";
2714	$item->{flags} & Crossfire::Protocol::F_APPLIED
2715	and $desc .= " (applied)";
2716	$item->{flags} & Crossfire::Protocol::F_UNPAID
2717	and $desc .= " (unpaid)";
2718	$item->{flags} & Crossfire::Protocol::F_MAGIC
2719	and $desc .= " (magic)";
2720	$item->{flags} & Crossfire::Protocol::F_CURSED
2721	and $desc .= " (cursed)";
2722	$item->{flags} & Crossfire::Protocol::F_DAMNED
2723	and $desc .= " (damned)";
2724	$item->{flags} & Crossfire::Protocol::F_LOCKED
2725	and $desc .= " *";
2726
2727	$desc
2728	}
2729		2781
2730	sub new {	2782	sub new {
2731	my $class = shift;	2783	my $class = shift;
2732		2784
2733	my %args = @_;
2734
2735	my $item = delete $args{item};
2736
2737	my $desc = _item_to_desc ($item);
2738
2739	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2740	can_hover => 1,
2741	can_events => 1,
2742	tooltip => ((CFClient::UI::Label::escape $desc)
2743	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744	connect_button_down => sub {
2745	my ($self, $ev, $x, $y) = @_;
2746
2747	# todo: maybe put examine on 1? but should just be a tooltip :(
2748	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749	my $targ = $::CONN->{player}{tag};
2750
2751	if ($item->{container} == $::CONN->{player}{tag}) {
2752	$targ = $main::OPENCONT;
2753	}
2754
2755	$::CONN->send ("move $targ $item->{tag} 0");
2756	} elsif ($ev->{button} == 1) {
2757	$::CONN->send ("examine $item->{tag}");
2758	} elsif ($ev->{button} == 2) {
2759	$::CONN->send ("apply $item->{tag}");
2760	} elsif ($ev->{button} == 3) {
2761	my @menu_items = (
2762	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765	(
2766	$item->{flags} & Crossfire::Protocol::F_LOCKED
2767	? (
2768	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769	)
2770	: (
2771	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773	)
2774	),
2775	);
2776
2777	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778	}
2779
2780	1
2781	},
2782	%args
2783	);
2784
2785
2786	$self->add (new CFClient::UI::Face
2787	can_events => 0,
2788	face => $item->{face},
2789	anim => $item->{anim},
2790	animspeed => $item->{animspeed},
2791	);
2792
2793	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795	$self->{item} = $item;
2796
2797	$self->update_item;
2798
2799	$self
2800	}
2801
2802	sub update_item {
2803	my ($self) = @_;
2804
2805	my $desc = _item_to_desc ($self->{item});
2806
2807	$self->{name_lbl}->set_text ($desc);
2808	}
2809
2810	#############################################################################
2811
2812	package CFClient::UI::Inventory;
2813
2814	our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816	sub new {
2817	my $class = shift;
2818
2819	my $self = $class->SUPER::new (
2820	scrolled => (new CFClient::UI::Table),	2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821	@_,	2787	@_,
2822	);	2788	);
2823		2789
2824	$self	2790	$self
2825	}	2791	}
…		…
2835	or ($a->{name} cmp $b->{name})	2801	or ($a->{name} cmp $b->{name})
2836	} @$items;	2802	} @$items;
2837		2803
2838	$self->{real_items} = \@items;	2804	$self->{real_items} = \@items;
2839		2805
		2806	my $row = 0;
2840	for my $item (@items) {	2807	for my $item (@items) {
2841	$item->{item} = $item;	2808	CFClient::Item::update_widgets $item;
2842	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843	$item->update_item ();
2844	}
2845		2809
2846	my $i = 0;	2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2847	for (@items) {	2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2848	$self->{scrolled}->add (0, $i, $_);	2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2849	my $nrof = $_->{item}->{nrof} || 1;
2850	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851	}
2852		2813
2853	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2814	$row++;
2854	}	2815	}
2855
2856	sub size_request {
2857	my ($self) = @_;
2858	($self->{req_w}, $self->{req_h});
2859	}	2816	}
2860		2817
2861	#############################################################################	2818	#############################################################################
2862		2819
2863	package CFClient::UI::Menu;	2820	package CFClient::UI::Menu;
…		…
2905	# maybe save $GRAB? must be careful about events...	2862	# maybe save $GRAB? must be careful about events...
2906	$GRAB = $self;	2863	$GRAB = $self;
2907	$self->{button} = $ev->{button};	2864	$self->{button} = $ev->{button};
2908		2865
2909	$self->show;	2866	$self->show;
2910	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911	}	2868	}
2912		2869
2913	sub mouse_motion {	2870	sub mouse_motion {
2914	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2915		2872
…		…
2995	sub add {	2952	sub add {
2996	my ($self, $text, %arg) = @_;	2953	my ($self, $text, %arg) = @_;
2997		2954
2998	$text =~ s/^\s+//;	2955	$text =~ s/^\s+//;
2999	$text =~ s/\s+$//;	2956	$text =~ s/\s+$//;
		2957
		2958	return unless $text;
3000		2959
3001	my $timeout = time + ((delete $arg{timeout}) || 60);	2960	my $timeout = time + ((delete $arg{timeout}) || 60);
3002		2961
3003	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004		2963
…		…
3047	use CFClient::OpenGL;	3006	use CFClient::OpenGL;
3048		3007
3049	sub new {	3008	sub new {
3050	my $class = shift;	3009	my $class = shift;
3051		3010
3052	$class->SUPER::new (	3011	my $self = $class->SUPER::new (
		3012	visible => 1,
3053	@_,	3013	@_,
3054	)	3014	);
		3015
		3016	Scalar::Util::weaken ($self->{root} = $self);
		3017
		3018	$self
3055	}	3019	}
3056		3020
3057	sub configure {	3021	sub configure {
3058	my ($self, $x, $y, $w, $h) = @_;	3022	my ($self, $x, $y, $w, $h) = @_;
3059		3023
3060	$self->{w} = $w;	3024	$self->{w} = $w;
3061	$self->{h} = $h;	3025	$self->{h} = $h;
3062	}	3026	}
3063		3027
3064	sub check_size {	3028	sub reconfigure {
3065	my ($self) = @_;	3029	my ($self) = @_;
3066		3030
		3031	$self->SUPER::reconfigure;
		3032
3067	$self->size_allocate ($self->{w}, $self->{h})	3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3068	if $self->{w};	3034	if $self->{w};
3069	}	3035	}
3070		3036
3071	sub size_request {	3037	sub size_request {
3072	my ($self) = @_;	3038	my ($self) = @_;
3073		3039
3074	($self->{w}, $self->{h})	3040	($self->{w}, $self->{h})
3075	}	3041	}
3076		3042
		3043	sub _to_pixel {
		3044	my ($coord, $size, $max) = @_;
		3045
		3046	$coord =
		3047	$coord eq "center" ? ($max - $size) * 0.5
		3048	: $coord eq "max" ? $max
		3049	: $coord;
		3050
		3051	$coord = 0 if $coord < 0;
		3052	$coord = $max - $size if $coord > $max - $size;
		3053
		3054	int $coord + 0.5
		3055	}
		3056
3077	sub size_allocate {	3057	sub size_allocate {
3078	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h, $changed) = @_;
3079		3059
3080	for my $child ($self->children) {	3060	for my $child ($self->children) {
3081	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082		3062
3083	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3063	$X = $child->{force_x} if exists $child->{force_x};
3084	if exists $child->{req_x};	3064	$Y = $child->{force_y} if exists $child->{force_y};
3085		3065
3086	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3066	$X = _to_pixel $X, $W, $self->{w};
3087	if exists $child->{req_y};	3067	$Y = _to_pixel $Y, $H, $self->{h};
3088
3089	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091		3068
3092	$child->configure ($X, $Y, $W, $H);	3069	$child->configure ($X, $Y, $W, $H);
3093	}	3070	}
3094	}	3071	}
3095		3072
…		…
3106	}	3083	}
3107		3084
3108	sub update {	3085	sub update {
3109	my ($self) = @_;	3086	my ($self) = @_;
3110		3087
3111	$self->check_size;
3112	$::WANT_REFRESH++;	3088	$::WANT_REFRESH++;
3113	}	3089	}
3114		3090
3115	sub add {	3091	sub add {
3116	my ($self, @children) = @_;	3092	my ($self, @children) = @_;
3117		3093
3118	for (my @widgets = @children; my $w = pop @widgets; ) {
3119	push @widgets, $w->children;
3120	$w->{root} = $self;
3121	$w->{visible} = 1;
3122	}
3123
3124	for my $child (@children) {
3125	$child->{is_toplevel} = 1;	3094	$_->{is_toplevel} = 1
3126		3095	for @children;
3127	# integerise window positions
3128	$child->{x} = int $child->{x};
3129	$child->{y} = int $child->{y};
3130	}
3131		3096
3132	$self->SUPER::add (@children);	3097	$self->SUPER::add (@children);
3133	}	3098	}
3134		3099
3135	sub remove {	3100	sub remove {
3136	my ($self, @children) = @_;	3101	my ($self, @children) = @_;
3137		3102
3138	$self->SUPER::remove (@children);	3103	$self->SUPER::remove (@children);
		3104
		3105	delete $self->{is_toplevel}
		3106	for @children;
3139		3107
3140	while (@children) {	3108	while (@children) {
3141	my $w = pop @children;	3109	my $w = pop @children;
3142	push @children, $w->children;	3110	push @children, $w->children;
3143	$w->set_invisible;	3111	$w->set_invisible;
…		…
3162	while ($self->{refresh_hook}) {	3130	while ($self->{refresh_hook}) {
3163	$_->()	3131	$_->()
3164	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{refresh_hook}};
3165	}	3133	}
3166		3134
3167	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3168	my @queue = ([], []);	3136	my @queue;
3169		3137
3170	for (;;) {	3138	while () {
3171	if ($self->{check_size}) {	3139	if ($self->{realloc}) {
3172	# heuristic: check containers last	3140	#TODO use array-of-depth approach
3173	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3141
3174	for values %{delete $self->{check_size}}	3142	@queue = sort { $a->{visible} <=> $b->{visible} }
		3143	@queue, values %{delete $self->{realloc}};
3175	}	3144	}
3176		3145
3177	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3146	my $widget = pop @queue || last;
3178		3147
3179	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3148	$widget->{visible} or last; # do not resize invisible widgets
3180	? @$widget{qw(user_w user_h)}	3149
3181	: $widget->size_request;	3150	my ($w, $h) = $widget->size_request;
3182		3151
3183	if (delete $widget->{force_alloc}	3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3184	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3185	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3154
3186		3155	$w = $widget->{force_w} if exists $widget->{force_w};
		3156	$h = $widget->{force_h} if exists $widget->{force_h};
		3157
3187	$widget->{req_w} = $w;	3158	$widget->{req_w} = $w;
3188	$widget->{req_h} = $h;	3159	$widget->{req_h} = $h;
3189		3160
3190	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3191		3162
3192	$widget->{parent}->check_size	3163	push @queue, $widget->{parent}
3193	if $widget->{parent};	3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3194	}
3195	}	3165	}
3196	}	3166	}
3197		3167
3198	while ($self->{size_alloc}) {	3168	while (my $size_alloc = delete $self->{size_alloc}) {
3199	for (values %{delete $self->{size_alloc}}) {	3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3200	my ($widget, $w, $h) = @$_;	3170	values %$size_alloc;
		3171
		3172	while () {
		3173	my ($widget, $w, $h) = @{ pop @queue or last };
		3174
		3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3201		3177
3202	$w = 0 if $w < 0;	3178	$w = 0 if $w < 0;
3203	$h = 0 if $h < 0;	3179	$h = 0 if $h < 0;
3204		3180
		3181	$w = int $w + 0.5;
		3182	$h = int $h + 0.5;
		3183
		3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3185
3205	$widget->{w} = $w;	3186	$widget->{w} = $w;
3206	$widget->{h} = $h;	3187	$widget->{h} = $h;
		3188
3207	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h, $changed);
3208	}	3190	}
3209	}	3191	}
3210		3192
3211	while ($self->{post_alloc_hook}) {	3193	while ($self->{post_alloc_hook}) {
3212	$_->()	3194	$_->()

Diff Legend

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