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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.258 by root, Tue May 30 02:55:45 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
18		43
19	sub check_tooltip {	44	sub check_tooltip {
20	if (!$GRAB) {	45	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	47	if (length $widget->{tooltip}) {
23		48
24	if ($TOOLTIP->{owner} != $widget) {	49	if ($TOOLTIP->{owner} != $widget) {
		50	$TOOLTIP->hide;
		51
25	$TOOLTIP->{owner} = $widget;	52	$TOOLTIP->{owner} = $widget;
26		53
27	my $tip = $widget->{tooltip};	54	my $tip = $widget->{tooltip};
28		55
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	56	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		57
31	$TOOLTIP->set_tooltip_from ($widget);	58	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	59	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
50	delete $TOOLTIP->{owner};	68	delete $TOOLTIP->{owner};
51	}	69	}
52		70
53	# class methods for events	71	# class methods for events
54	sub feed_sdl_key_down_event {	72	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	73	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	74	if $FOCUS;
57	}	75	}
58		76
59	sub feed_sdl_key_up_event {	77	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	78	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	79	if $FOCUS;
62	}	80	}
63		81
64	sub feed_sdl_button_down_event {	82	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	83	my ($ev) = @_;
…		…
74	check_tooltip;	92	check_tooltip;
75	}	93	}
76		94
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		96
79	if ($GRAB) {	97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	98	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	99	}
84		100
85	sub feed_sdl_button_up_event {	101	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	102	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	103	my ($x, $y) = ($ev->{x}, $ev->{y});
88		104
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		106
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		108
93	if ($GRAB) {	109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	110	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		111
98	if (!$BUTTON_STATE) {	112	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	113	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	114	$grab->update if $grab;
101	$GRAB->update if $GRAB;	115	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	131	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		132
119	check_tooltip;	133	check_tooltip;
120	}	134	}
121		135
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	137	if $HOVER;
126	}	138	}
127		139
128	# convert position array to integers	140	# convert position array to integers
129	sub harmonize {	141	sub harmonize {
130	my ($vals) = @_;	142	my ($vals) = @_;
…		…
144		156
145	$_->update	157	$_->update
146	for @widgets;	158	for @widgets;
147	}	159	}
148		160
		161	sub reconfigure_widgets {
		162	# make a copy, otherwise C<for> complains about freed values.
		163	my @widgets = values %WIDGET;
		164
		165	$_->reconfigure
		166	for @widgets;
		167	}
		168
149	# call when resolution changes etc.	169	# call when resolution changes etc.
150	sub rescale_widgets {	170	sub rescale_widgets {
151	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
152		172
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	173	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	174	if ($widget->{is_toplevel}) {
		175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		177
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
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};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184
		185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		187
166	}	188	}
167
168	$widget->reconfigure;
169	}	189	}
		190
		191	reconfigure_widgets;
170	}	192	}
171		193
172	#############################################################################	194	#############################################################################
173		195
174	package CFClient::UI::Base;	196	package CFClient::UI::Base;
…		…
179		201
180	sub new {	202	sub new {
181	my $class = shift;	203	my $class = shift;
182		204
183	my $self = bless {	205	my $self = bless {
184	x => 0,	206	x => "center",
185	y => 0,	207	y => "center",
186	z => 0,	208	z => 0,
		209	w => undef,
		210	h => undef,
187	can_events => 1,	211	can_events => 1,
188	@_	212	@_
189	}, $class;	213	}, $class;
190		214
		215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		216
191	for (keys %$self) {	217	for (keys %$self) {
192	if (/^connect_(.*)$/) {	218	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	219	$self->connect ($1 => delete $self->{$_});
194	}	220	}
195	}	221	}
196		222
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		228
		229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		231
		232	$self->show if $layout->{show};
		233	}
198		234
199	$self	235	$self
200	}	236	}
201		237
202	sub destroy {	238	sub destroy {
…		…
206	%$self = ();	242	%$self = ();
207	}	243	}
208		244
209	sub show {	245	sub show {
210	my ($self) = @_;	246	my ($self) = @_;
		247
211	return if $self->{parent};	248	return if $self->{parent};
212		249
213	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
214	}	251	}
215		252
216	sub hide {	253	sub set_visible {
217	my ($self) = @_;	254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262
		263	$self->realloc if !exists $self->{req_w};
		264
		265	$_->set_visible for $self->children;
		266	}
		267
		268	sub set_invisible {
		269	my ($self) = @_;
		270
		271	return unless $self->{visible};
		272
		273	$_->set_invisible for $self->children;
		274
		275	delete $self->{root};
		276	delete $self->{visible};
218		277
219	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
220	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
221		280
		281	CFClient::UI::check_tooltip
		282	if $TOOLTIP->{owner} == $self;
		283
		284	$self->focus_out;
		285
		286	$self->emit (visibility_change => 0);
		287	}
		288
		289	sub set_visibility {
		290	my ($self, $visible) = @_;
		291
		292	return if $self->{visible} == $visible;
		293
		294	$visible ? $self->hide
		295	: $self->show;
		296	}
		297
		298	sub toggle_visibility {
		299	my ($self) = @_;
		300
		301	$self->{visible}
		302	? $self->hide
		303	: $self->show;
		304	}
		305
		306	sub hide {
		307	my ($self) = @_;
		308
		309	$self->set_invisible;
		310
222	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
223	if $self->{parent};	312	if $self->{parent};
224	}	313	}
225		314
226	sub move {	315	sub move_abs {
227	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
228		317
229	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
230	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
231	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
232		321
233	$self->update;	322	$self->update;
234	}	323	}
235		324
236	sub set_size {	325	sub set_size {
237	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
238		327
239	$self->{user_w} = $w;	328	$self->{force_w} = $w;
240	$self->{user_h} = $h;	329	$self->{force_h} = $h;
241		330
242	$self->check_size;	331	$self->realloc;
243	}	332	}
244		333
245	sub size_request {	334	sub size_request {
246	require Carp;	335	require Carp;
247	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
249		338
250	sub configure {	339	sub configure {
251	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
252		341
253	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
254	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
255	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
256		347
257	# use alignment to adjust x, y	348	# use alignment to adjust x, y
258		349
259	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
260	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
261
262	($w, $h) = ($w2, $h2);
263	}	352	}
264		353
265	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
266	$self->{x} = $x;	355	$self->{x} = $x;
267	$self->{y} = $y;	356	$self->{y} = $y;
268	$self->update;	357	$self->update;
269	}	358	}
270		359
271	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{w} != $w || $self->{h} != $h) {
		361	return unless $self->{visible};
		362
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
273	}	364	}
274	}	365	}
275		366
276	sub size_allocate {	367	sub size_allocate {
277	# nothing to be done	368	# nothing to be done
278	}	369	}
279		370
280	sub reconfigure {
281	my ($self) = @_;
282
283	$self->check_size (1);
284	$self->update;
285	}
286
287	sub children {	371	sub children {
288	}	372	}
289		373
290	sub set_max_size {	374	sub set_max_size {
291	my ($self, $w, $h) = @_;	375	my ($self, $w, $h) = @_;
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	378	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	379	}
296		380
297	sub set_tooltip {	381	sub set_tooltip {
298	my ($self, $tooltip) = @_;	382	my ($self, $tooltip) = @_;
		383
		384	$tooltip =~ s/^\s+//;
		385	$tooltip =~ s/\s+$//;
		386
		387	return if $self->{tooltip} eq $tooltip;
299		388
300	$self->{tooltip} = $tooltip;	389	$self->{tooltip} = $tooltip;
301		390
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	392	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	414	return if $FOCUS == $self;
326	return unless $self->{can_focus};	415	return unless $self->{can_focus};
327		416
328	my $focus = $FOCUS; $FOCUS = $self;	417	my $focus = $FOCUS; $FOCUS = $self;
329		418
330	$self->emit (focus_in => $focus);	419	$self->_emit (focus_in => $focus);
331		420
332	$focus->update if $focus;	421	$focus->update if $focus;
333	$FOCUS->update;	422	$FOCUS->update;
334	}	423	}
335		424
…		…
338		427
339	return unless $FOCUS == $self;	428	return unless $FOCUS == $self;
340		429
341	my $focus = $FOCUS; undef $FOCUS;	430	my $focus = $FOCUS; undef $FOCUS;
342		431
343	$self->emit (focus_out => $focus);	432	$self->_emit (focus_out => $focus);
344		433
345	$focus->update if $focus; #?	434	$focus->update if $focus; #?
		435
		436	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		437	unless $FOCUS;
346	}	438	}
347		439
348	sub mouse_motion { }	440	sub mouse_motion { }
349	sub button_up { }	441	sub button_up { }
350	sub key_down { }	442	sub key_down { }
351	sub key_up { }	443	sub key_up { }
352		444
353	sub button_down {	445	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	446	my ($self, $ev, $x, $y) = @_;
355		447
356	$self->focus_in;	448	$self->focus_in;
…		…
359	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
360	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
361	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
362	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
363	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		456
		457	sub find_widget {
		458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self};
		504
		505	$self->{root}{realloc}{$self} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	}
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
		518
		519	sub reconfigure {
		520	my ($self) = @_;
		521
		522	$self->realloc;
		523	$self->update;
		524	}
364		525
365	sub draw {	526	sub draw {
366	my ($self) = @_;	527	my ($self) = @_;
367		528
368	return unless $self->{h} && $self->{w};	529	return unless $self->{h} && $self->{w};
…		…
385	glVertex $x , $y + $self->{h};	546	glVertex $x , $y + $self->{h};
386	glEnd;	547	glEnd;
387	glDisable GL_BLEND;	548	glDisable GL_BLEND;
388	}	549	}
389		550
390	if ($ENV{PCLIENT_DEBUG}) {	551	if ($ENV{CFPLUS_DEBUG}) {
391	glPushMatrix;	552	glPushMatrix;
392	glColor 1, 1, 0, 1;	553	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	555	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	556	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	557	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	558	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	559	glVertex 0 , $self->{h} - 1;
399	glEnd;	560	glEnd;
400	glPopMatrix;	561	glPopMatrix;
401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402	}	563	}
403	}	564	}
404		565
405	sub _draw {	566	sub _draw {
406	my ($self) = @_;	567	my ($self) = @_;
407		568
408	warn "no draw defined for $self\n";	569	warn "no draw defined for $self\n";
409	}
410
411	sub find_widget {
412	my ($self, $x, $y) = @_;
413
414	return () unless $self->{can_events};
415
416	return $self
417	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420	()
421	}
422
423	sub set_parent {
424	my ($self, $parent) = @_;
425
426	Scalar::Util::weaken ($self->{parent} = $parent);
427
428	# TODO: req_w _does_change after ->reconfigure
429	$self->check_size
430	unless exists $self->{req_w};
431
432	$self->show;
433	}
434
435	sub check_size {
436	my ($self, $forced) = @_;
437
438	$self->{force_alloc} = 1 if $forced;
439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
440	}
441
442	sub update {
443	my ($self) = @_;
444
445	$self->{parent}->update
446	if $self->{parent};
447	}
448
449	sub connect {
450	my ($self, $signal, $cb) = @_;
451
452	push @{ $self->{signal_cb}{$signal} }, $cb;
453	}
454
455	sub emit {
456	my ($self, $signal, @args) = @_;
457
458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459	}	570	}
460		571
461	sub DESTROY {	572	sub DESTROY {
462	my ($self) = @_;	573	my ($self) = @_;
463		574
…		…
521	my ($class, %arg) = @_;	632	my ($class, %arg) = @_;
522	$class->SUPER::new (can_events => 0, %arg);	633	$class->SUPER::new (can_events => 0, %arg);
523	}	634	}
524		635
525	sub size_request {	636	sub size_request {
526	(0, 0)	637	my ($self) = @_;
		638
		639	($self->{w} + 0, $self->{h} + 0)
527	}	640	}
528		641
529	sub draw { }	642	sub draw { }
530		643
531	#############################################################################	644	#############################################################################
…		…
560	$self->{children} = [	673	$self->{children} = [
561	sort { $a->{z} <=> $b->{z} }	674	sort { $a->{z} <=> $b->{z} }
562	@{$self->{children}}, @widgets	675	@{$self->{children}}, @widgets
563	];	676	];
564		677
565	$self->check_size (1);	678	$self->realloc;
566	$self->update;
567	}	679	}
568		680
569	sub children {	681	sub children {
570	@{ $_[0]{children} }	682	@{ $_[0]{children} }
571	}	683	}
…		…
576	delete $child->{parent};	688	delete $child->{parent};
577	$child->hide;	689	$child->hide;
578		690
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	691	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		692
581	$self->check_size;	693	$self->realloc;
582	$self->update;
583	}	694	}
584		695
585	sub clear {	696	sub clear {
586	my ($self) = @_;	697	my ($self) = @_;
587		698
…		…
591	for (@$children) {	702	for (@$children) {
592	delete $_->{parent};	703	delete $_->{parent};
593	$_->hide;	704	$_->hide;
594	}	705	}
595		706
596	$self->check_size;	707	$self->realloc;
597	$self->update;
598	}	708	}
599		709
600	sub find_widget {	710	sub find_widget {
601	my ($self, $x, $y) = @_;	711	my ($self, $x, $y) = @_;
602		712
…		…
655	sub size_request {	765	sub size_request {
656	$_[0]{children}[0]->size_request	766	$_[0]{children}[0]->size_request
657	}	767	}
658		768
659	sub size_allocate {	769	sub size_allocate {
660	my ($self, $w, $h) = @_;	770	my ($self, $w, $h, $changed) = @_;
661		771
662	$self->{children}[0]->configure (0, 0, $w, $h);	772	$self->{children}[0]->configure (0, 0, $w, $h);
663	}	773	}
664		774
665	#############################################################################	775	#############################################################################
…		…
682	$ROOT->on_post_alloc ($self => sub { $self->render_child });	792	$ROOT->on_post_alloc ($self => sub { $self->render_child });
683	$self->SUPER::update;	793	$self->SUPER::update;
684	}	794	}
685		795
686	sub size_allocate {	796	sub size_allocate {
687	my ($self, $w, $h) = @_;	797	my ($self, $w, $h, $changed) = @_;
688		798
689	$self->SUPER::size_allocate ($w, $h);	799	$self->SUPER::size_allocate ($w, $h, $changed);
690	$self->update;	800	$self->update
		801	if $changed;
691	}	802	}
692		803
693	sub _render {	804	sub _render {
694	$_[0]{children}[0]->draw;	805	$_[0]{children}[0]->draw;
695	}	806	}
…		…
726		837
727	package CFClient::UI::ViewPort;	838	package CFClient::UI::ViewPort;
728		839
729	our @ISA = CFClient::UI::Window::;	840	our @ISA = CFClient::UI::Window::;
730		841
		842	sub new {
		843	my $class = shift;
		844
		845	$class->SUPER::new (
		846	scroll_x => 0,
		847	scroll_y => 1,
		848	@_,
		849	)
		850	}
		851
731	sub size_request {	852	sub size_request {
732	my ($self) = @_;	853	my ($self) = @_;
733		854
734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		856
737	@$self{qw(child_w child_h)}	857	$w = 10 if $self->{scroll_x};
		858	$h = 10 if $self->{scroll_y};
		859
		860	($w, $h)
738	}	861	}
739		862
740	sub size_allocate {	863	sub size_allocate {
741	my ($self, $w, $h) = @_;	864	my ($self, $w, $h, $changed) = @_;
742		865
		866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		868
		869	$self->child->configure (0, 0, $w, $h);
743	$self->update;	870	$self->update;
744	}	871	}
745		872
746	sub set_offset {	873	sub set_offset {
747	my ($self, $x, $y) = @_;	874	my ($self, $x, $y) = @_;
…		…
798	my $class = shift;	925	my $class = shift;
799		926
800	my $self;	927	my $self;
801		928
802	my $slider = new CFClient::UI::Slider	929	my $slider = new CFClient::UI::Slider
803	vertical => 1,	930	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	931	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	932	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	933	$self->{vp}->set_offset (0, $_[1]);
807	},	934	},
808	;	935	;
809		936
810	$self = $class->SUPER::new (	937	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	938	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
816	$self->{vp}->add ($self->{scrolled});	943	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});	944	$self->add ($self->{vp});
818	$self->add ($self->{slider});	945	$self->add ($self->{slider});
819		946
820	$self	947	$self
		948	}
		949
		950	sub update {
		951	my ($self) = @_;
		952
		953	$self->SUPER::update;
		954
		955	# todo: overwrite size_allocate of child
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		958	}
		959
		960	sub size_allocate {
		961	my ($self, $w, $h, $changed) = @_;
		962
		963	$self->SUPER::size_allocate ($w, $h, $changed);
		964
		965	my $child = $self->{vp}->child;
		966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821	}	967	}
822		968
823	#TODO# update range on size_allocate depending on child	969	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	970	# update viewport offset on scroll
825		971
…		…
869		1015
870	our @ISA = CFClient::UI::Bin::;	1016	our @ISA = CFClient::UI::Bin::;
871		1017
872	use CFClient::OpenGL;	1018	use CFClient::OpenGL;
873		1019
874	my @tex =	1020	my $bg =
		1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1022	mipmap => 1, wrap => 1;
		1023
		1024	my @border =
875	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877		1027
878	sub new {	1028	sub new {
879	my $class = shift;	1029	my $class = shift;
880		1030
881	# TODO: user_x, user_y, overwrite moveto?
882
883	my $self = $class->SUPER::new (	1031	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1032	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1033	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1034	border => 0.6,
887	toplevel => 1,
888	can_events => 1,	1035	can_events => 1,
		1036	min_w => 16,
		1037	min_h => 16,
889	@_	1038	@_
890	);	1039	);
891		1040
892	$self->{title} &&= new CFClient::UI::Label	1041	$self->{title} &&= new CFClient::UI::Label
893	align => 0,	1042	align => 0,
…		…
912	$h + $self->border * 2,	1061	$h + $self->border * 2,
913	)	1062	)
914	}	1063	}
915		1064
916	sub size_allocate {	1065	sub size_allocate {
917	my ($self, $w, $h) = @_;	1066	my ($self, $w, $h, $changed) = @_;
		1067
		1068	return unless $changed;
918		1069
919	$h -= List::Util::max 0, $self->border * 2;	1070	$h -= List::Util::max 0, $self->border * 2;
920	$w -= List::Util::max 0, $self->border * 2;	1071	$w -= List::Util::max 0, $self->border * 2;
921		1072
922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
946	my ($ev, $x, $y) = @_;	1097	my ($ev, $x, $y) = @_;
947		1098
948	my $dx = $ev->{x} - $ox;	1099	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1100	my $dy = $ev->{y} - $oy;
950		1101
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1104
		1105	$self->realloc;
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954	$self->check_size;
955	};	1107	};
956		1108
957	} elsif ($lr ^ $td) {	1109	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});
959	my ($bx, $by) = ($self->{x}, $self->{y});	1111	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
961	$self->{motion} = sub {	1113	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1114	my ($ev, $x, $y) = @_;
963		1115
964	($x, $y) = ($ev->{x}, $ev->{y});	1116	($x, $y) = ($ev->{x}, $ev->{y});
965		1117
966	$self->move ($bx + $x - $ox, $by + $y - $oy);	1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967	$self->update;
968	};	1119	};
969	}	1120	}
970	}	1121	}
971		1122
972	sub button_up {	1123	sub button_up {
…		…
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992		1143
993	my $border = $self->border;	1144	my $border = $self->border;
994		1145
995	glColor @{ $self->{border_bg} };	1146	glColor @{ $self->{border_bg} };
996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);
997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000		1151
1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002	my $bg = $tex[0];	1153	glColor @{ $self->{bg} };
1003		1154
1004	# TODO: repeat texture not scale	1155	# TODO: repeat texture not scale
		1156	# solve this better(?)
1005	my $rep_x = $cw / $bg->{w};	1157	$bg->{s} = $cw / $bg->{w};
1006	my $rep_y = $ch / $bg->{h};	1158	$bg->{t} = $ch / $bg->{h};
1007
1008	glColor @{ $self->{bg} };
1009
1010	$bg->{s} = $rep_x;
1011	$bg->{t} = $rep_y;
1012	$bg->{wrap_mode} = 1;
1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014	}	1160	}
1015		1161
1016	glDisable GL_TEXTURE_2D;	1162	glDisable GL_TEXTURE_2D;
1017		1163
…		…
1033	sub new {	1179	sub new {
1034	my $class = shift;	1180	my $class = shift;
1035		1181
1036	$class->SUPER::new (	1182	$class->SUPER::new (
1037	col_expand => [],	1183	col_expand => [],
1038	@_	1184	@_,
1039	)	1185	)
		1186	}
		1187
		1188	sub children {
		1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1190	}
1041		1191
1042	sub add {	1192	sub add {
1043	my ($self, $x, $y, $child) = @_;	1193	my ($self, $x, $y, $child) = @_;
1044		1194
1045	$child->set_parent ($self);	1195	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1196	$self->{children}[$y][$x] = $child;
1047		1197
1048	$child->check_size;	1198	$self->realloc;
1049	}	1199	}
1050		1200
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# TODO: move to container class maybe? send childs a signal on removal?	1201	# TODO: move to container class maybe? send children a signal on removal?
1056	sub clear {	1202	sub clear {
1057	my ($self) = @_;	1203	my ($self) = @_;
1058		1204
1059	my @children = $self->children;	1205	my @children = $self->children;
1060	delete $self->{children};	1206	delete $self->{children};
…		…
1062	for (@children) {	1208	for (@children) {
1063	delete $_->{parent};	1209	delete $_->{parent};
1064	$_->hide;	1210	$_->hide;
1065	}	1211	}
1066		1212
1067	$self->update;	1213	$self->realloc;
1068	}	1214	}
1069		1215
1070	sub get_wh {	1216	sub get_wh {
1071	my ($self) = @_;	1217	my ($self) = @_;
1072		1218
…		…
1099	(sum @$hs),	1245	(sum @$hs),
1100	)	1246	)
1101	}	1247	}
1102		1248
1103	sub size_allocate {	1249	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h, $changed) = @_;
1105		1251
1106	my ($ws, $hs) = $self->get_wh;	1252	my ($ws, $hs) = $self->get_wh;
1107		1253
1108	my $req_w = sum @$ws;	1254	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1255	my $req_h = (sum @$hs) || 1;
1110		1256
1111	# TODO: nicer code && do row_expand	1257	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1258	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1259	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1260	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1314	}
1169	}	1315	}
1170		1316
1171	#############################################################################	1317	#############################################################################
1172		1318
		1319	package CFClient::UI::Box;
		1320
		1321	our @ISA = CFClient::UI::Container::;
		1322
		1323	sub size_request {
		1324	my ($self) = @_;
		1325
		1326	$self->{vertical}
		1327	? (
		1328	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	: (
		1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1334	)
		1335	}
		1336
		1337	sub size_allocate {
		1338	my ($self, $w, $h, $changed) = @_;
		1339
		1340	my $space = $self->{vertical} ? $h : $w;
		1341	my $children = $self->{children};
		1342
		1343	my @req;
		1344
		1345	if ($self->{homogeneous}) {
		1346	@req = ($space / (@$children || 1)) x @$children;
		1347	} else {
		1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1349	my $req = List::Util::sum @req;
		1350
		1351	if ($req > $space) {
		1352	# ah well, not enough space
		1353	$_ *= $space / $req for @req;
		1354	} else {
		1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1356
		1357	$space = ($space - $req) / $expand; # remaining space to give away
		1358
		1359	$req[$_] += $space * $children->[$_]{expand}
		1360	for 0 .. $#$children;
		1361	}
		1362	}
		1363
		1364	CFClient::UI::harmonize \@req;
		1365
		1366	my $pos = 0;
		1367	for (0 .. $#$children) {
		1368	my $alloc = $req[$_];
		1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1370
		1371	$pos += $alloc;
		1372	}
		1373
		1374	1
		1375	}
		1376
		1377	#############################################################################
		1378
1173	package CFClient::UI::HBox;	1379	package CFClient::UI::HBox;
1174		1380
1175	# TODO: wrap into common Box base class
1176
1177	our @ISA = CFClient::UI::Container::;	1381	our @ISA = CFClient::UI::Box::;
1178		1382
1179	sub size_request {	1383	sub new {
1180	my ($self) = @_;	1384	my $class = shift;
1181		1385
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1386	$class->SUPER::new (
1183		1387	vertical => 0,
1184	(	1388	@_,
1185	(List::Util::sum map $_->[0], @alloc),
1186	(List::Util::max map $_->[1], @alloc),
1187	)	1389	)
1188	}	1390	}
1189		1391
1190	sub size_allocate {
1191	my ($self, $w, $h) = @_;
1192
1193	($h, $w) = ($w, $h);
1194
1195	my $children = $self->{children};
1196
1197	my @h = map $_->{req_w}, @$children;
1198
1199	my $req_h = List::Util::sum @h;
1200
1201	if ($req_h > $h) {
1202	# ah well, not enough space
1203	$_ *= $h / $req_h for @h;
1204	} else {
1205	my $exp = List::Util::sum map $_->{expand}, @$children;
1206	$exp ||= 1;
1207
1208	for (0 .. $#$children) {
1209	my $child = $children->[$_];
1210
1211	my $alloc_h = $h[$_];
1212	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213	$h[$_] = $alloc_h;
1214	}
1215	}
1216
1217	CFClient::UI::harmonize \@h;
1218
1219	my $y = 0;
1220	for (0 .. $#$children) {
1221	my $child = $children->[$_];
1222	my $h = $h[$_];
1223	$child->configure ($y, 0, $h, $w);
1224
1225	$y += $h;
1226	}
1227
1228	1
1229	}
1230
1231	#############################################################################	1392	#############################################################################
1232		1393
1233	package CFClient::UI::VBox;	1394	package CFClient::UI::VBox;
1234		1395
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Box::;
1238		1397
1239	sub size_request {	1398	sub new {
1240	my ($self) = @_;	1399	my $class = shift;
1241		1400
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$class->SUPER::new (
1243		1402	vertical => 1,
1244	(	1403	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1404	)
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $w, $h) = @_;
1252
1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255	my $children = $self->{children};
1256
1257	my @h = map $_->{req_h}, @$children;
1258
1259	my $req_h = List::Util::sum @h;
1260
1261	if ($req_h > $h) {
1262	# ah well, not enough space
1263	$_ *= $h / $req_h for @h;
1264	} else {
1265	my $exp = List::Util::sum map $_->{expand}, @$children;
1266	$exp ||= 1;
1267
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270
1271	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272	}
1273	}
1274
1275	CFClient::UI::harmonize \@h;
1276
1277	my $y = 0;
1278	for (0 .. $#$children) {
1279	my $child = $children->[$_];
1280	my $h = $h[$_];
1281	$child->configure (0, $y, $w, $h);
1282
1283	$y += $h;
1284	}
1285
1286	1
1287	}	1405	}
1288		1406
1289	#############################################################################	1407	#############################################################################
1290		1408
1291	package CFClient::UI::Label;	1409	package CFClient::UI::Label;
…		…
1308	ellipsise => 3, # end	1426	ellipsise => 3, # end
1309	layout => (new CFClient::Layout),	1427	layout => (new CFClient::Layout),
1310	fontsize => 1,	1428	fontsize => 1,
1311	align => -1,	1429	align => -1,
1312	valign => -1,	1430	valign => -1,
1313	padding => 2,	1431	padding_x => 2,
		1432	padding_y => 2,
1314	can_events => 0,	1433	can_events => 0,
1315	%arg	1434	%arg
1316	);	1435	);
1317		1436
1318	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1354	$self->{text} = "T$text";	1473	$self->{text} = "T$text";
1355		1474
1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357	$self->{layout}->set_text ($text);	1476	$self->{layout}->set_text ($text);
1358		1477
		1478	$self->realloc;
1359	$self->update;	1479	$self->update;
1360	$self->check_size;
1361	}	1480	}
1362		1481
1363	sub set_markup {	1482	sub set_markup {
1364	my ($self, $markup) = @_;	1483	my ($self, $markup) = @_;
1365		1484
…		…
1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370		1489
1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372	$self->{layout}->set_markup ($markup);	1491	$self->{layout}->set_markup ($markup);
1373		1492
		1493	$self->realloc;
1374	$self->update;	1494	$self->update;
1375	$self->check_size;
1376	}	1495	}
1377		1496
1378	sub size_request {	1497	sub size_request {
1379	my ($self) = @_;	1498	my ($self) = @_;
1380		1499
…		…
1394		1513
1395	$w = List::Util::max $w, $w2;	1514	$w = List::Util::max $w, $w2;
1396	$h = List::Util::max $h, $h2;	1515	$h = List::Util::max $h, $h2;
1397	}	1516	}
1398		1517
1399	(	1518	($w, $h)
1400	$w + $self->{padding} * 2,
1401	$h + $self->{padding} * 2,
1402	)
1403	}	1519	}
1404		1520
1405	sub size_allocate {	1521	sub size_allocate {
1406	my ($self, $w, $h) = @_;	1522	my ($self, $w, $h, $changed) = @_;
1407		1523
1408	delete $self->{texture};	1524	delete $self->{texture}
		1525	if $changed;
1409	}	1526	}
1410		1527
1411	sub set_fontsize {	1528	sub set_fontsize {
1412	my ($self, $fontsize) = @_;	1529	my ($self, $fontsize) = @_;
1413		1530
1414	$self->{fontsize} = $fontsize;	1531	$self->{fontsize} = $fontsize;
1415	delete $self->{texture};	1532	delete $self->{texture};
1416		1533
1417	$self->update;	1534	$self->realloc;
1418	$self->check_size;
1419	}	1535	}
1420		1536
1421	sub _draw {	1537	sub _draw {
1422	my ($self) = @_;	1538	my ($self) = @_;
1423		1539
…		…
1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433		1549
1434	my $tex = new_from_layout CFClient::Texture $self->{layout};	1550	my $tex = new_from_layout CFClient::Texture $self->{layout};
1435		1551
1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438	: ($self->{w} - $tex->{w}) * 0.5);	1554	: ($self->{w} - $tex->{w}) * 0.5);
1439		1555
1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442	: ($self->{h} - $tex->{h}) * 0.5);	1558	: ($self->{h} - $tex->{h}) * 0.5);
1443		1559
1444	$tex	1560	$tex
1445	};	1561	};
1446		1562
…		…
1475	active_fg => [0, 0, 0],	1591	active_fg => [0, 0, 0],
1476	can_hover => 1,	1592	can_hover => 1,
1477	can_focus => 1,	1593	can_focus => 1,
1478	valign => 0,	1594	valign => 0,
1479	can_events => 1,	1595	can_events => 1,
		1596	#text => ...
1480	@_	1597	@_
1481	)	1598	)
1482	}	1599	}
1483		1600
1484	sub _set_text {	1601	sub _set_text {
…		…
1494	$self->{text} = $text;	1611	$self->{text} = $text;
1495		1612
1496	$text =~ s/./*/g if $self->{hidden};	1613	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1614	$self->{layout}->set_text ("$text ");
1498		1615
1499	$self->emit (changed => $self->{text});	1616	$self->_emit (changed => $self->{text});
1500	}	1617	}
1501		1618
1502	sub set_text {	1619	sub set_text {
1503	my ($self, $text) = @_;	1620	my ($self, $text) = @_;
1504		1621
1505	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1506	$self->_set_text ($text);	1623	$self->_set_text ($text);
1507	$self->update;	1624
1508	$self->check_size;	1625	$self->realloc;
1509	}	1626	}
1510		1627
1511	sub get_text {	1628	sub get_text {
1512	$_[0]{text}	1629	$_[0]{text}
1513	}	1630	}
…		…
1516	my ($self) = @_;	1633	my ($self) = @_;
1517		1634
1518	my ($w, $h) = $self->SUPER::size_request;	1635	my ($w, $h) = $self->SUPER::size_request;
1519		1636
1520	($w + 1, $h) # add 1 for cursor	1637	($w + 1, $h) # add 1 for cursor
1521	}
1522
1523	sub size_allocate {
1524	my ($self, $w, $h) = @_;
1525
1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527	}	1638	}
1528		1639
1529	sub key_down {	1640	sub key_down {
1530	my ($self, $ev) = @_;	1641	my ($self, $ev) = @_;
1531		1642
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1657	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1658	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1659	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1660	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1661	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1662	$self->_emit ('escape');
1552	} elsif ($uni) {	1663	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1664	substr $text, $self->{cursor}++, 0, chr $uni;
1554	}	1665	}
1555		1666
1556	$self->_set_text ($text);	1667	$self->_set_text ($text);
1557	$self->update;	1668
1558	$self->check_size;	1669	$self->realloc;
1559	}	1670	}
1560		1671
1561	sub focus_in {	1672	sub focus_in {
1562	my ($self) = @_;	1673	my ($self) = @_;
1563		1674
…		…
1643	if ($sym == 13) {	1754	if ($sym == 13) {
1644	unshift @{$self->{history}},	1755	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1756	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1757	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1758	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1759	$self->_emit (activate => $txt);
1649	$self->update;	1760	$self->update;
1650		1761
1651	} elsif ($sym == CFClient::SDLK_UP) {	1762	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1763	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1764	$self->{history_saveback} = $self->get_text;
…		…
1690		1801
1691	sub new {	1802	sub new {
1692	my $class = shift;	1803	my $class = shift;
1693		1804
1694	$class->SUPER::new (	1805	$class->SUPER::new (
1695	padding => 4,	1806	padding_x => 4,
		1807	padding_y => 4,
1696	fg => [1, 1, 1],	1808	fg => [1, 1, 1],
1697	active_fg => [0, 0, 1],	1809	active_fg => [0, 0, 1],
1698	can_hover => 1,	1810	can_hover => 1,
1699	align => 0,	1811	align => 0,
1700	valign => 0,	1812	valign => 0,
1701	can_events => 1,	1813	can_events => 1,
1702	@_	1814	@_
1703	)	1815	)
1704	}	1816	}
1705		1817
		1818	sub activate { }
		1819
1706	sub button_up {	1820	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1821	my ($self, $ev, $x, $y) = @_;
1708		1822
		1823	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1824	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1825	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");
1712	}
1713	}	1826	}
1714		1827
1715	sub _draw {	1828	sub _draw {
1716	my ($self) = @_;	1829	my ($self) = @_;
1717		1830
…		…
1746		1859
1747	sub new {	1860	sub new {
1748	my $class = shift;	1861	my $class = shift;
1749		1862
1750	$class->SUPER::new (	1863	$class->SUPER::new (
1751	padding => 2,	1864	padding_x => 2,
		1865	padding_y => 2,
1752	fg => [1, 1, 1],	1866	fg => [1, 1, 1],
1753	active_fg => [1, 1, 0],	1867	active_fg => [1, 1, 0],
1754	bg => [0, 0, 0, 0.2],	1868	bg => [0, 0, 0, 0.2],
1755	active_bg => [1, 1, 1, 0.5],	1869	active_bg => [1, 1, 1, 0.5],
1756	state => 0,	1870	state => 0,
…		…
1760	}	1874	}
1761		1875
1762	sub size_request {	1876	sub size_request {
1763	my ($self) = @_;	1877	my ($self) = @_;
1764		1878
1765	($self->{padding} * 2 + 6) x 2	1879	(6) x 2
1766	}	1880	}
1767		1881
1768	sub button_down {	1882	sub button_down {
1769	my ($self, $ev, $x, $y) = @_;	1883	my ($self, $ev, $x, $y) = @_;
1770		1884
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773	$self->{state} = !$self->{state};	1887	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1888	$self->_emit (changed => $self->{state});
1775	}	1889	}
1776	}	1890	}
1777		1891
1778	sub _draw {	1892	sub _draw {
1779	my ($self) = @_;	1893	my ($self) = @_;
1780		1894
1781	$self->SUPER::_draw;	1895	$self->SUPER::_draw;
1782		1896
1783	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1897	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784		1898
1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1899	my ($w, $h) = @$self{qw(w h)};
		1900
		1901	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1786		1902
1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1903	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788		1904
1789	my $tex = $self->{state} ? $tex[1] : $tex[0];	1905	my $tex = $self->{state} ? $tex[1] : $tex[0];
1790		1906
…		…
2054	my $self = $class->SUPER::new (	2170	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2171	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2172	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2173	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2174	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2175	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2176	min_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2177	min_h => $::WIDTH / 80,
2062	vertical => 0,	2178	vertical => 0,
2063	can_hover => 1,	2179	can_hover => 1,
2064	inner_pad => 0.02,	2180	inner_pad => 0.02,
2065	@_	2181	@_
2066	);	2182	);
…		…
2069	$self->update;	2185	$self->update;
2070		2186
2071	$self	2187	$self
2072	}	2188	}
2073		2189
		2190	sub changed { }
		2191
		2192	sub set_range {
		2193	my ($self, $range) = @_;
		2194
		2195	($range, $self->{range}) = ($self->{range}, $range);
		2196
		2197	$self->update
		2198	if "@$range" ne "@{$self->{range}}";
		2199	}
		2200
2074	sub set_value {	2201	sub set_value {
2075	my ($self, $value) = @_;	2202	my ($self, $value) = @_;
2076		2203
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2204	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2205
2079	$hi = $lo + 1 if $hi <= $lo;	2206	$hi = $lo + 1 if $hi <= $lo;
2080		2207
		2208	$page = $hi - $lo if $page > $hi - $lo;
		2209
2081	$value = $lo if $value < $lo;	2210	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2211	$value = $hi - $page if $value > $hi - $page;
2083		2212
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2213	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2214	if $unit;
2086		2215
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2216	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2217
2091	if ($value != $old_value) {	2218	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2219	$self->_emit (changed => $value);
2093	$self->update;	2220	$self->update;
2094	}	2221	}
2095	}	2222	}
2096		2223
2097	sub size_request {	2224	sub size_request {
2098	my ($self) = @_;	2225	my ($self) = @_;
2099		2226
2100	my $w = $self->{req_w};	2227	($self->{req_w}, $self->{req_h})
2101	my $h = $self->{req_h};
2102
2103	$self->{vertical} ? ($h, $w) : ($w, $h)
2104	}	2228	}
2105		2229
2106	sub button_down {	2230	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
2108		2232
2109	$self->SUPER::button_down ($ev, $x, $y);	2233	$self->SUPER::button_down ($ev, $x, $y);
		2234
		2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2236
2110	$self->mouse_motion ($ev, $x, $y);	2237	$self->mouse_motion ($ev, $x, $y);
2111	}	2238	}
2112		2239
2113	sub mouse_motion {	2240	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2241	my ($self, $ev, $x, $y) = @_;
…		…
2116	if ($GRAB == $self) {	2243	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2244	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2245
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2246	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2247
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2249
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124	}	2251	}
2125	}	2252	}
2126		2253
2127	sub update {	2254	sub update {
2128	my ($self) = @_;	2255	my ($self) = @_;
2129		2256
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2258	$self->set_value ($self->{range}[0]);
2132		2259
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2260	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2261	my $range = ($hi - $page - $lo) || 1e-100;
2134		2262
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2263	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2264
2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2265	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2266	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138		2267
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2268	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2269	$value = $value * $self->{scale} + $self->{offset};
2141		2270
2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144	$value = 0 if $value < 0;
2145	$page = 1 - $value if $value + $page > 1;
2146
2147	$self->{knob_x} = $value;	2271	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2272	$self->{knob_w} = $knob_w;
2149	});	2273	});
2150		2274
2151	$self->SUPER::update;	2275	$self->SUPER::update;
2152	}	2276	}
2153		2277
…		…
2177	# draw handle	2301	# draw handle
2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2302	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179		2303
2180	glDisable GL_TEXTURE_2D;	2304	glDisable GL_TEXTURE_2D;
2181	}	2305	}
		2306
		2307	#############################################################################
		2308
		2309	package CFClient::UI::ValSlider;
		2310
		2311	our @ISA = CFClient::UI::HBox::;
		2312
		2313	sub new {
		2314	my ($class, %arg) = @_;
		2315
		2316	my $range = delete $arg{range};
		2317
		2318	my $self = $class->SUPER::new (
		2319	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2320	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2321	to_value => sub { shift },
		2322	from_value => sub { shift },
		2323	%arg,
		2324	);
		2325
		2326	$self->{slider}->connect (changed => sub {
		2327	my ($self, $value) = @_;
		2328	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2329	$self->{parent}->emit (changed => $value);
		2330	});
		2331
		2332	# $self->{entry}->connect (changed => sub {
		2333	# my ($self, $value) = @_;
		2334	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2335	# $self->{parent}->emit (changed => $value);
		2336	# });
		2337
		2338	$self->add ($self->{slider}, $self->{entry});
		2339
		2340	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2341
		2342	$self
		2343	}
		2344
		2345	sub set_range { shift->{slider}->set_range (@_) }
		2346	sub set_value { shift->{slider}->set_value (@_) }
2182		2347
2183	#############################################################################	2348	#############################################################################
2184		2349
2185	package CFClient::UI::TextView;	2350	package CFClient::UI::TextView;
2186		2351
…		…
2217	$self->{fontsize} = $fontsize;	2382	$self->{fontsize} = $fontsize;
2218	$self->reflow;	2383	$self->reflow;
2219	}	2384	}
2220		2385
2221	sub size_allocate {	2386	sub size_allocate {
2222	my ($self, $w, $h) = @_;	2387	my ($self, $w, $h, $changed) = @_;
2223		2388
2224	$self->SUPER::size_allocate ($w, $h);	2389	$self->SUPER::size_allocate ($w, $h, $changed);
		2390
		2391	return unless $changed;
2225		2392
2226	$self->{layout}->set_font ($self->{font}) if $self->{font};	2393	$self->{layout}->set_font ($self->{font}) if $self->{font};
2227	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2395	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2396
2230	$self->reflow;	2397	$self->reflow;
2231	}	2398	}
2232		2399
2233	sub text_height {	2400	sub text_size {
2234	my ($self, $text, $indent) = @_;	2401	my ($self, $text, $indent) = @_;
2235		2402
2236	my $layout = $self->{layout};	2403	my $layout = $self->{layout};
2237		2404
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2406	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2407	$layout->set_markup ($text);
2241		2408
2242	($layout->size)[1]	2409	$layout->size
2243	}	2410	}
2244		2411
2245	sub reflow {	2412	sub reflow {
2246	my ($self) = @_;	2413	my ($self) = @_;
2247		2414
2248	$self->{need_reflow}++;	2415	$self->{need_reflow}++;
2249	$self->update;	2416	$self->update;
2250	}	2417	}
2251		2418
		2419	sub set_offset {
		2420	my ($self, $offset) = @_;
		2421
		2422	# todo: base offset on lines or so, not on pixels
		2423	$self->{children}[1]->set_value ($offset);
		2424	}
		2425
		2426	sub clear {
		2427	my ($self) = @_;
		2428
		2429	$self->{par} = [];
		2430	$self->{height} = 0;
		2431	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2432	}
		2433
2252	sub add_paragraph {	2434	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2435	my ($self, $color, $text, $indent) = @_;
2254		2436
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2437	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2438	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2439	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2441	}
2262		2442
2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2443	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264	$self->{children}[1]->update;
2265	}	2444	}
2266		2445
2267	sub update {	2446	sub update {
2268	my ($self) = @_;	2447	my ($self) = @_;
2269		2448
…		…
2272	return unless $self->{h} > 0;	2451	return unless $self->{h} > 0;
2273		2452
2274	delete $self->{texture};	2453	delete $self->{texture};
2275		2454
2276	$ROOT->on_post_alloc ($self, sub {	2455	$ROOT->on_post_alloc ($self, sub {
		2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2457
2277	if (delete $self->{need_reflow}) {	2458	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2459	my $height = 0;
2279		2460
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2461	my $layout = $self->{layout};
		2462
		2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2464
2281	for @{$self->{par}};	2465	for (@{$self->{par}}) {
		2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2467	$layout->set_width ($W - $_->[3]);
		2468	$layout->set_markup ($_->[4]);
		2469	my ($w, $h) = $layout->size;
		2470	$_->[0] = $w + $_->[3];
		2471	$_->[1] = $h;
		2472	}
		2473
		2474	$height += $_->[1];
		2475	}
2282		2476
2283	$self->{height} = $height;	2477	$self->{height} = $height;
2284		2478
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2480
2288	delete $self->{texture};	2481	delete $self->{texture};
2289	}	2482	}
2290		2483
2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2485	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2486	glClear GL_COLOR_BUFFER_BIT;
2294		2487
2295	my $top = int $self->{children}[1]{range}[0];	2488	my $top = int $self->{children}[1]{range}[0];
2296		2489
2297	my $y0 = $top;	2490	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2491	my $y1 = $top + $H;
2299		2492
2300	my $y = 0;	2493	my $y = 0;
2301		2494
2302	my $layout = $self->{layout};	2495	my $layout = $self->{layout};
2303		2496
2304	$layout->set_font ($self->{font}) if $self->{font};	2497	$layout->set_font ($self->{font}) if $self->{font};
2305		2498
2306	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
		2500	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2502
2309	for my $par (@{$self->{par}}) {	2503	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2504	my $h = $par->[1];
2311		2505
2312	if ($y0 < $y + $h && $y < $y1) {	2506	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2507	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2508	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2509	$layout->set_markup ($par->[4]);
2316		2510
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2512
2319	glRasterPos $par->[2], $y - $y0;	2513	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2515	}
2322		2516
2323	$y += $h;	2517	$y += $h;
2324	}	2518	}
…		…
2391		2585
2392	sub new {	2586	sub new {
2393	my $class = shift;	2587	my $class = shift;
2394		2588
2395	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2396	state => 0,	2590	state => 0,
2397	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2398	@_	2592	@_
2399	);	2593	);
2400		2594
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2595	$self
2407	}	2596	}
2408		2597
2409	sub toggle_flopper {	2598	sub toggle_flopper {
2410	my ($self) = @_;	2599	my ($self) = @_;
2411		2600
2412	# TODO: use animation	2601	$self->{other}->toggle_visibility;
2413	if ($self->{state} = !$self->{state}) {
2414	$CFClient::UI::ROOT->add ($self->{other});
2415	$self->{other}->move ($self->coord2global (0, $self->{h}));
2416	$self->emit ("open");
2417	} else {
2418	$CFClient::UI::ROOT->remove ($self->{other});
2419	$self->emit ("close");
2420	}
2421
2422	$self->emit (changed => $self->{state});
2423	}	2602	}
2424		2603
2425	#############################################################################	2604	#############################################################################
2426		2605
2427	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2459		2638
2460	($w + 4, $h + 4)	2639	($w + 4, $h + 4)
2461	}	2640	}
2462		2641
2463	sub size_allocate {	2642	sub size_allocate {
2464	my ($self, $w, $h) = @_;	2643	my ($self, $w, $h, $changed) = @_;
2465		2644
		2645	return unless $changed;
		2646
2466	$self->SUPER::size_allocate ($w - 4, $h - 4);	2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2648	}
		2649
		2650	sub visibility_change {
		2651	my ($self, $visible) = @_;
		2652
		2653	return unless $visible;
		2654
		2655	$self->{root}->on_post_alloc ("move_$self" => sub {
		2656	my $widget = $self->{owner}
		2657	or return;
		2658
		2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2660
		2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2662	if $x + $self->{w} > $::WIDTH;
		2663
		2664	$self->move_abs ($x, $y);
		2665	});
2467	}	2666	}
2468		2667
2469	sub _draw {	2668	sub _draw {
2470	my ($self) = @_;	2669	my ($self) = @_;
2471		2670
…		…
2488	glVertex $w, $h;	2687	glVertex $w, $h;
2489	glVertex $w, 0;	2688	glVertex $w, 0;
2490	glEnd;	2689	glEnd;
2491		2690
2492	glTranslate 2 - 0.375, 2 - 0.375;	2691	glTranslate 2 - 0.375, 2 - 0.375;
		2692
2493	$self->SUPER::_draw;	2693	$self->SUPER::_draw;
2494	}	2694	}
2495		2695
2496	#############################################################################	2696	#############################################################################
2497		2697
…		…
2503		2703
2504	sub new {	2704	sub new {
2505	my $class = shift;	2705	my $class = shift;
2506		2706
2507	my $self = $class->SUPER::new (	2707	my $self = $class->SUPER::new (
2508	aspect => 1,	2708	aspect => 1,
		2709	can_events => 0,
2509	@_,	2710	@_,
2510	);	2711	);
2511		2712
2512	if ($self->{anim} && $self->{animspeed}) {	2713	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2714	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2740	}
2540		2741
2541	sub _draw {	2742	sub _draw {
2542	my ($self) = @_;	2743	my ($self) = @_;
2543		2744
2544	return unless $::CONN;#d# manage and cache textures differently	2745	return unless $::CONN;
2545		2746
2546	my $face;	2747	my $face;
2547		2748
2548	if ($self->{frame}) {	2749	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2750	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2572	$self->SUPER::DESTROY;	2773	$self->SUPER::DESTROY;
2573	}	2774	}
2574		2775
2575	#############################################################################	2776	#############################################################################
2576		2777
2577	package CFClient::UI::InventoryItem;	2778	package CFClient::UI::Inventory;
2578		2779
2579	our @ISA = CFClient::UI::HBox::;	2780	our @ISA = CFClient::UI::ScrolledWindow::;
2580
2581	sub _item_to_desc {
2582	my ($item) = @_;
2583
2584	my $desc =
2585	$item->{nrof} < 2
2586	? $item->{name}
2587	: "$item->{nrof} × $item->{name_pl}";
2588
2589	$item->{flags} & Crossfire::Protocol::F_OPEN
2590	and $desc .= " (open)";
2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
2592	and $desc .= " (applied)";
2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
2594	and $desc .= " (unpaid)";
2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
2596	and $desc .= " (magic)";
2597	$item->{flags} & Crossfire::Protocol::F_CURSED
2598	and $desc .= " (cursed)";
2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
2600	and $desc .= " (damned)";
2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
2602	and $desc .= " *";
2603
2604	$desc
2605	}
2606		2781
2607	sub new {	2782	sub new {
2608	my $class = shift;	2783	my $class = shift;
2609		2784
2610	my %args = @_;
2611
2612	my $item = delete $args{item};
2613
2614	my $desc = _item_to_desc ($item);
2615
2616	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2617	can_hover => 1,	2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2618	can_events => 1,
2619	tooltip => ((CFClient::UI::Label::escape $desc)
2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621	connect_button_down => sub {
2622	my ($self, $ev, $x, $y) = @_;
2623
2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2625	if ($ev->{button} == 1) {
2626	my $targ = $::CONN->{player}{tag};
2627
2628	if ($item->{container} == $::CONN->{player}{tag}) {
2629	$targ = $main::OPENCONT;
2630	}
2631
2632	$::CONN->send ("move $targ $item->{tag} 0");
2633	} elsif ($ev->{button} == 2) {
2634	$::CONN->send ("apply $item->{tag}");
2635	} elsif ($ev->{button} == 3) {
2636	my @menu_items = (
2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640	(
2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
2642	? (
2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644	)
2645	: (
2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648	)
2649	),
2650	);
2651
2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653	}
2654
2655	1
2656	},
2657	%args
2658	);
2659
2660
2661	$self->add (new CFClient::UI::Face
2662	can_events => 0,
2663	face => $item->{face},
2664	anim => $item->{anim},
2665	animspeed => $item->{animspeed},
2666	);
2667
2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670	$self->{item} = $item;
2671
2672	$self->update_item;
2673
2674	$self
2675	}
2676
2677	sub update_item {
2678	my ($self) = @_;
2679
2680	my $desc = _item_to_desc ($self->{item});
2681
2682	$self->{name_lbl}->set_text ($desc);
2683	}
2684
2685	#############################################################################
2686
2687	package CFClient::UI::Inventory;
2688
2689	our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691	sub new {
2692	my $class = shift;
2693
2694	my $self = $class->SUPER::new (
2695	scrolled => (new CFClient::UI::VBox),
2696	@_,	2787	@_,
2697	);	2788	);
2698		2789
2699	$self	2790	$self
2700	}	2791	}
…		…
2710	or ($a->{name} cmp $b->{name})	2801	or ($a->{name} cmp $b->{name})
2711	} @$items;	2802	} @$items;
2712		2803
2713	$self->{real_items} = \@items;	2804	$self->{real_items} = \@items;
2714		2805
		2806	my $row = 0;
2715	for my $item (@items) {	2807	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2808	CFClient::Item::update_widgets $item;
2717	$item->update_item ();
2718	}
2719		2809
2720	$self->{scrolled}->add (@items);	2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2721		2813
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2814	$row++;
2723	}	2815	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}	2816	}
2729		2817
2730	#############################################################################	2818	#############################################################################
2731		2819
2732	package CFClient::UI::Menu;	2820	package CFClient::UI::Menu;
…		…
2767		2855
2768	# popup given the event (must be a mouse button down event currently)	2856	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2857	sub popup {
2770	my ($self, $ev) = @_;	2858	my ($self, $ev) = @_;
2771		2859
2772	$self->emit ("popdown");	2860	$self->_emit ("popdown");
2773		2861
2774	# maybe save $GRAB? must be careful about events...	2862	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2863	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2864	$self->{button} = $ev->{button};
2777		2865
2778	$self->show;	2866	$self->show;
2779	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780	}	2868	}
2781		2869
2782	sub mouse_motion {	2870	sub mouse_motion {
2783	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2784		2872
…		…
2792		2880
2793	if ($ev->{button} == $self->{button}) {	2881	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2882	undef $GRAB;
2795	$self->hide;	2883	$self->hide;
2796		2884
2797	$self->emit ("popdown");	2885	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2886	$self->{hover}[1]->() if $self->{hover};
2799	}	2887	}
2800	}	2888	}
2801		2889
2802	#############################################################################	2890	#############################################################################
…		…
2864	sub add {	2952	sub add {
2865	my ($self, $text, %arg) = @_;	2953	my ($self, $text, %arg) = @_;
2866		2954
2867	$text =~ s/^\s+//;	2955	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	2956	$text =~ s/\s+$//;
		2957
		2958	return unless $text;
2869		2959
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	2960	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		2961
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		2963
…		…
2916	use CFClient::OpenGL;	3006	use CFClient::OpenGL;
2917		3007
2918	sub new {	3008	sub new {
2919	my $class = shift;	3009	my $class = shift;
2920		3010
2921	$class->SUPER::new (	3011	my $self = $class->SUPER::new (
		3012	visible => 1,
2922	@_,	3013	@_,
2923	)	3014	);
		3015
		3016	Scalar::Util::weaken ($self->{root} = $self);
		3017
		3018	$self
2924	}	3019	}
2925		3020
2926	sub configure {	3021	sub configure {
2927	my ($self, $x, $y, $w, $h) = @_;	3022	my ($self, $x, $y, $w, $h) = @_;
2928		3023
2929	$self->{w} = $w;	3024	$self->{w} = $w;
2930	$self->{h} = $h;	3025	$self->{h} = $h;
2931	}	3026	}
2932		3027
2933	sub check_size {	3028	sub reconfigure {
2934	my ($self) = @_;	3029	my ($self) = @_;
2935		3030
		3031	$self->SUPER::reconfigure;
		3032
2936	$self->size_allocate ($self->{w}, $self->{h})	3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
2937	if $self->{w};	3034	if $self->{w};
2938	}	3035	}
2939		3036
2940	sub size_request {	3037	sub size_request {
2941	my ($self) = @_;	3038	my ($self) = @_;
2942		3039
2943	($self->{w}, $self->{h})	3040	($self->{w}, $self->{h})
2944	}	3041	}
2945		3042
		3043	sub _to_pixel {
		3044	my ($coord, $size, $max) = @_;
		3045
		3046	$coord =
		3047	$coord eq "center" ? ($max - $size) * 0.5
		3048	: $coord eq "max" ? $max
		3049	: $coord;
		3050
		3051	$coord = 0 if $coord < 0;
		3052	$coord = $max - $size if $coord > $max - $size;
		3053
		3054	int $coord + 0.5
		3055	}
		3056
2946	sub size_allocate {	3057	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h, $changed) = @_;
2948
2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954		3059
2955	for my $child ($self->children) {	3060	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3062
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3063	$X = $child->{force_x} if exists $child->{force_x};
2959	if exists $child->{req_x};	3064	$Y = $child->{force_y} if exists $child->{force_y};
2960		3065
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3066	$X = _to_pixel $X, $W, $self->{w};
2962	if exists $child->{req_y};	3067	$Y = _to_pixel $Y, $H, $self->{h};
2963
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3068
2967	$child->configure ($X, $Y, $W, $H);	3069	$child->configure ($X, $Y, $W, $H);
2968	}	3070	}
2969	}	3071	}
2970		3072
…		…
2981	}	3083	}
2982		3084
2983	sub update {	3085	sub update {
2984	my ($self) = @_;	3086	my ($self) = @_;
2985		3087
2986	$self->check_size;
2987	$::WANT_REFRESH++;	3088	$::WANT_REFRESH++;
2988	}	3089	}
2989		3090
2990	sub add {	3091	sub add {
2991	my ($self, @children) = @_;	3092	my ($self, @children) = @_;
2992		3093
2993	for my $child (@children) {
2994	$child->{toplevel} = 1;	3094	$_->{is_toplevel} = 1
2995		3095	for @children;
2996	# integerise window positions
2997	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};
2999	}
3000		3096
3001	$self->SUPER::add (@children);	3097	$self->SUPER::add (@children);
		3098	}
		3099
		3100	sub remove {
		3101	my ($self, @children) = @_;
		3102
		3103	$self->SUPER::remove (@children);
		3104
		3105	delete $self->{is_toplevel}
		3106	for @children;
3002		3107
3003	while (@children) {	3108	while (@children) {
3004	my $w = pop @children;	3109	my $w = pop @children;
3005	push @children, $w->children;	3110	push @children, $w->children;
3006	$w->{visible} = 1;	3111	$w->set_invisible;
3007	}
3008	}
3009
3010	sub remove {
3011	my ($self, @children) = @_;
3012
3013	$self->SUPER::remove (@children);
3014
3015	while (@children) {
3016	my $w = pop @children;
3017	push @children, $w->children;
3018	delete $w->{visible};
3019	}	3112	}
3020	}	3113	}
3021		3114
3022	sub on_refresh {	3115	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3116	my ($self, $id, $cb) = @_;
…		…
3037	while ($self->{refresh_hook}) {	3130	while ($self->{refresh_hook}) {
3038	$_->()	3131	$_->()
3039	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{refresh_hook}};
3040	}	3133	}
3041		3134
3042	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3043	my @queue = ([], []);	3136	my @queue;
3044		3137
3045	for (;;) {	3138	while () {
3046	if ($self->{check_size}) {	3139	if ($self->{realloc}) {
3047	# heuristic: check containers last	3140	#TODO use array-of-depth approach
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3141
3049	for values %{delete $self->{check_size}}	3142	@queue = sort { $a->{visible} <=> $b->{visible} }
		3143	@queue, values %{delete $self->{realloc}};
3050	}	3144	}
3051		3145
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3146	my $widget = pop @queue || last;
3053		3147
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3148	$widget->{visible} or last; # do not resize invisible widgets
3055	? @$widget{qw(user_w user_h)}	3149
3056	: $widget->size_request;	3150	my ($w, $h) = $widget->size_request;
3057		3151
3058	if (delete $widget->{force_alloc}	3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3154
3061		3155	$w = $widget->{force_w} if exists $widget->{force_w};
		3156	$h = $widget->{force_h} if exists $widget->{force_h};
		3157
3062	$widget->{req_w} = $w;	3158	$widget->{req_w} = $w;
3063	$widget->{req_h} = $h;	3159	$widget->{req_h} = $h;
3064		3160
3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3066		3162
3067	$widget->{parent}->check_size	3163	push @queue, $widget->{parent}
3068	if $widget->{parent};	3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3069	}
3070	}	3165	}
3071	}	3166	}
3072		3167
3073	while ($self->{size_alloc}) {	3168	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3075	my ($widget, $w, $h) = @$_;	3170	values %$size_alloc;
		3171
		3172	while () {
		3173	my ($widget, $w, $h) = @{ pop @queue or last };
		3174
		3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3076		3177
3077	$w = 0 if $w < 0;	3178	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3179	$h = 0 if $h < 0;
3079		3180
		3181	$w = int $w + 0.5;
		3182	$h = int $h + 0.5;
		3183
		3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3185
3080	$widget->{w} = $w;	3186	$widget->{w} = $w;
3081	$widget->{h} = $h;	3187	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);	3188
3083	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h, $changed);
3084	}	3190	}
3085	}	3191	}
3086		3192
3087	while ($self->{post_alloc_hook}) {	3193	while ($self->{post_alloc_hook}) {
3088	$_->()	3194	$_->()

Diff Legend

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