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.227 by root, Wed May 24 03:29:20 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 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	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
35		55
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;	57	if $x + $TOOLTIP->{w} > $::WIDTH;
38		58
39	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;	60	$TOOLTIP->realloc;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	176	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	177	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	178	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	179	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	180	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	181	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166	}	182	}
167
168	$widget->reconfigure;
169	}	183	}
		184
		185	reconfigure_widgets;
170	}	186	}
171		187
172	#############################################################################	188	#############################################################################
173		189
174	package CFClient::UI::Base;	190	package CFClient::UI::Base;
…		…
187	can_events => 1,	203	can_events => 1,
188	@_	204	@_
189	}, $class;	205	}, $class;
190		206
191	for (keys %$self) {	207	for (keys %$self) {
192	if (/^connect_(.*)$/) {	208	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	209	$self->connect ($1 => delete $self->{$_});
194	}	210	}
195	}	211	}
196		212
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		214
		215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		216	$self->{req_x} = $layout->{x} * $::WIDTH;
		217	$self->{req_y} = $layout->{y} * $::HEIGHT;
		218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		220	}
		221
199	$self	222	$self
200	}	223	}
201		224
202	sub destroy {	225	sub destroy {
203	my ($self) = @_;	226	my ($self) = @_;
…		…
206	%$self = ();	229	%$self = ();
207	}	230	}
208		231
209	sub show {	232	sub show {
210	my ($self) = @_;	233	my ($self) = @_;
		234
211	return if $self->{parent};	235	return if $self->{parent};
212		236
213	$CFClient::UI::ROOT->add ($self);	237	$CFClient::UI::ROOT->add ($self);
214	}	238	}
215		239
216	sub show_centered {	240	sub center {
217	my ($self) = @_;	241	my ($self) = @_;
218	return if $self->{parent};
219
220	$self->show;
221		242
222	$CFClient::UI::ROOT->on_post_alloc (	243	$CFClient::UI::ROOT->on_post_alloc (
223	"centered $self" => sub {	244	"center_$self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225	},	246	},
226	);	247	);
227	}
228		248
229	sub hide {	249	$self->update;
		250	}
		251
		252	sub set_visible {
230	my ($self) = @_;	253	my ($self) = @_;
		254
		255	return if $self->{visible};
		256
		257	$self->{root} = $self->{parent}{root};
		258	$self->{visible} = $self->{parent}{visible} + 1;
		259
		260	$self->emit (visibility_change => 1);
		261
		262	$self->realloc unless exists $self->{req_w};
		263
		264	$_->set_visible for $self->children;
		265	}
		266
		267	sub set_invisible {
		268	my ($self) = @_;
		269
		270	return unless $self->{visible};
		271
		272	$_->set_invisible for $self->children;
		273
		274	delete $self->{root};
		275	delete $self->{visible};
231		276
232	undef $GRAB if $GRAB == $self;	277	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	278	undef $HOVER if $HOVER == $self;
		279
		280	CFClient::UI::check_tooltip
		281	if $TOOLTIP->{owner} == $self;
		282
		283	$self->focus_out;
		284
		285	$self->emit (visibility_change => 0);
		286	}
		287
		288	sub set_visibility {
		289	my ($self, $visible) = @_;
		290
		291	return if $self->{visible} == $visible;
		292
		293	$visible ? $self->hide
		294	: $self->show;
		295	}
		296
		297	sub toggle_visibility {
		298	my ($self) = @_;
		299
		300	$self->{visible}
		301	? $self->hide
		302	: $self->show;
		303	}
		304
		305	sub hide {
		306	my ($self) = @_;
		307
		308	$self->set_invisible;
234		309
235	$self->{parent}->remove ($self)	310	$self->{parent}->remove ($self)
236	if $self->{parent};	311	if $self->{parent};
237	}	312	}
238		313
…		…
247	}	322	}
248		323
249	sub set_size {	324	sub set_size {
250	my ($self, $w, $h) = @_;	325	my ($self, $w, $h) = @_;
251		326
252	$self->{user_w} = $w;	327	$self->{def_w} = $w;
253	$self->{user_h} = $h;	328	$self->{def_h} = $h;
254		329
255	$self->check_size;	330	$self->realloc;
256	}	331	}
257		332
258	sub size_request {	333	sub size_request {
259	require Carp;	334	require Carp;
260	Carp::confess "size_request is abstract";	335	Carp::confess "size_request is abstract";
…		…
280	$self->{y} = $y;	355	$self->{y} = $y;
281	$self->update;	356	$self->update;
282	}	357	}
283		358
284	if ($self->{w} != $w || $self->{h} != $h) {	359	if ($self->{w} != $w || $self->{h} != $h) {
		360	return unless $self->{visible};
		361
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286	}	363	}
287	}	364	}
288		365
289	sub size_allocate {	366	sub size_allocate {
290	# nothing to be done	367	# nothing to be done
291	}	368	}
292		369
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	370	sub children {
301	}	371	}
302		372
303	sub set_max_size {	373	sub set_max_size {
304	my ($self, $w, $h) = @_;	374	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	377	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	378	}
309		379
310	sub set_tooltip {	380	sub set_tooltip {
311	my ($self, $tooltip) = @_;	381	my ($self, $tooltip) = @_;
		382
		383	$tooltip =~ s/^\s+//;
		384	$tooltip =~ s/\s+$//;
		385
		386	return if $self->{tooltip} eq $tooltip;
312		387
313	$self->{tooltip} = $tooltip;	388	$self->{tooltip} = $tooltip;
314		389
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	390	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	391	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	413	return if $FOCUS == $self;
339	return unless $self->{can_focus};	414	return unless $self->{can_focus};
340		415
341	my $focus = $FOCUS; $FOCUS = $self;	416	my $focus = $FOCUS; $FOCUS = $self;
342		417
343	$self->emit (focus_in => $focus);	418	$self->_emit (focus_in => $focus);
344		419
345	$focus->update if $focus;	420	$focus->update if $focus;
346	$FOCUS->update;	421	$FOCUS->update;
347	}	422	}
348		423
…		…
351		426
352	return unless $FOCUS == $self;	427	return unless $FOCUS == $self;
353		428
354	my $focus = $FOCUS; undef $FOCUS;	429	my $focus = $FOCUS; undef $FOCUS;
355		430
356	$self->emit (focus_out => $focus);	431	$self->_emit (focus_out => $focus);
357		432
358	$focus->update if $focus; #?	433	$focus->update if $focus; #?
		434
		435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		436	unless $FOCUS;
359	}	437	}
360		438
361	sub mouse_motion { }	439	sub mouse_motion { }
362	sub button_up { }	440	sub button_up { }
363	sub key_down { }	441	sub key_down { }
364	sub key_up { }	442	sub key_up { }
365		443
366	sub button_down {	444	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	445	my ($self, $ev, $x, $y) = @_;
368		446
369	$self->focus_in;	447	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		455
		456	sub find_widget {
		457	my ($self, $x, $y) = @_;
		458
		459	return () unless $self->{can_events};
		460
		461	return $self
		462	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		463	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		464
		465	()
		466	}
		467
		468	sub set_parent {
		469	my ($self, $parent) = @_;
		470
		471	Scalar::Util::weaken ($self->{parent} = $parent);
		472
		473	$self->set_visible if $parent->{visible};
		474
		475	$self->realloc;
		476	}
		477
		478	sub connect {
		479	my ($self, $signal, $cb) = @_;
		480
		481	push @{ $self->{signal_cb}{$signal} }, $cb;
		482	}
		483
		484	sub _emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		488	}
		489
		490	sub emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	$self->_emit ($signal, @args)
		494	|| $self->$signal (@args);
		495	}
		496
		497	sub visibility_change {
		498	#my ($self, $visible) = @_;
		499	}
		500
		501	sub realloc {
		502	my ($self) = @_;
		503
		504	return unless $self->{visible};
		505
		506	return if $self->{root}{realloc}{$self};
		507
		508	$self->{root}{realloc}{$self} = $self;
		509	$self->{root}->update;
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
377		518
378	sub draw {	519	sub draw {
379	my ($self) = @_;	520	my ($self) = @_;
380		521
381	return unless $self->{h} && $self->{w};	522	return unless $self->{h} && $self->{w};
…		…
403	if ($ENV{PCLIENT_DEBUG}) {	544	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;	545	glPushMatrix;
405	glColor 1, 1, 0, 1;	546	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	548	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	549	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	550	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	551	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	552	glVertex 0 , $self->{h} - 1;
412	glEnd;	553	glEnd;
413	glPopMatrix;	554	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	555	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	556	}
416	}	557	}
417		558
418	sub _draw {	559	sub _draw {
419	my ($self) = @_;	560	my ($self) = @_;
420		561
421	warn "no draw defined for $self\n";	562	warn "no draw defined for $self\n";
422	}
423
424	sub find_widget {
425	my ($self, $x, $y) = @_;
426
427	return () unless $self->{can_events};
428
429	return $self
430	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433	()
434	}
435
436	sub set_parent {
437	my ($self, $parent) = @_;
438
439	Scalar::Util::weaken ($self->{parent} = $parent);
440
441	# TODO: req_w _does_change after ->reconfigure
442	$self->check_size
443	unless exists $self->{req_w};
444
445	$self->show;
446	}
447
448	sub check_size {
449	my ($self, $forced) = @_;
450
451	$self->{force_alloc} = 1 if $forced;
452	$CFClient::UI::ROOT->{check_size}{$self} = $self;
453	}
454
455	sub update {
456	my ($self) = @_;
457
458	$self->{parent}->update
459	if $self->{parent};
460	}
461
462	sub connect {
463	my ($self, $signal, $cb) = @_;
464
465	push @{ $self->{signal_cb}{$signal} }, $cb;
466	}
467
468	sub emit {
469	my ($self, $signal, @args) = @_;
470
471	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472	}	563	}
473		564
474	sub DESTROY {	565	sub DESTROY {
475	my ($self) = @_;	566	my ($self) = @_;
476		567
…		…
573	$self->{children} = [	664	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	665	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	666	@{$self->{children}}, @widgets
576	];	667	];
577		668
578	$self->check_size (1);	669	$self->realloc;
579	$self->update;
580	}	670	}
581		671
582	sub children {	672	sub children {
583	@{ $_[0]{children} }	673	@{ $_[0]{children} }
584	}	674	}
…		…
589	delete $child->{parent};	679	delete $child->{parent};
590	$child->hide;	680	$child->hide;
591		681
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	682	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		683
594	$self->check_size;	684	$self->realloc;
595	$self->update;
596	}	685	}
597		686
598	sub clear {	687	sub clear {
599	my ($self) = @_;	688	my ($self) = @_;
600		689
…		…
604	for (@$children) {	693	for (@$children) {
605	delete $_->{parent};	694	delete $_->{parent};
606	$_->hide;	695	$_->hide;
607	}	696	}
608		697
609	$self->check_size;	698	$self->realloc;
610	$self->update;
611	}	699	}
612		700
613	sub find_widget {	701	sub find_widget {
614	my ($self, $x, $y) = @_;	702	my ($self, $x, $y) = @_;
615		703
…		…
668	sub size_request {	756	sub size_request {
669	$_[0]{children}[0]->size_request	757	$_[0]{children}[0]->size_request
670	}	758	}
671		759
672	sub size_allocate {	760	sub size_allocate {
673	my ($self, $w, $h) = @_;	761	my ($self, $w, $h, $changed) = @_;
674		762
675	$self->{children}[0]->configure (0, 0, $w, $h);	763	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	764	}
677		765
678	#############################################################################	766	#############################################################################
…		…
695	$ROOT->on_post_alloc ($self => sub { $self->render_child });	783	$ROOT->on_post_alloc ($self => sub { $self->render_child });
696	$self->SUPER::update;	784	$self->SUPER::update;
697	}	785	}
698		786
699	sub size_allocate {	787	sub size_allocate {
700	my ($self, $w, $h) = @_;	788	my ($self, $w, $h, $changed) = @_;
701		789
702	$self->SUPER::size_allocate ($w, $h);	790	$self->SUPER::size_allocate ($w, $h, $changed);
703	$self->update;	791	$self->update
		792	if $changed;
704	}	793	}
705		794
706	sub _render {	795	sub _render {
707	$_[0]{children}[0]->draw;	796	$_[0]{children}[0]->draw;
708	}	797	}
…		…
739		828
740	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
741		830
742	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
743		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
744	sub size_request {	843	sub size_request {
745	my ($self) = @_;	844	my ($self) = @_;
746		845
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748		847
749	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
750	}	852	}
751		853
752	sub size_allocate {	854	sub size_allocate {
753	my ($self, $w, $h) = @_;	855	my ($self, $w, $h, $changed) = @_;
754		856
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756	# $w = $self->{w};	858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
757	$self->child->configure (0, 0, $cw, $ch);	860	$self->child->configure (0, 0, $w, $h);
758	$self->update;	861	$self->update;
759	}	862	}
760		863
761	sub set_offset {	864	sub set_offset {
762	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
813	my $class = shift;	916	my $class = shift;
814		917
815	my $self;	918	my $self;
816		919
817	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
818	vertical => 1,	921	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	923	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
822	},	925	},
823	;	926	;
824		927
825	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	929	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
831	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});	935	$self->add ($self->{vp});
833	$self->add ($self->{slider});	936	$self->add ($self->{slider});
834		937
835	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h, $changed) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h, $changed);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	958	}
837		959
838	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	961	# update viewport offset on scroll
840		962
…		…
891	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1014
893	sub new {	1015	sub new {
894	my $class = shift;	1016	my $class = shift;
895		1017
896	# TODO: user_x, user_y, overwrite moveto?
897
898	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1021	border => 0.6,
902	toplevel => 1,	1022	is_toplevel => 1,
903	can_events => 1,	1023	can_events => 1,
904	@_	1024	@_
905	);	1025	);
906		1026
907	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
908	align => 0,	1028	align => 0,
…		…
927	$h + $self->border * 2,	1047	$h + $self->border * 2,
928	)	1048	)
929	}	1049	}
930		1050
931	sub size_allocate {	1051	sub size_allocate {
932	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h, $changed) = @_;
		1053
		1054	return unless $changed;
933		1055
934	$h -= List::Util::max 0, $self->border * 2;	1056	$h -= List::Util::max 0, $self->border * 2;
935	$w -= List::Util::max 0, $self->border * 2;	1057	$w -= List::Util::max 0, $self->border * 2;
936		1058
937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
961	my ($ev, $x, $y) = @_;	1083	my ($ev, $x, $y) = @_;
962		1084
963	my $dx = $ev->{x} - $ox;	1085	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1086	my $dy = $ev->{y} - $oy;
965		1087
		1088	$self->{user_x} = $wx + $dx * $mx;
		1089	$self->{user_y} = $wy + $dy * $my;
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1092	$self->move ($self->{user_x}, $self->{user_y});
969	$self->check_size;	1093	$self->realloc;
970	};	1094	};
971		1095
972	} elsif ($lr ^ $td) {	1096	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1098	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1100	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
978		1102
979	($x, $y) = ($ev->{x}, $ev->{y});	1103	($x, $y) = ($ev->{x}, $ev->{y});
980		1104
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1105	$self->{user_x} = $bx + $x - $ox;
		1106	$self->{user_y} = $by + $y - $oy;
		1107
		1108	$self->move ($self->{user_x}, $self->{user_y});
982	$self->update;	1109	$self->realloc;
983	};	1110	};
984	}	1111	}
985	}	1112	}
986		1113
987	sub button_up {	1114	sub button_up {
…		…
1048	sub new {	1175	sub new {
1049	my $class = shift;	1176	my $class = shift;
1050		1177
1051	$class->SUPER::new (	1178	$class->SUPER::new (
1052	col_expand => [],	1179	col_expand => [],
1053	@_	1180	@_,
1054	)	1181	)
		1182	}
		1183
		1184	sub children {
		1185	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1186	}
1056		1187
1057	sub add {	1188	sub add {
1058	my ($self, $x, $y, $child) = @_;	1189	my ($self, $x, $y, $child) = @_;
1059		1190
1060	$child->set_parent ($self);	1191	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1192	$self->{children}[$y][$x] = $child;
1062		1193
1063	$child->check_size;	1194	$self->realloc;
1064	}	1195	}
1065		1196
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# TODO: move to container class maybe? send childs a signal on removal?	1197	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1198	sub clear {
1072	my ($self) = @_;	1199	my ($self) = @_;
1073		1200
1074	my @children = $self->children;	1201	my @children = $self->children;
1075	delete $self->{children};	1202	delete $self->{children};
…		…
1077	for (@children) {	1204	for (@children) {
1078	delete $_->{parent};	1205	delete $_->{parent};
1079	$_->hide;	1206	$_->hide;
1080	}	1207	}
1081		1208
1082	$self->update;	1209	$self->realloc;
1083	}	1210	}
1084		1211
1085	sub get_wh {	1212	sub get_wh {
1086	my ($self) = @_;	1213	my ($self) = @_;
1087		1214
…		…
1114	(sum @$hs),	1241	(sum @$hs),
1115	)	1242	)
1116	}	1243	}
1117		1244
1118	sub size_allocate {	1245	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h, $changed) = @_;
1120		1247
1121	my ($ws, $hs) = $self->get_wh;	1248	my ($ws, $hs) = $self->get_wh;
1122		1249
1123	my $req_w = sum @$ws;	1250	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1251	my $req_h = (sum @$hs) || 1;
1125		1252
1126	# TODO: nicer code && do row_expand	1253	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1254	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1255	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1256	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1310	}
1184	}	1311	}
1185		1312
1186	#############################################################################	1313	#############################################################################
1187		1314
		1315	package CFClient::UI::Box;
		1316
		1317	our @ISA = CFClient::UI::Container::;
		1318
		1319	sub size_request {
		1320	my ($self) = @_;
		1321
		1322	$self->{vertical}
		1323	? (
		1324	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1325	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1326	)
		1327	: (
		1328	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	}
		1332
		1333	sub size_allocate {
		1334	my ($self, $w, $h, $changed) = @_;
		1335
		1336	my $space = $self->{vertical} ? $h : $w;
		1337	my $children = $self->{children};
		1338
		1339	my @req;
		1340
		1341	if ($self->{homogeneous}) {
		1342	@req = ($space / (@$children || 1)) x @$children;
		1343	} else {
		1344	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1345	my $req = List::Util::sum @req;
		1346
		1347	if ($req > $space) {
		1348	# ah well, not enough space
		1349	$_ *= $space / $req for @req;
		1350	} else {
		1351	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1352
		1353	$space = ($space - $req) / $expand; # remaining space to give away
		1354
		1355	$req[$_] += $space * $children->[$_]{expand}
		1356	for 0 .. $#$children;
		1357	}
		1358	}
		1359
		1360	CFClient::UI::harmonize \@req;
		1361
		1362	my $pos = 0;
		1363	for (0 .. $#$children) {
		1364	my $alloc = $req[$_];
		1365	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1366
		1367	$pos += $alloc;
		1368	}
		1369
		1370	1
		1371	}
		1372
		1373	#############################################################################
		1374
1188	package CFClient::UI::HBox;	1375	package CFClient::UI::HBox;
1189		1376
1190	# TODO: wrap into common Box base class
1191
1192	our @ISA = CFClient::UI::Container::;	1377	our @ISA = CFClient::UI::Box::;
1193		1378
1194	sub size_request {	1379	sub new {
1195	my ($self) = @_;	1380	my $class = shift;
1196		1381
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1382	$class->SUPER::new (
1198		1383	vertical => 0,
1199	(	1384	@_,
1200	(List::Util::sum map $_->[0], @alloc),
1201	(List::Util::max map $_->[1], @alloc),
1202	)	1385	)
1203	}	1386	}
1204		1387
1205	sub size_allocate {
1206	my ($self, $w, $h) = @_;
1207
1208	($h, $w) = ($w, $h);
1209
1210	my $children = $self->{children};
1211
1212	my @h = map $_->{req_w}, @$children;
1213
1214	my $req_h = List::Util::sum @h;
1215
1216	if ($req_h > $h) {
1217	# ah well, not enough space
1218	$_ *= $h / $req_h for @h;
1219	} else {
1220	my $exp = List::Util::sum map $_->{expand}, @$children;
1221	$exp ||= 1;
1222
1223	for (0 .. $#$children) {
1224	my $child = $children->[$_];
1225
1226	my $alloc_h = $h[$_];
1227	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1228	$h[$_] = $alloc_h;
1229	}
1230	}
1231
1232	CFClient::UI::harmonize \@h;
1233
1234	my $y = 0;
1235	for (0 .. $#$children) {
1236	my $child = $children->[$_];
1237	my $h = $h[$_];
1238	$child->configure ($y, 0, $h, $w);
1239
1240	$y += $h;
1241	}
1242
1243	1
1244	}
1245
1246	#############################################################################	1388	#############################################################################
1247		1389
1248	package CFClient::UI::VBox;	1390	package CFClient::UI::VBox;
1249		1391
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Box::;
1253		1393
1254	sub size_request {	1394	sub new {
1255	my ($self) = @_;	1395	my $class = shift;
1256		1396
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$class->SUPER::new (
1258		1398	vertical => 1,
1259	(	1399	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1400	)
1263	}
1264
1265	sub size_allocate {
1266	my ($self, $w, $h) = @_;
1267
1268	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1270	my $children = $self->{children};
1271
1272	my @h = map $_->{req_h}, @$children;
1273
1274	my $req_h = List::Util::sum @h;
1275
1276	if ($req_h > $h) {
1277	# ah well, not enough space
1278	$_ *= $h / $req_h for @h;
1279	} else {
1280	my $exp = List::Util::sum map $_->{expand}, @$children;
1281	$exp ||= 1;
1282
1283	for (0 .. $#$children) {
1284	my $child = $children->[$_];
1285
1286	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1287	}
1288	}
1289
1290	CFClient::UI::harmonize \@h;
1291
1292	my $y = 0;
1293	for (0 .. $#$children) {
1294	my $child = $children->[$_];
1295	my $h = $h[$_];
1296	$child->configure (0, $y, $w, $h);
1297
1298	$y += $h;
1299	}
1300
1301	1
1302	}	1401	}
1303		1402
1304	#############################################################################	1403	#############################################################################
1305		1404
1306	package CFClient::UI::Label;	1405	package CFClient::UI::Label;
…		…
1369	$self->{text} = "T$text";	1468	$self->{text} = "T$text";
1370		1469
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1471	$self->{layout}->set_text ($text);
1373		1472
1374	$self->update;	1473	$self->realloc;
1375	$self->check_size;
1376	}	1474	}
1377		1475
1378	sub set_markup {	1476	sub set_markup {
1379	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1380		1478
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1483
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1388		1486
1389	$self->update;	1487	$self->realloc;
1390	$self->check_size;
1391	}	1488	}
1392		1489
1393	sub size_request {	1490	sub size_request {
1394	my ($self) = @_;	1491	my ($self) = @_;
1395		1492
…		…
1416	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1417	)	1514	)
1418	}	1515	}
1419		1516
1420	sub size_allocate {	1517	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1422		1519
1423	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1424	}	1522	}
1425		1523
1426	sub set_fontsize {	1524	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1428		1526
1429	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1528	delete $self->{texture};
1431		1529
1432	$self->update;	1530	$self->realloc;
1433	$self->check_size;
1434	}	1531	}
1435		1532
1436	sub _draw {	1533	sub _draw {
1437	my ($self) = @_;	1534	my ($self) = @_;
1438		1535
…		…
1510	$self->{text} = $text;	1607	$self->{text} = $text;
1511		1608
1512	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1514		1611
1515	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1516	}	1613	}
1517		1614
1518	sub set_text {	1615	sub set_text {
1519	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1520		1617
1521	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1619	$self->_set_text ($text);
1523	$self->update;	1620
1524	$self->check_size;	1621	$self->realloc;
1525	}	1622	}
1526		1623
1527	sub get_text {	1624	sub get_text {
1528	$_[0]{text}	1625	$_[0]{text}
1529	}	1626	}
…		…
1532	my ($self) = @_;	1629	my ($self) = @_;
1533		1630
1534	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1535		1632
1536	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1537	}
1538
1539	sub size_allocate {
1540	my ($self, $w, $h) = @_;
1541
1542	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543	}	1634	}
1544		1635
1545	sub key_down {	1636	sub key_down {
1546	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1547		1638
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1658	$self->_emit ('escape');
1568	} elsif ($uni) {	1659	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1570	}	1661	}
1571		1662
1572	$self->_set_text ($text);	1663	$self->_set_text ($text);
1573	$self->update;	1664
1574	$self->check_size;	1665	$self->realloc;
1575	}	1666	}
1576		1667
1577	sub focus_in {	1668	sub focus_in {
1578	my ($self) = @_;	1669	my ($self) = @_;
1579		1670
…		…
1659	if ($sym == 13) {	1750	if ($sym == 13) {
1660	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1665	$self->update;	1756	$self->update;
1666		1757
1667	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1717	can_events => 1,	1808	can_events => 1,
1718	@_	1809	@_
1719	)	1810	)
1720	}	1811	}
1721		1812
		1813	sub activate { }
		1814
1722	sub button_up {	1815	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1724		1817
		1818	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");
1728	}
1729	}	1821	}
1730		1822
1731	sub _draw {	1823	sub _draw {
1732	my ($self) = @_;	1824	my ($self) = @_;
1733		1825
…		…
1785	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1786		1878
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1791	}	1883	}
1792	}	1884	}
1793		1885
1794	sub _draw {	1886	sub _draw {
1795	my ($self) = @_;	1887	my ($self) = @_;
…		…
2085	$self->update;	2177	$self->update;
2086		2178
2087	$self	2179	$self
2088	}	2180	}
2089		2181
		2182	sub changed { }
		2183
2090	sub set_range {	2184	sub set_range {
2091	my ($self, $range) = @_;	2185	my ($self, $range) = @_;
2092		2186
2093	$self->{range} = $range;	2187	($range, $self->{range}) = ($self->{range}, $range);
2094		2188
2095	$self->update;	2189	$self->update
		2190	if "@$range" ne "@{$self->{range}}";
2096	}	2191	}
2097		2192
2098	sub set_value {	2193	sub set_value {
2099	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2100		2195
…		…
2111	if $unit;	2206	if $unit;
2112		2207
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2209
2115	if ($value != $old_value) {	2210	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2117	$self->update;	2212	$self->update;
2118	}	2213	}
2119	}	2214	}
2120		2215
2121	sub size_request {	2216	sub size_request {
…		…
2282	$self->{fontsize} = $fontsize;	2377	$self->{fontsize} = $fontsize;
2283	$self->reflow;	2378	$self->reflow;
2284	}	2379	}
2285		2380
2286	sub size_allocate {	2381	sub size_allocate {
2287	my ($self, $w, $h) = @_;	2382	my ($self, $w, $h, $changed) = @_;
2288		2383
2289	$self->SUPER::size_allocate ($w, $h);	2384	$self->SUPER::size_allocate ($w, $h, $changed);
		2385
		2386	return unless $changed;
2290		2387
2291	$self->{layout}->set_font ($self->{font}) if $self->{font};	2388	$self->{layout}->set_font ($self->{font}) if $self->{font};
2292	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293	$self->{layout}->set_width ($self->{children}[0]{w});	2390	$self->{layout}->set_width ($self->{children}[0]{w});
2294		2391
2295	$self->reflow;	2392	$self->reflow;
2296	}	2393	}
2297		2394
2298	sub text_height {	2395	sub text_size {
2299	my ($self, $text, $indent) = @_;	2396	my ($self, $text, $indent) = @_;
2300		2397
2301	my $layout = $self->{layout};	2398	my $layout = $self->{layout};
2302		2399
2303	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2400	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304	$layout->set_width ($self->{children}[0]{w} - $indent);	2401	$layout->set_width ($self->{children}[0]{w} - $indent);
2305	$layout->set_markup ($text);	2402	$layout->set_markup ($text);
2306		2403
2307	($layout->size)[1]	2404	$layout->size
2308	}	2405	}
2309		2406
2310	sub reflow {	2407	sub reflow {
2311	my ($self) = @_;	2408	my ($self) = @_;
2312		2409
…		…
2331		2428
2332	sub add_paragraph {	2429	sub add_paragraph {
2333	my ($self, $color, $text, $indent) = @_;	2430	my ($self, $color, $text, $indent) = @_;
2334		2431
2335	for my $line (split /\n/, $text) {	2432	for my $line (split /\n/, $text) {
2336	my $height = $self->text_height ($line);	2433	my ($w, $h) = $self->text_size ($line);
2337	$self->{height} += $height;	2434	$self->{height} += $h;
2338	push @{$self->{par}}, [$height, $color, $indent, $line];	2435	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339	}	2436	}
2340		2437
2341	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2438	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2342	}	2439	}
2343		2440
…		…
2349	return unless $self->{h} > 0;	2446	return unless $self->{h} > 0;
2350		2447
2351	delete $self->{texture};	2448	delete $self->{texture};
2352		2449
2353	$ROOT->on_post_alloc ($self, sub {	2450	$ROOT->on_post_alloc ($self, sub {
		2451	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2452
2354	if (delete $self->{need_reflow}) {	2453	if (delete $self->{need_reflow}) {
2355	my $height = 0;	2454	my $height = 0;
2356		2455
2357	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2456	my $layout = $self->{layout};
		2457
		2458	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2459
2358	for @{$self->{par}};	2460	for (@{$self->{par}}) {
		2461	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2462	$layout->set_width ($W - $_->[3]);
		2463	$layout->set_markup ($_->[4]);
		2464	my ($w, $h) = $layout->size;
		2465	$_->[0] = $w + $_->[3];
		2466	$_->[1] = $h;
		2467	}
		2468
		2469	$height += $_->[1];
		2470	}
2359		2471
2360	$self->{height} = $height;	2472	$self->{height} = $height;
2361		2473
2362	$self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);	2474	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2363		2475
2364	delete $self->{texture};	2476	delete $self->{texture};
2365	}	2477	}
2366		2478
2367	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2479	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2368	glClearColor 0.5, 0.5, 0.5, 0;	2480	glClearColor 0.5, 0.5, 0.5, 0;
2369	glClear GL_COLOR_BUFFER_BIT;	2481	glClear GL_COLOR_BUFFER_BIT;
2370		2482
2371	my $top = int $self->{children}[1]{range}[0];	2483	my $top = int $self->{children}[1]{range}[0];
2372		2484
2373	my $y0 = $top;	2485	my $y0 = $top;
2374	my $y1 = $top + $self->{h};	2486	my $y1 = $top + $H;
2375		2487
2376	my $y = 0;	2488	my $y = 0;
2377		2489
2378	my $layout = $self->{layout};	2490	my $layout = $self->{layout};
2379		2491
2380	$layout->set_font ($self->{font}) if $self->{font};	2492	$layout->set_font ($self->{font}) if $self->{font};
2381		2493
2382	glEnable GL_BLEND;	2494	glEnable GL_BLEND;
		2495	#TODO# not correct in windows where rgba is forced off
2383	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2496	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384		2497
2385	for my $par (@{$self->{par}}) {	2498	for my $par (@{$self->{par}}) {
2386	my $h = $par->[0];	2499	my $h = $par->[1];
2387		2500
2388	if ($y0 < $y + $h && $y < $y1) {	2501	if ($y0 < $y + $h && $y < $y1) {
2389	$layout->set_foreground (@{ $par->[1] });	2502	$layout->set_foreground (@{ $par->[2] });
2390	$layout->set_width ($self->{w} - $par->[2]);	2503	$layout->set_width ($W - $par->[3]);
2391	$layout->set_markup ($par->[3]);	2504	$layout->set_markup ($par->[4]);
2392		2505
2393	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2506	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2394		2507
2395	glRasterPos $par->[2], $y - $y0;	2508	glRasterPos $par->[3], $y - $y0;
2396	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2509	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2397	}	2510	}
2398		2511
2399	$y += $h;	2512	$y += $h;
2400	}	2513	}
…		…
2467		2580
2468	sub new {	2581	sub new {
2469	my $class = shift;	2582	my $class = shift;
2470		2583
2471	my $self = $class->SUPER::new (	2584	my $self = $class->SUPER::new (
2472	state => 0,	2585	state => 0,
2473	connect_activate => \&toggle_flopper,	2586	on_activate => \&toggle_flopper,
2474	@_	2587	@_
2475	);	2588	);
2476		2589
2477	if ($self->{state}) {
2478	$self->{state} = 0;
2479	$self->toggle_flopper;
2480	}
2481
2482	$self	2590	$self
2483	}	2591	}
2484		2592
2485	sub toggle_flopper {	2593	sub toggle_flopper {
2486	my ($self) = @_;	2594	my ($self) = @_;
2487		2595
2488	# TODO: use animation	2596	$self->{other}->toggle_visibility;
2489	if ($self->{state} = !$self->{state}) {
2490	$CFClient::UI::ROOT->add ($self->{other});
2491	$self->{other}->move ($self->coord2global (0, $self->{h}));
2492	$self->emit ("open");
2493	} else {
2494	$CFClient::UI::ROOT->remove ($self->{other});
2495	$self->emit ("close");
2496	}
2497
2498	$self->emit (changed => $self->{state});
2499	}	2597	}
2500		2598
2501	#############################################################################	2599	#############################################################################
2502		2600
2503	package CFClient::UI::Tooltip;	2601	package CFClient::UI::Tooltip;
…		…
2535		2633
2536	($w + 4, $h + 4)	2634	($w + 4, $h + 4)
2537	}	2635	}
2538		2636
2539	sub size_allocate {	2637	sub size_allocate {
2540	my ($self, $w, $h) = @_;	2638	my ($self, $w, $h, $changed) = @_;
2541		2639
		2640	return unless $changed;
		2641
2542	$self->SUPER::size_allocate ($w - 4, $h - 4);	2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2543	}	2643	}
2544		2644
2545	sub _draw {	2645	sub _draw {
2546	my ($self) = @_;	2646	my ($self) = @_;
2547		2647
…		…
2579		2679
2580	sub new {	2680	sub new {
2581	my $class = shift;	2681	my $class = shift;
2582		2682
2583	my $self = $class->SUPER::new (	2683	my $self = $class->SUPER::new (
2584	aspect => 1,	2684	aspect => 1,
		2685	can_events => 0,
2585	@_,	2686	@_,
2586	);	2687	);
2587		2688
2588	if ($self->{anim} && $self->{animspeed}) {	2689	if ($self->{anim} && $self->{animspeed}) {
2589	Scalar::Util::weaken (my $widget = $self);	2690	Scalar::Util::weaken (my $widget = $self);
…		…
2648	$self->SUPER::DESTROY;	2749	$self->SUPER::DESTROY;
2649	}	2750	}
2650		2751
2651	#############################################################################	2752	#############################################################################
2652		2753
2653	package CFClient::UI::InventoryItem;	2754	package CFClient::UI::Inventory;
2654		2755
2655	our @ISA = CFClient::UI::HBox::;	2756	our @ISA = CFClient::UI::ScrolledWindow::;
2656
2657	sub _item_to_desc {
2658	my ($item) = @_;
2659
2660	my $desc =
2661	$item->{nrof} < 2
2662	? $item->{name}
2663	: "$item->{nrof} × $item->{name_pl}";
2664
2665	$item->{flags} & Crossfire::Protocol::F_OPEN
2666	and $desc .= " (open)";
2667	$item->{flags} & Crossfire::Protocol::F_APPLIED
2668	and $desc .= " (applied)";
2669	$item->{flags} & Crossfire::Protocol::F_UNPAID
2670	and $desc .= " (unpaid)";
2671	$item->{flags} & Crossfire::Protocol::F_MAGIC
2672	and $desc .= " (magic)";
2673	$item->{flags} & Crossfire::Protocol::F_CURSED
2674	and $desc .= " (cursed)";
2675	$item->{flags} & Crossfire::Protocol::F_DAMNED
2676	and $desc .= " (damned)";
2677	$item->{flags} & Crossfire::Protocol::F_LOCKED
2678	and $desc .= " *";
2679
2680	$desc
2681	}
2682		2757
2683	sub new {	2758	sub new {
2684	my $class = shift;	2759	my $class = shift;
2685		2760
2686	my %args = @_;
2687
2688	my $item = delete $args{item};
2689
2690	my $desc = _item_to_desc ($item);
2691
2692	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2693	can_hover => 1,
2694	can_events => 1,
2695	tooltip => ((CFClient::UI::Label::escape $desc)
2696	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2697	connect_button_down => sub {
2698	my ($self, $ev, $x, $y) = @_;
2699
2700	# todo: maybe put examine on 1? but should just be a tooltip :(
2701	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2702	my $targ = $::CONN->{player}{tag};
2703
2704	if ($item->{container} == $::CONN->{player}{tag}) {
2705	$targ = $main::OPENCONT;
2706	}
2707
2708	$::CONN->send ("move $targ $item->{tag} 0");
2709	} elsif ($ev->{button} == 1) {
2710	$::CONN->send ("examine $item->{tag}");
2711	} elsif ($ev->{button} == 2) {
2712	$::CONN->send ("apply $item->{tag}");
2713	} elsif ($ev->{button} == 3) {
2714	my @menu_items = (
2715	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2716	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2717	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718	(
2719	$item->{flags} & Crossfire::Protocol::F_LOCKED
2720	? (
2721	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722	)
2723	: (
2724	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2725	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2726	)
2727	),
2728	);
2729
2730	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2731	}
2732
2733	1
2734	},
2735	%args
2736	);
2737
2738
2739	$self->add (new CFClient::UI::Face
2740	can_events => 0,
2741	face => $item->{face},
2742	anim => $item->{anim},
2743	animspeed => $item->{animspeed},
2744	);
2745
2746	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2747
2748	$self->{item} = $item;
2749
2750	$self->update_item;
2751
2752	$self
2753	}
2754
2755	sub update_item {
2756	my ($self) = @_;
2757
2758	my $desc = _item_to_desc ($self->{item});
2759
2760	$self->{name_lbl}->set_text ($desc);
2761	}
2762
2763	#############################################################################
2764
2765	package CFClient::UI::Inventory;
2766
2767	our @ISA = CFClient::UI::ScrolledWindow::;
2768
2769	sub new {
2770	my $class = shift;
2771
2772	my $self = $class->SUPER::new (
2773	scrolled => (new CFClient::UI::Table),	2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2774	@_,	2763	@_,
2775	);	2764	);
2776		2765
2777	$self	2766	$self
2778	}	2767	}
…		…
2788	or ($a->{name} cmp $b->{name})	2777	or ($a->{name} cmp $b->{name})
2789	} @$items;	2778	} @$items;
2790		2779
2791	$self->{real_items} = \@items;	2780	$self->{real_items} = \@items;
2792		2781
		2782	my $row = 0;
2793	for my $item (@items) {	2783	for my $item (@items) {
2794	$item->{item} = $item;	2784	CFClient::Item::update_widgets $item;
2795	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2796	$item->update_item ();
2797	}
2798		2785
2799	my $i = 0;	2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2800	for (@items) {	2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2801	$self->{scrolled}->add (0, $i, $_);	2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2802	my $nrof = $_->{item}->{nrof} || 1;
2803	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804	}
2805		2789
2806	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2790	$row++;
2807	}	2791	}
2808
2809	sub size_request {
2810	my ($self) = @_;
2811	($self->{req_w}, $self->{req_h});
2812	}	2792	}
2813		2793
2814	#############################################################################	2794	#############################################################################
2815		2795
2816	package CFClient::UI::Menu;	2796	package CFClient::UI::Menu;
…		…
2851		2831
2852	# popup given the event (must be a mouse button down event currently)	2832	# popup given the event (must be a mouse button down event currently)
2853	sub popup {	2833	sub popup {
2854	my ($self, $ev) = @_;	2834	my ($self, $ev) = @_;
2855		2835
2856	$self->emit ("popdown");	2836	$self->_emit ("popdown");
2857		2837
2858	# maybe save $GRAB? must be careful about events...	2838	# maybe save $GRAB? must be careful about events...
2859	$GRAB = $self;	2839	$GRAB = $self;
2860	$self->{button} = $ev->{button};	2840	$self->{button} = $ev->{button};
2861		2841
…		…
2876		2856
2877	if ($ev->{button} == $self->{button}) {	2857	if ($ev->{button} == $self->{button}) {
2878	undef $GRAB;	2858	undef $GRAB;
2879	$self->hide;	2859	$self->hide;
2880		2860
2881	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2882	$self->{hover}[1]->() if $self->{hover};	2862	$self->{hover}[1]->() if $self->{hover};
2883	}	2863	}
2884	}	2864	}
2885		2865
2886	#############################################################################	2866	#############################################################################
…		…
2948	sub add {	2928	sub add {
2949	my ($self, $text, %arg) = @_;	2929	my ($self, $text, %arg) = @_;
2950		2930
2951	$text =~ s/^\s+//;	2931	$text =~ s/^\s+//;
2952	$text =~ s/\s+$//;	2932	$text =~ s/\s+$//;
		2933
		2934	return unless $text;
2953		2935
2954	my $timeout = time + ((delete $arg{timeout}) || 60);	2936	my $timeout = time + ((delete $arg{timeout}) || 60);
2955		2937
2956	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2957		2939
…		…
3000	use CFClient::OpenGL;	2982	use CFClient::OpenGL;
3001		2983
3002	sub new {	2984	sub new {
3003	my $class = shift;	2985	my $class = shift;
3004		2986
3005	$class->SUPER::new (	2987	my $self = $class->SUPER::new (
		2988	visible => 1,
3006	@_,	2989	@_,
3007	)	2990	);
		2991
		2992	Scalar::Util::weaken ($self->{root} = $self);
		2993
		2994	$self
3008	}	2995	}
3009		2996
3010	sub configure {	2997	sub configure {
3011	my ($self, $x, $y, $w, $h) = @_;	2998	my ($self, $x, $y, $w, $h) = @_;
3012		2999
3013	$self->{w} = $w;	3000	$self->{w} = $w;
3014	$self->{h} = $h;	3001	$self->{h} = $h;
3015	}	3002	}
3016		3003
3017	sub check_size {	3004	sub reconfigure {
3018	my ($self) = @_;	3005	my ($self) = @_;
3019		3006
		3007	$self->SUPER::reconfigure;
		3008
3020	$self->size_allocate ($self->{w}, $self->{h})	3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3021	if $self->{w};	3010	if $self->{w};
3022	}	3011	}
3023		3012
3024	sub size_request {	3013	sub size_request {
3025	my ($self) = @_;	3014	my ($self) = @_;
3026		3015
3027	($self->{w}, $self->{h})	3016	($self->{w}, $self->{h})
3028	}	3017	}
3029		3018
3030	sub size_allocate {	3019	sub size_allocate {
3031	my ($self, $w, $h) = @_;	3020	my ($self, $w, $h, $changed) = @_;
3032
3033	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3034	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3035
3036	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3037	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3038		3021
3039	for my $child ($self->children) {	3022	for my $child ($self->children) {
3040	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3041		3024
3042	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3043	if exists $child->{req_x};	3026	if exists $child->{req_x};
3044		3027
3045	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3046	if exists $child->{req_y};	3029	if exists $child->{req_y};
3047		3030
		3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3032
3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050		3035
3051	$child->configure ($X, $Y, $W, $H);	3036	$child->configure ($X, $Y, $W, $H);
3052	}	3037	}
…		…
3065	}	3050	}
3066		3051
3067	sub update {	3052	sub update {
3068	my ($self) = @_;	3053	my ($self) = @_;
3069		3054
3070	$self->check_size;
3071	$::WANT_REFRESH++;	3055	$::WANT_REFRESH++;
3072	}	3056	}
3073		3057
3074	sub add {	3058	sub add {
3075	my ($self, @children) = @_;	3059	my ($self, @children) = @_;
3076		3060
3077	for my $child (@children) {	3061	for my $child (@children) {
3078	$child->{toplevel} = 1;	3062	$child->{is_toplevel} = 1;
3079		3063
3080	# integerise window positions	3064	# integerise window positions
3081	$child->{x} = int $child->{x};	3065	$child->{x} = int $child->{x};
3082	$child->{y} = int $child->{y};	3066	$child->{y} = int $child->{y};
3083	}	3067	}
3084		3068
3085	$self->SUPER::add (@children);	3069	$self->SUPER::add (@children);
		3070	}
		3071
		3072	sub remove {
		3073	my ($self, @children) = @_;
		3074
		3075	$self->SUPER::remove (@children);
3086		3076
3087	while (@children) {	3077	while (@children) {
3088	my $w = pop @children;	3078	my $w = pop @children;
3089	push @children, $w->children;	3079	push @children, $w->children;
3090	$w->{visible} = 1;	3080	$w->set_invisible;
3091	}
3092	}
3093
3094	sub remove {
3095	my ($self, @children) = @_;
3096
3097	$self->SUPER::remove (@children);
3098
3099	while (@children) {
3100	my $w = pop @children;
3101	push @children, $w->children;
3102	delete $w->{visible};
3103	}	3081	}
3104	}	3082	}
3105		3083
3106	sub on_refresh {	3084	sub on_refresh {
3107	my ($self, $id, $cb) = @_;	3085	my ($self, $id, $cb) = @_;
…		…
3121	while ($self->{refresh_hook}) {	3099	while ($self->{refresh_hook}) {
3122	$_->()	3100	$_->()
3123	for values %{delete $self->{refresh_hook}};	3101	for values %{delete $self->{refresh_hook}};
3124	}	3102	}
3125		3103
3126	if ($self->{check_size}) {	3104	if ($self->{realloc}) {
3127	my @queue = ([], []);	3105	my @queue;
3128		3106
3129	for (;;) {	3107	while () {
3130	if ($self->{check_size}) {	3108	if ($self->{realloc}) {
3131	# heuristic: check containers last	3109	#TODO use array-of-depth approach
3132	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3110
3133	for values %{delete $self->{check_size}}	3111	@queue = sort { $a->{visible} <=> $b->{visible} }
		3112	@queue, values %{delete $self->{realloc}};
3134	}	3113	}
3135		3114
3136	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3115	my $widget = pop @queue || last;
3137		3116
		3117	$widget->{visible} or last; # do not resize invisible widgets
		3118
3138	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3139	? @$widget{qw(user_w user_h)}	3120	? @$widget{qw(def_w def_h)}
3140	: $widget->size_request;	3121	: $widget->size_request;
3141		3122
3142	if (delete $widget->{force_alloc}
3143	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3144	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3145		3124
3146	$widget->{req_w} = $w;	3125	$widget->{req_w} = $w;
3147	$widget->{req_h} = $h;	3126	$widget->{req_h} = $h;
3148		3127
3149	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3150		3129
3151	$widget->{parent}->check_size	3130	push @queue, $widget->{parent}
3152	if $widget->{parent};	3131	if $widget->{parent};
3153	}
3154	}	3132	}
3155	}	3133	}
3156		3134
3157	while ($self->{size_alloc}) {	3135	while (my $size_alloc = delete $self->{size_alloc}) {
3158	for (values %{delete $self->{size_alloc}}) {	3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3159	my ($widget, $w, $h) = @$_;	3137	values %$size_alloc;
		3138
		3139	while () {
		3140	my ($widget, $w, $h) = @{ pop @queue or last };
3160		3141
3161	$w = 0 if $w < 0;	3142	$w = 0 if $w < 0;
3162	$h = 0 if $h < 0;	3143	$h = 0 if $h < 0;
3163		3144
3164	$widget->{w} = $w;	3145	$widget->{w} = $w;
3165	$widget->{h} = $h;	3146	$widget->{h} = $h;
3166	$widget->size_allocate ($w, $h);
3167	$widget->emit (size_allocate => $w, $h);	3147	$widget->emit (size_allocate => $w, $h, 1);
3168	}	3148	}
3169	}	3149	}
3170		3150
3171	while ($self->{post_alloc_hook}) {	3151	while ($self->{post_alloc_hook}) {
3172	$_->()	3152	$_->()

Diff Legend

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