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.228 by root, Wed May 24 03:52:54 2006 UTC vs.
Revision 1.255 by root, Mon May 29 02:01:56 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}) {
23		43
24	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
25	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
26		48
27	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
28		50
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		52
31	$TOOLTIP->set_tooltip_from ($widget);	53	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	54	$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	}	55	}
43		56
44	return;	57	return;
45	}	58	}
46	}	59	}
…		…
50	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
51	}	64	}
52		65
53	# class methods for events	66	# class methods for events
54	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	69	if $FOCUS;
57	}	70	}
58		71
59	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	74	if $FOCUS;
62	}	75	}
63		76
64	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	78	my ($ev) = @_;
…		…
74	check_tooltip;	87	check_tooltip;
75	}	88	}
76		89
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		91
79	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	94	}
84		95
85	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	97	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
88		99
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		101
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		103
93	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		106
98	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	109	$grab->update if $grab;
101	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		127
119	check_tooltip;	128	check_tooltip;
120	}	129	}
121		130
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	132	if $HOVER;
126	}	133	}
127		134
128	# convert position array to integers	135	# convert position array to integers
129	sub harmonize {	136	sub harmonize {
130	my ($vals) = @_;	137	my ($vals) = @_;
…		…
144		151
145	$_->update	152	$_->update
146	for @widgets;	153	for @widgets;
147	}	154	}
148		155
		156	sub reconfigure_widgets {
		157	# make a copy, otherwise C<for> complains about freed values.
		158	my @widgets = values %WIDGET;
		159
		160	$_->reconfigure
		161	for @widgets;
		162	}
		163
149	# call when resolution changes etc.	164	# call when resolution changes etc.
150	sub rescale_widgets {	165	sub rescale_widgets {
151	my ($sx, $sy) = @_;	166	my ($sx, $sy) = @_;
152		167
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	168	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	169	if ($widget->{is_toplevel}) {
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	170	$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};	171	$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};	172	$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};	173	$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};	174	$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};	175	$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	}	176	}
167
168	$widget->reconfigure;
169	}	177	}
		178
		179	reconfigure_widgets;
170	}	180	}
171		181
172	#############################################################################	182	#############################################################################
173		183
174	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
187	can_events => 1,	197	can_events => 1,
188	@_	198	@_
189	}, $class;	199	}, $class;
190		200
191	for (keys %$self) {	201	for (keys %$self) {
192	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
194	}	204	}
195	}	205	}
196		206
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
199	$self	216	$self
200	}	217	}
201		218
202	sub destroy {	219	sub destroy {
203	my ($self) = @_;	220	my ($self) = @_;
…		…
206	%$self = ();	223	%$self = ();
207	}	224	}
208		225
209	sub show {	226	sub show {
210	my ($self) = @_;	227	my ($self) = @_;
		228
211	return if $self->{parent};	229	return if $self->{parent};
212		230
213	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
214	}	232	}
215		233
216	sub show_centered {	234	sub center {
217	my ($self) = @_;	235	my ($self) = @_;
218	return if $self->{parent};
219
220	$self->show;
221		236
222	$CFClient::UI::ROOT->on_post_alloc (	237	$CFClient::UI::ROOT->on_post_alloc (
223	"centered $self" => sub {	238	"center_$self" => sub {
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
225	},	240	},
226	);	241	);
227	}
228		242
229	sub hide {	243	$self->update;
		244	}
		245
		246	sub set_visible {
230	my ($self) = @_;	247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
		259	}
		260
		261	sub set_invisible {
		262	my ($self) = @_;
		263
		264	return unless $self->{visible};
		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
		269	delete $self->{visible};
231		270
232	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	272	undef $HOVER if $HOVER == $self;
		273
		274	CFClient::UI::check_tooltip
		275	if $TOOLTIP->{owner} == $self;
		276
		277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub hide {
		300	my ($self) = @_;
		301
		302	$self->set_invisible;
234		303
235	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
236	if $self->{parent};	305	if $self->{parent};
237	}	306	}
238		307
…		…
247	}	316	}
248		317
249	sub set_size {	318	sub set_size {
250	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
251		320
252	$self->{user_w} = $w;	321	$self->{def_w} = $w;
253	$self->{user_h} = $h;	322	$self->{def_h} = $h;
254		323
255	$self->check_size;	324	$self->realloc;
256	}	325	}
257		326
258	sub size_request {	327	sub size_request {
259	require Carp;	328	require Carp;
260	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
280	$self->{y} = $y;	349	$self->{y} = $y;
281	$self->update;	350	$self->update;
282	}	351	}
283		352
284	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286	}	357	}
287	}	358	}
288		359
289	sub size_allocate {	360	sub size_allocate {
290	# nothing to be done	361	# nothing to be done
291	}	362	}
292		363
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	364	sub children {
301	}	365	}
302		366
303	sub set_max_size {	367	sub set_max_size {
304	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	372	}
309		373
310	sub set_tooltip {	374	sub set_tooltip {
311	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
312		381
313	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
314		383
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	407	return if $FOCUS == $self;
339	return unless $self->{can_focus};	408	return unless $self->{can_focus};
340		409
341	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
342		411
343	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
344		413
345	$focus->update if $focus;	414	$focus->update if $focus;
346	$FOCUS->update;	415	$FOCUS->update;
347	}	416	}
348		417
…		…
351		420
352	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
353		422
354	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
355		424
356	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
357		426
358	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
359	}	431	}
360		432
361	sub mouse_motion { }	433	sub mouse_motion { }
362	sub button_up { }	434	sub button_up { }
363	sub key_down { }	435	sub key_down { }
364	sub key_up { }	436	sub key_up { }
365		437
366	sub button_down {	438	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
368		440
369	$self->focus_in;	441	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
377		512
378	sub draw {	513	sub draw {
379	my ($self) = @_;	514	my ($self) = @_;
380		515
381	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
403	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
404	glPushMatrix;	539	glPushMatrix;
405	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	543	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
412	glEnd;	547	glEnd;
413	glPopMatrix;	548	glPopMatrix;
414	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415	}	550	}
416	}	551	}
417		552
418	sub _draw {	553	sub _draw {
419	my ($self) = @_;	554	my ($self) = @_;
420		555
421	warn "no draw defined for $self\n";	556	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	}	557	}
473		558
474	sub DESTROY {	559	sub DESTROY {
475	my ($self) = @_;	560	my ($self) = @_;
476		561
…		…
573	$self->{children} = [	658	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
576	];	661	];
577		662
578	$self->check_size (1);	663	$self->realloc;
579	$self->update;
580	}	664	}
581		665
582	sub children {	666	sub children {
583	@{ $_[0]{children} }	667	@{ $_[0]{children} }
584	}	668	}
…		…
589	delete $child->{parent};	673	delete $child->{parent};
590	$child->hide;	674	$child->hide;
591		675
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		677
594	$self->check_size;	678	$self->realloc;
595	$self->update;
596	}	679	}
597		680
598	sub clear {	681	sub clear {
599	my ($self) = @_;	682	my ($self) = @_;
600		683
…		…
604	for (@$children) {	687	for (@$children) {
605	delete $_->{parent};	688	delete $_->{parent};
606	$_->hide;	689	$_->hide;
607	}	690	}
608		691
609	$self->check_size;	692	$self->realloc;
610	$self->update;
611	}	693	}
612		694
613	sub find_widget {	695	sub find_widget {
614	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
615		697
…		…
668	sub size_request {	750	sub size_request {
669	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
670	}	752	}
671		753
672	sub size_allocate {	754	sub size_allocate {
673	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
674		756
675	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	758	}
677		759
678	#############################################################################	760	#############################################################################
…		…
695	$ROOT->on_post_alloc ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
696	$self->SUPER::update;	778	$self->SUPER::update;
697	}	779	}
698		780
699	sub size_allocate {	781	sub size_allocate {
700	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
701		783
702	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
703	$self->update;	785	$self->update
		786	if $changed;
704	}	787	}
705		788
706	sub _render {	789	sub _render {
707	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
708	}	791	}
…		…
739		822
740	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
741		824
742	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
743		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
744	sub size_request {	837	sub size_request {
745	my ($self) = @_;	838	my ($self) = @_;
746		839
747	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748		841
749	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
750	}	846	}
751		847
752	sub size_allocate {	848	sub size_allocate {
753	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
754		850
755	my ($cw, $ch) = @$self{qw(child_w child_h)};	851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756	# $w = $self->{w};	852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
757	$self->child->configure (0, 0, $cw, $ch);	854	$self->child->configure (0, 0, $w, $h);
758	$self->update;	855	$self->update;
759	}	856	}
760		857
761	sub set_offset {	858	sub set_offset {
762	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
813	my $class = shift;	910	my $class = shift;
814		911
815	my $self;	912	my $self;
816		913
817	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
818	vertical => 1,	915	vertical => 1,
819	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
820	connect_changed => sub {	917	on_changed => sub {
821	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
822	},	919	},
823	;	920	;
824		921
825	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
826	vp => (new CFClient::UI::ViewPort expand => 1),	923	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
831	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
832	$self->add ($self->{vp});	929	$self->add ($self->{vp});
833	$self->add ($self->{slider});	930	$self->add ($self->{slider});
834		931
835	$self	932	$self
		933	}
		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
		945	sub size_allocate {
		946	my ($self, $w, $h, $changed) = @_;
		947
		948	$self->SUPER::size_allocate ($w, $h, $changed);
		949
		950	my $child = $self->{vp}->child;
		951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836	}	952	}
837		953
838	#TODO# update range on size_allocate depending on child	954	#TODO# update range on size_allocate depending on child
839	# update viewport offset on scroll	955	# update viewport offset on scroll
840		956
…		…
884		1000
885	our @ISA = CFClient::UI::Bin::;	1001	our @ISA = CFClient::UI::Bin::;
886		1002
887	use CFClient::OpenGL;	1003	use CFClient::OpenGL;
888		1004
889	my @tex =	1005	my $bg =
		1006	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1007	mipmap => 1, wrap => 1;
		1008
		1009	my @border =
890	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
891	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1011	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
892		1012
893	sub new {	1013	sub new {
894	my $class = shift;	1014	my $class = shift;
895		1015
896	# TODO: user_x, user_y, overwrite moveto?
897
898	my $self = $class->SUPER::new (	1016	my $self = $class->SUPER::new (
899	bg => [1, 1, 1, 1],	1017	bg => [1, 1, 1, 1],
900	border_bg => [1, 1, 1, 1],	1018	border_bg => [1, 1, 1, 1],
901	border => 0.6,	1019	border => 0.6,
902	toplevel => 1,	1020	is_toplevel => 1,
903	can_events => 1,	1021	can_events => 1,
904	@_	1022	@_
905	);	1023	);
906		1024
907	$self->{title} &&= new CFClient::UI::Label	1025	$self->{title} &&= new CFClient::UI::Label
908	align => 0,	1026	align => 0,
…		…
927	$h + $self->border * 2,	1045	$h + $self->border * 2,
928	)	1046	)
929	}	1047	}
930		1048
931	sub size_allocate {	1049	sub size_allocate {
932	my ($self, $w, $h) = @_;	1050	my ($self, $w, $h, $changed) = @_;
		1051
		1052	return unless $changed;
933		1053
934	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
935	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
936		1056
937	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
961	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
962		1082
963	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
964	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
965		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
966	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
967	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
968	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
969	$self->check_size;	1091	$self->realloc;
970	};	1092	};
971		1093
972	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
973	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
974	my ($bx, $by) = ($self->{x}, $self->{y});	1096	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
976	$self->{motion} = sub {	1098	$self->{motion} = sub {
977	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
978		1100
979	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
980		1102
981	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
982	$self->update;	1107	$self->realloc;
983	};	1108	};
984	}	1109	}
985	}	1110	}
986		1111
987	sub button_up {	1112	sub button_up {
…		…
1006	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1007		1132
1008	my $border = $self->border;	1133	my $border = $self->border;
1009		1134
1010	glColor @{ $self->{border_bg} };	1135	glColor @{ $self->{border_bg} };
1011	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1136	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1012	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1137	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1013	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1138	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1014	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1139	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1015		1140
1016	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1017	my $bg = $tex[0];	1142	glColor @{ $self->{bg} };
1018		1143
1019	# TODO: repeat texture not scale	1144	# TODO: repeat texture not scale
		1145	# solve this better(?)
1020	my $rep_x = $cw / $bg->{w};	1146	$bg->{s} = $cw / $bg->{w};
1021	my $rep_y = $ch / $bg->{h};	1147	$bg->{t} = $ch / $bg->{h};
1022
1023	glColor @{ $self->{bg} };
1024
1025	$bg->{s} = $rep_x;
1026	$bg->{t} = $rep_y;
1027	$bg->{wrap_mode} = 1;
1028	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1148	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029	}	1149	}
1030		1150
1031	glDisable GL_TEXTURE_2D;	1151	glDisable GL_TEXTURE_2D;
1032		1152
…		…
1048	sub new {	1168	sub new {
1049	my $class = shift;	1169	my $class = shift;
1050		1170
1051	$class->SUPER::new (	1171	$class->SUPER::new (
1052	col_expand => [],	1172	col_expand => [],
1053	@_	1173	@_,
1054	)	1174	)
		1175	}
		1176
		1177	sub children {
		1178	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055	}	1179	}
1056		1180
1057	sub add {	1181	sub add {
1058	my ($self, $x, $y, $child) = @_;	1182	my ($self, $x, $y, $child) = @_;
1059		1183
1060	$child->set_parent ($self);	1184	$child->set_parent ($self);
1061	$self->{children}[$y][$x] = $child;	1185	$self->{children}[$y][$x] = $child;
1062		1186
1063	$child->check_size;	1187	$self->realloc;
1064	}	1188	}
1065		1189
1066	sub children {
1067	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068	}
1069
1070	# TODO: move to container class maybe? send childs a signal on removal?	1190	# TODO: move to container class maybe? send children a signal on removal?
1071	sub clear {	1191	sub clear {
1072	my ($self) = @_;	1192	my ($self) = @_;
1073		1193
1074	my @children = $self->children;	1194	my @children = $self->children;
1075	delete $self->{children};	1195	delete $self->{children};
…		…
1077	for (@children) {	1197	for (@children) {
1078	delete $_->{parent};	1198	delete $_->{parent};
1079	$_->hide;	1199	$_->hide;
1080	}	1200	}
1081		1201
1082	$self->update;	1202	$self->realloc;
1083	}	1203	}
1084		1204
1085	sub get_wh {	1205	sub get_wh {
1086	my ($self) = @_;	1206	my ($self) = @_;
1087		1207
…		…
1114	(sum @$hs),	1234	(sum @$hs),
1115	)	1235	)
1116	}	1236	}
1117		1237
1118	sub size_allocate {	1238	sub size_allocate {
1119	my ($self, $w, $h) = @_;	1239	my ($self, $w, $h, $changed) = @_;
1120		1240
1121	my ($ws, $hs) = $self->get_wh;	1241	my ($ws, $hs) = $self->get_wh;
1122		1242
1123	my $req_w = sum @$ws;	1243	my $req_w = (sum @$ws) || 1;
1124	my $req_h = sum @$hs;	1244	my $req_h = (sum @$hs) || 1;
1125		1245
1126	# TODO: nicer code && do row_expand	1246	# TODO: nicer code && do row_expand
1127	my @col_expand = @{$self->{col_expand}};	1247	my @col_expand = @{$self->{col_expand}};
1128	@col_expand = (1) x @$ws unless @col_expand;	1248	@col_expand = (1) x @$ws unless @col_expand;
1129	my $col_expand = (sum @col_expand) || 1;	1249	my $col_expand = (sum @col_expand) || 1;
…		…
1183	}	1303	}
1184	}	1304	}
1185		1305
1186	#############################################################################	1306	#############################################################################
1187		1307
		1308	package CFClient::UI::Box;
		1309
		1310	our @ISA = CFClient::UI::Container::;
		1311
		1312	sub size_request {
		1313	my ($self) = @_;
		1314
		1315	$self->{vertical}
		1316	? (
		1317	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1318	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1319	)
		1320	: (
		1321	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1322	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1323	)
		1324	}
		1325
		1326	sub size_allocate {
		1327	my ($self, $w, $h, $changed) = @_;
		1328
		1329	my $space = $self->{vertical} ? $h : $w;
		1330	my $children = $self->{children};
		1331
		1332	my @req;
		1333
		1334	if ($self->{homogeneous}) {
		1335	@req = ($space / (@$children || 1)) x @$children;
		1336	} else {
		1337	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1338	my $req = List::Util::sum @req;
		1339
		1340	if ($req > $space) {
		1341	# ah well, not enough space
		1342	$_ *= $space / $req for @req;
		1343	} else {
		1344	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1345
		1346	$space = ($space - $req) / $expand; # remaining space to give away
		1347
		1348	$req[$_] += $space * $children->[$_]{expand}
		1349	for 0 .. $#$children;
		1350	}
		1351	}
		1352
		1353	CFClient::UI::harmonize \@req;
		1354
		1355	my $pos = 0;
		1356	for (0 .. $#$children) {
		1357	my $alloc = $req[$_];
		1358	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1359
		1360	$pos += $alloc;
		1361	}
		1362
		1363	1
		1364	}
		1365
		1366	#############################################################################
		1367
1188	package CFClient::UI::HBox;	1368	package CFClient::UI::HBox;
1189		1369
1190	# TODO: wrap into common Box base class
1191
1192	our @ISA = CFClient::UI::Container::;	1370	our @ISA = CFClient::UI::Box::;
1193		1371
1194	sub size_request {	1372	sub new {
1195	my ($self) = @_;	1373	my $class = shift;
1196		1374
1197	my @alloc = map [$_->size_request], @{$self->{children}};	1375	$class->SUPER::new (
1198		1376	vertical => 0,
1199	(	1377	@_,
1200	(List::Util::sum map $_->[0], @alloc),
1201	(List::Util::max map $_->[1], @alloc),
1202	)	1378	)
1203	}	1379	}
1204		1380
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	#############################################################################	1381	#############################################################################
1247		1382
1248	package CFClient::UI::VBox;	1383	package CFClient::UI::VBox;
1249		1384
1250	# TODO: wrap into common Box base class
1251
1252	our @ISA = CFClient::UI::Container::;	1385	our @ISA = CFClient::UI::Box::;
1253		1386
1254	sub size_request {	1387	sub new {
1255	my ($self) = @_;	1388	my $class = shift;
1256		1389
1257	my @alloc = map [$_->size_request], @{$self->{children}};	1390	$class->SUPER::new (
1258		1391	vertical => 1,
1259	(	1392	@_,
1260	(List::Util::max map $_->[0], @alloc),
1261	(List::Util::sum map $_->[1], @alloc),
1262	)	1393	)
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	}	1394	}
1303		1395
1304	#############################################################################	1396	#############################################################################
1305		1397
1306	package CFClient::UI::Label;	1398	package CFClient::UI::Label;
…		…
1369	$self->{text} = "T$text";	1461	$self->{text} = "T$text";
1370		1462
1371	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1463	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1372	$self->{layout}->set_text ($text);	1464	$self->{layout}->set_text ($text);
1373		1465
		1466	$self->realloc;
1374	$self->update;	1467	$self->update;
1375	$self->check_size;
1376	}	1468	}
1377		1469
1378	sub set_markup {	1470	sub set_markup {
1379	my ($self, $markup) = @_;	1471	my ($self, $markup) = @_;
1380		1472
…		…
1384	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1476	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385		1477
1386	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1478	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1387	$self->{layout}->set_markup ($markup);	1479	$self->{layout}->set_markup ($markup);
1388		1480
		1481	$self->realloc;
1389	$self->update;	1482	$self->update;
1390	$self->check_size;
1391	}	1483	}
1392		1484
1393	sub size_request {	1485	sub size_request {
1394	my ($self) = @_;	1486	my ($self) = @_;
1395		1487
…		…
1416	$h + $self->{padding} * 2,	1508	$h + $self->{padding} * 2,
1417	)	1509	)
1418	}	1510	}
1419		1511
1420	sub size_allocate {	1512	sub size_allocate {
1421	my ($self, $w, $h) = @_;	1513	my ($self, $w, $h, $changed) = @_;
1422		1514
1423	delete $self->{texture};	1515	delete $self->{texture}
		1516	if $changed;
1424	}	1517	}
1425		1518
1426	sub set_fontsize {	1519	sub set_fontsize {
1427	my ($self, $fontsize) = @_;	1520	my ($self, $fontsize) = @_;
1428		1521
1429	$self->{fontsize} = $fontsize;	1522	$self->{fontsize} = $fontsize;
1430	delete $self->{texture};	1523	delete $self->{texture};
1431		1524
1432	$self->update;	1525	$self->realloc;
1433	$self->check_size;
1434	}	1526	}
1435		1527
1436	sub _draw {	1528	sub _draw {
1437	my ($self) = @_;	1529	my ($self) = @_;
1438		1530
…		…
1510	$self->{text} = $text;	1602	$self->{text} = $text;
1511		1603
1512	$text =~ s/./*/g if $self->{hidden};	1604	$text =~ s/./*/g if $self->{hidden};
1513	$self->{layout}->set_text ("$text ");	1605	$self->{layout}->set_text ("$text ");
1514		1606
1515	$self->emit (changed => $self->{text});	1607	$self->_emit (changed => $self->{text});
1516	}	1608	}
1517		1609
1518	sub set_text {	1610	sub set_text {
1519	my ($self, $text) = @_;	1611	my ($self, $text) = @_;
1520		1612
1521	$self->{cursor} = length $text;	1613	$self->{cursor} = length $text;
1522	$self->_set_text ($text);	1614	$self->_set_text ($text);
1523	$self->update;	1615
1524	$self->check_size;	1616	$self->realloc;
1525	}	1617	}
1526		1618
1527	sub get_text {	1619	sub get_text {
1528	$_[0]{text}	1620	$_[0]{text}
1529	}	1621	}
…		…
1532	my ($self) = @_;	1624	my ($self) = @_;
1533		1625
1534	my ($w, $h) = $self->SUPER::size_request;	1626	my ($w, $h) = $self->SUPER::size_request;
1535		1627
1536	($w + 1, $h) # add 1 for cursor	1628	($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	}	1629	}
1544		1630
1545	sub key_down {	1631	sub key_down {
1546	my ($self, $ev) = @_;	1632	my ($self, $ev) = @_;
1547		1633
…		…
1562	} elsif ($sym == CFClient::SDLK_HOME) {	1648	} elsif ($sym == CFClient::SDLK_HOME) {
1563	$self->{cursor} = 0;	1649	$self->{cursor} = 0;
1564	} elsif ($sym == CFClient::SDLK_END) {	1650	} elsif ($sym == CFClient::SDLK_END) {
1565	$self->{cursor} = length $text;	1651	$self->{cursor} = length $text;
1566	} elsif ($uni == 27) {	1652	} elsif ($uni == 27) {
1567	$self->emit ('escape');	1653	$self->_emit ('escape');
1568	} elsif ($uni) {	1654	} elsif ($uni) {
1569	substr $text, $self->{cursor}++, 0, chr $uni;	1655	substr $text, $self->{cursor}++, 0, chr $uni;
1570	}	1656	}
1571		1657
1572	$self->_set_text ($text);	1658	$self->_set_text ($text);
1573	$self->update;	1659
1574	$self->check_size;	1660	$self->realloc;
1575	}	1661	}
1576		1662
1577	sub focus_in {	1663	sub focus_in {
1578	my ($self) = @_;	1664	my ($self) = @_;
1579		1665
…		…
1659	if ($sym == 13) {	1745	if ($sym == 13) {
1660	unshift @{$self->{history}},	1746	unshift @{$self->{history}},
1661	my $txt = $self->get_text;	1747	my $txt = $self->get_text;
1662	$self->{history_pointer} = -1;	1748	$self->{history_pointer} = -1;
1663	$self->{history_saveback} = '';	1749	$self->{history_saveback} = '';
1664	$self->emit (activate => $txt);	1750	$self->_emit (activate => $txt);
1665	$self->update;	1751	$self->update;
1666		1752
1667	} elsif ($sym == CFClient::SDLK_UP) {	1753	} elsif ($sym == CFClient::SDLK_UP) {
1668	if ($self->{history_pointer} < 0) {	1754	if ($self->{history_pointer} < 0) {
1669	$self->{history_saveback} = $self->get_text;	1755	$self->{history_saveback} = $self->get_text;
…		…
1717	can_events => 1,	1803	can_events => 1,
1718	@_	1804	@_
1719	)	1805	)
1720	}	1806	}
1721		1807
		1808	sub activate { }
		1809
1722	sub button_up {	1810	sub button_up {
1723	my ($self, $ev, $x, $y) = @_;	1811	my ($self, $ev, $x, $y) = @_;
1724		1812
		1813	$self->emit ("activate")
1725	if ($x >= 0 && $x < $self->{w}	1814	if $x >= 0 && $x < $self->{w}
1726	&& $y >= 0 && $y < $self->{h}) {	1815	&& $y >= 0 && $y < $self->{h};
1727	$self->emit ("activate");
1728	}
1729	}	1816	}
1730		1817
1731	sub _draw {	1818	sub _draw {
1732	my ($self) = @_;	1819	my ($self) = @_;
1733		1820
…		…
1785	my ($self, $ev, $x, $y) = @_;	1872	my ($self, $ev, $x, $y) = @_;
1786		1873
1787	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1874	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1875	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789	$self->{state} = !$self->{state};	1876	$self->{state} = !$self->{state};
1790	$self->emit (changed => $self->{state});	1877	$self->_emit (changed => $self->{state});
1791	}	1878	}
1792	}	1879	}
1793		1880
1794	sub _draw {	1881	sub _draw {
1795	my ($self) = @_;	1882	my ($self) = @_;
…		…
2085	$self->update;	2172	$self->update;
2086		2173
2087	$self	2174	$self
2088	}	2175	}
2089		2176
		2177	sub changed { }
		2178
2090	sub set_range {	2179	sub set_range {
2091	my ($self, $range) = @_;	2180	my ($self, $range) = @_;
2092		2181
2093	$self->{range} = $range;	2182	($range, $self->{range}) = ($self->{range}, $range);
2094		2183
2095	$self->update;	2184	$self->update
		2185	if "@$range" ne "@{$self->{range}}";
2096	}	2186	}
2097		2187
2098	sub set_value {	2188	sub set_value {
2099	my ($self, $value) = @_;	2189	my ($self, $value) = @_;
2100		2190
…		…
2111	if $unit;	2201	if $unit;
2112		2202
2113	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2203	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114		2204
2115	if ($value != $old_value) {	2205	if ($value != $old_value) {
2116	$self->emit (changed => $value);	2206	$self->_emit (changed => $value);
2117	$self->update;	2207	$self->update;
2118	}	2208	}
2119	}	2209	}
2120		2210
2121	sub size_request {	2211	sub size_request {
…		…
2282	$self->{fontsize} = $fontsize;	2372	$self->{fontsize} = $fontsize;
2283	$self->reflow;	2373	$self->reflow;
2284	}	2374	}
2285		2375
2286	sub size_allocate {	2376	sub size_allocate {
2287	my ($self, $w, $h) = @_;	2377	my ($self, $w, $h, $changed) = @_;
2288		2378
2289	$self->SUPER::size_allocate ($w, $h);	2379	$self->SUPER::size_allocate ($w, $h, $changed);
		2380
		2381	return unless $changed;
2290		2382
2291	$self->{layout}->set_font ($self->{font}) if $self->{font};	2383	$self->{layout}->set_font ($self->{font}) if $self->{font};
2292	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293	$self->{layout}->set_width ($self->{children}[0]{w});	2385	$self->{layout}->set_width ($self->{children}[0]{w});
2294		2386
…		…
2483		2575
2484	sub new {	2576	sub new {
2485	my $class = shift;	2577	my $class = shift;
2486		2578
2487	my $self = $class->SUPER::new (	2579	my $self = $class->SUPER::new (
2488	state => 0,	2580	state => 0,
2489	connect_activate => \&toggle_flopper,	2581	on_activate => \&toggle_flopper,
2490	@_	2582	@_
2491	);	2583	);
2492		2584
2493	if ($self->{state}) {
2494	$self->{state} = 0;
2495	$self->toggle_flopper;
2496	}
2497
2498	$self	2585	$self
2499	}	2586	}
2500		2587
2501	sub toggle_flopper {	2588	sub toggle_flopper {
2502	my ($self) = @_;	2589	my ($self) = @_;
2503		2590
2504	# TODO: use animation	2591	$self->{other}->toggle_visibility;
2505	if ($self->{state} = !$self->{state}) {
2506	$CFClient::UI::ROOT->add ($self->{other});
2507	$self->{other}->move ($self->coord2global (0, $self->{h}));
2508	$self->emit ("open");
2509	} else {
2510	$CFClient::UI::ROOT->remove ($self->{other});
2511	$self->emit ("close");
2512	}
2513
2514	$self->emit (changed => $self->{state});
2515	}	2592	}
2516		2593
2517	#############################################################################	2594	#############################################################################
2518		2595
2519	package CFClient::UI::Tooltip;	2596	package CFClient::UI::Tooltip;
…		…
2551		2628
2552	($w + 4, $h + 4)	2629	($w + 4, $h + 4)
2553	}	2630	}
2554		2631
2555	sub size_allocate {	2632	sub size_allocate {
2556	my ($self, $w, $h) = @_;	2633	my ($self, $w, $h, $changed) = @_;
2557		2634
		2635	return unless $changed;
		2636
2558	$self->SUPER::size_allocate ($w - 4, $h - 4);	2637	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2638	}
		2639
		2640	sub visibility_change {
		2641	my ($self, $visible) = @_;
		2642
		2643	return unless $visible;
		2644
		2645	$self->{root}->on_post_alloc ("move_$self" => sub {
		2646	my $widget = $self->{owner}
		2647	or return;
		2648
		2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2650
		2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2652	if $x + $self->{w} > $::WIDTH;
		2653
		2654	$self->move ($x, $y);
		2655	});
2559	}	2656	}
2560		2657
2561	sub _draw {	2658	sub _draw {
2562	my ($self) = @_;	2659	my ($self) = @_;
2563		2660
…		…
2580	glVertex $w, $h;	2677	glVertex $w, $h;
2581	glVertex $w, 0;	2678	glVertex $w, 0;
2582	glEnd;	2679	glEnd;
2583		2680
2584	glTranslate 2 - 0.375, 2 - 0.375;	2681	glTranslate 2 - 0.375, 2 - 0.375;
		2682
2585	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2586	}	2684	}
2587		2685
2588	#############################################################################	2686	#############################################################################
2589		2687
…		…
2595		2693
2596	sub new {	2694	sub new {
2597	my $class = shift;	2695	my $class = shift;
2598		2696
2599	my $self = $class->SUPER::new (	2697	my $self = $class->SUPER::new (
2600	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2601	@_,	2700	@_,
2602	);	2701	);
2603		2702
2604	if ($self->{anim} && $self->{animspeed}) {	2703	if ($self->{anim} && $self->{animspeed}) {
2605	Scalar::Util::weaken (my $widget = $self);	2704	Scalar::Util::weaken (my $widget = $self);
…		…
2664	$self->SUPER::DESTROY;	2763	$self->SUPER::DESTROY;
2665	}	2764	}
2666		2765
2667	#############################################################################	2766	#############################################################################
2668		2767
2669	package CFClient::UI::InventoryItem;	2768	package CFClient::UI::Inventory;
2670		2769
2671	our @ISA = CFClient::UI::HBox::;	2770	our @ISA = CFClient::UI::ScrolledWindow::;
2672
2673	sub _item_to_desc {
2674	my ($item) = @_;
2675
2676	my $desc =
2677	$item->{nrof} < 2
2678	? $item->{name}
2679	: "$item->{nrof} × $item->{name_pl}";
2680
2681	$item->{flags} & Crossfire::Protocol::F_OPEN
2682	and $desc .= " (open)";
2683	$item->{flags} & Crossfire::Protocol::F_APPLIED
2684	and $desc .= " (applied)";
2685	$item->{flags} & Crossfire::Protocol::F_UNPAID
2686	and $desc .= " (unpaid)";
2687	$item->{flags} & Crossfire::Protocol::F_MAGIC
2688	and $desc .= " (magic)";
2689	$item->{flags} & Crossfire::Protocol::F_CURSED
2690	and $desc .= " (cursed)";
2691	$item->{flags} & Crossfire::Protocol::F_DAMNED
2692	and $desc .= " (damned)";
2693	$item->{flags} & Crossfire::Protocol::F_LOCKED
2694	and $desc .= " *";
2695
2696	$desc
2697	}
2698		2771
2699	sub new {	2772	sub new {
2700	my $class = shift;	2773	my $class = shift;
2701		2774
2702	my %args = @_;
2703
2704	my $item = delete $args{item};
2705
2706	my $desc = _item_to_desc ($item);
2707
2708	my $self = $class->SUPER::new (	2775	my $self = $class->SUPER::new (
2709	can_hover => 1,
2710	can_events => 1,
2711	tooltip => ((CFClient::UI::Label::escape $desc)
2712	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713	connect_button_down => sub {
2714	my ($self, $ev, $x, $y) = @_;
2715
2716	# todo: maybe put examine on 1? but should just be a tooltip :(
2717	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718	my $targ = $::CONN->{player}{tag};
2719
2720	if ($item->{container} == $::CONN->{player}{tag}) {
2721	$targ = $main::OPENCONT;
2722	}
2723
2724	$::CONN->send ("move $targ $item->{tag} 0");
2725	} elsif ($ev->{button} == 1) {
2726	$::CONN->send ("examine $item->{tag}");
2727	} elsif ($ev->{button} == 2) {
2728	$::CONN->send ("apply $item->{tag}");
2729	} elsif ($ev->{button} == 3) {
2730	my @menu_items = (
2731	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734	(
2735	$item->{flags} & Crossfire::Protocol::F_LOCKED
2736	? (
2737	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738	)
2739	: (
2740	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742	)
2743	),
2744	);
2745
2746	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747	}
2748
2749	1
2750	},
2751	%args
2752	);
2753
2754
2755	$self->add (new CFClient::UI::Face
2756	can_events => 0,
2757	face => $item->{face},
2758	anim => $item->{anim},
2759	animspeed => $item->{animspeed},
2760	);
2761
2762	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764	$self->{item} = $item;
2765
2766	$self->update_item;
2767
2768	$self
2769	}
2770
2771	sub update_item {
2772	my ($self) = @_;
2773
2774	my $desc = _item_to_desc ($self->{item});
2775
2776	$self->{name_lbl}->set_text ($desc);
2777	}
2778
2779	#############################################################################
2780
2781	package CFClient::UI::Inventory;
2782
2783	our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785	sub new {
2786	my $class = shift;
2787
2788	my $self = $class->SUPER::new (
2789	scrolled => (new CFClient::UI::Table),	2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2790	@_,	2777	@_,
2791	);	2778	);
2792		2779
2793	$self	2780	$self
2794	}	2781	}
…		…
2804	or ($a->{name} cmp $b->{name})	2791	or ($a->{name} cmp $b->{name})
2805	} @$items;	2792	} @$items;
2806		2793
2807	$self->{real_items} = \@items;	2794	$self->{real_items} = \@items;
2808		2795
		2796	my $row = 0;
2809	for my $item (@items) {	2797	for my $item (@items) {
2810	$item->{item} = $item;	2798	CFClient::Item::update_widgets $item;
2811	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812	$item->update_item ();
2813	}
2814		2799
2815	my $i = 0;	2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2816	for (@items) {	2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2817	$self->{scrolled}->add (0, $i, $_);	2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2818	my $nrof = $_->{item}->{nrof} || 1;
2819	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820	}
2821		2803
2822	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2804	$row++;
2823	}	2805	}
2824
2825	sub size_request {
2826	my ($self) = @_;
2827	($self->{req_w}, $self->{req_h});
2828	}	2806	}
2829		2807
2830	#############################################################################	2808	#############################################################################
2831		2809
2832	package CFClient::UI::Menu;	2810	package CFClient::UI::Menu;
…		…
2867		2845
2868	# popup given the event (must be a mouse button down event currently)	2846	# popup given the event (must be a mouse button down event currently)
2869	sub popup {	2847	sub popup {
2870	my ($self, $ev) = @_;	2848	my ($self, $ev) = @_;
2871		2849
2872	$self->emit ("popdown");	2850	$self->_emit ("popdown");
2873		2851
2874	# maybe save $GRAB? must be careful about events...	2852	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	2853	$GRAB = $self;
2876	$self->{button} = $ev->{button};	2854	$self->{button} = $ev->{button};
2877		2855
…		…
2892		2870
2893	if ($ev->{button} == $self->{button}) {	2871	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	2872	undef $GRAB;
2895	$self->hide;	2873	$self->hide;
2896		2874
2897	$self->emit ("popdown");	2875	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2876	$self->{hover}[1]->() if $self->{hover};
2899	}	2877	}
2900	}	2878	}
2901		2879
2902	#############################################################################	2880	#############################################################################
…		…
2964	sub add {	2942	sub add {
2965	my ($self, $text, %arg) = @_;	2943	my ($self, $text, %arg) = @_;
2966		2944
2967	$text =~ s/^\s+//;	2945	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	2946	$text =~ s/\s+$//;
		2947
		2948	return unless $text;
2969		2949
2970	my $timeout = time + ((delete $arg{timeout}) || 60);	2950	my $timeout = time + ((delete $arg{timeout}) || 60);
2971		2951
2972	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973		2953
…		…
3016	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
3017		2997
3018	sub new {	2998	sub new {
3019	my $class = shift;	2999	my $class = shift;
3020		3000
3021	$class->SUPER::new (	3001	my $self = $class->SUPER::new (
		3002	visible => 1,
3022	@_,	3003	@_,
3023	)	3004	);
		3005
		3006	Scalar::Util::weaken ($self->{root} = $self);
		3007
		3008	$self
3024	}	3009	}
3025		3010
3026	sub configure {	3011	sub configure {
3027	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
3028		3013
3029	$self->{w} = $w;	3014	$self->{w} = $w;
3030	$self->{h} = $h;	3015	$self->{h} = $h;
3031	}	3016	}
3032		3017
3033	sub check_size {	3018	sub reconfigure {
3034	my ($self) = @_;	3019	my ($self) = @_;
3035		3020
		3021	$self->SUPER::reconfigure;
		3022
3036	$self->size_allocate ($self->{w}, $self->{h})	3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
3037	if $self->{w};	3024	if $self->{w};
3038	}	3025	}
3039		3026
3040	sub size_request {	3027	sub size_request {
3041	my ($self) = @_;	3028	my ($self) = @_;
3042		3029
3043	($self->{w}, $self->{h})	3030	($self->{w}, $self->{h})
3044	}	3031	}
3045		3032
3046	sub size_allocate {	3033	sub size_allocate {
3047	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h, $changed) = @_;
3048
3049	my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050	my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054		3035
3055	for my $child ($self->children) {	3036	for my $child ($self->children) {
3056	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3057		3038
3058	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059	if exists $child->{req_x};	3040	if exists $child->{req_x};
3060		3041
3061	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062	if exists $child->{req_y};	3043	if exists $child->{req_y};
3063		3044
		3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3046
3064	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3065	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066		3049
3067	$child->configure ($X, $Y, $W, $H);	3050	$child->configure ($X, $Y, $W, $H);
3068	}	3051	}
…		…
3081	}	3064	}
3082		3065
3083	sub update {	3066	sub update {
3084	my ($self) = @_;	3067	my ($self) = @_;
3085		3068
3086	$self->check_size;
3087	$::WANT_REFRESH++;	3069	$::WANT_REFRESH++;
3088	}	3070	}
3089		3071
3090	sub add {	3072	sub add {
3091	my ($self, @children) = @_;	3073	my ($self, @children) = @_;
3092		3074
3093	for my $child (@children) {	3075	for my $child (@children) {
3094	$child->{toplevel} = 1;	3076	$child->{is_toplevel} = 1;
3095		3077
3096	# integerise window positions	3078	# integerise window positions
3097	$child->{x} = int $child->{x};	3079	$child->{x} = int $child->{x};
3098	$child->{y} = int $child->{y};	3080	$child->{y} = int $child->{y};
3099	}	3081	}
3100		3082
3101	$self->SUPER::add (@children);	3083	$self->SUPER::add (@children);
		3084	}
		3085
		3086	sub remove {
		3087	my ($self, @children) = @_;
		3088
		3089	$self->SUPER::remove (@children);
3102		3090
3103	while (@children) {	3091	while (@children) {
3104	my $w = pop @children;	3092	my $w = pop @children;
3105	push @children, $w->children;	3093	push @children, $w->children;
3106	$w->{visible} = 1;	3094	$w->set_invisible;
3107	}
3108	}
3109
3110	sub remove {
3111	my ($self, @children) = @_;
3112
3113	$self->SUPER::remove (@children);
3114
3115	while (@children) {
3116	my $w = pop @children;
3117	push @children, $w->children;
3118	delete $w->{visible};
3119	}	3095	}
3120	}	3096	}
3121		3097
3122	sub on_refresh {	3098	sub on_refresh {
3123	my ($self, $id, $cb) = @_;	3099	my ($self, $id, $cb) = @_;
…		…
3137	while ($self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
3138	$_->()	3114	$_->()
3139	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{refresh_hook}};
3140	}	3116	}
3141		3117
3142	if ($self->{check_size}) {	3118	if ($self->{realloc}) {
3143	my @queue = ([], []);	3119	my @queue;
3144		3120
3145	for (;;) {	3121	while () {
3146	if ($self->{check_size}) {	3122	if ($self->{realloc}) {
3147	# heuristic: check containers last	3123	#TODO use array-of-depth approach
3148	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3124
3149	for values %{delete $self->{check_size}}	3125	@queue = sort { $a->{visible} <=> $b->{visible} }
		3126	@queue, values %{delete $self->{realloc}};
3150	}	3127	}
3151		3128
3152	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3129	my $widget = pop @queue || last;
3153		3130
		3131	$widget->{visible} or last; # do not resize invisible widgets
		3132
3154	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3155	? @$widget{qw(user_w user_h)}	3134	? @$widget{qw(def_w def_h)}
3156	: $widget->size_request;	3135	: $widget->size_request;
3157		3136
3158	if (delete $widget->{force_alloc}
3159	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161		3138
3162	$widget->{req_w} = $w;	3139	$widget->{req_w} = $w;
3163	$widget->{req_h} = $h;	3140	$widget->{req_h} = $h;
3164		3141
3165	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3166		3143
3167	$widget->{parent}->check_size	3144	push @queue, $widget->{parent}
3168	if $widget->{parent};	3145	if $widget->{parent};
3169	}
3170	}	3146	}
3171	}	3147	}
3172		3148
3173	while ($self->{size_alloc}) {	3149	while (my $size_alloc = delete $self->{size_alloc}) {
3174	for (values %{delete $self->{size_alloc}}) {	3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3175	my ($widget, $w, $h) = @$_;	3151	values %$size_alloc;
		3152
		3153	while () {
		3154	my ($widget, $w, $h) = @{ pop @queue or last };
3176		3155
3177	$w = 0 if $w < 0;	3156	$w = 0 if $w < 0;
3178	$h = 0 if $h < 0;	3157	$h = 0 if $h < 0;
3179		3158
		3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3160
3180	$widget->{w} = $w;	3161	$widget->{w} = $w;
3181	$widget->{h} = $h;	3162	$widget->{h} = $h;
3182	$widget->size_allocate ($w, $h);	3163
3183	$widget->emit (size_allocate => $w, $h);	3164	$widget->emit (size_allocate => $w, $h, $changed);
3184	}	3165	}
3185	}	3166	}
3186		3167
3187	while ($self->{post_alloc_hook}) {	3168	while ($self->{post_alloc_hook}) {
3188	$_->()	3169	$_->()

Diff Legend

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