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.221 by root, Mon May 22 03:48:50 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 {
…		…
207	}	243	}
208		244
209	sub show {	245	sub show {
210	my ($self) = @_;	246	my ($self) = @_;
211		247
212	for (my @w = $self; @w; ) {
213	my $w = pop @w;
214	push @w, $w->children;
215	$w->{visible} = 1;
216	}
217
218	return if $self->{parent};	248	return if $self->{parent};
219		249
220	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
221	}	251	}
222		252
223	sub hide {	253	sub set_visible {
224	my ($self) = @_;	254	my ($self) = @_;
225		255
226	for (my @w = $self; @w; ) {	256	return if $self->{visible};
227	my $w = pop @w;	257
228	push @w, $w->children;	258	$self->{root} = $self->{parent}{root};
229	$w->{visible} = 1;	259	$self->{visible} = $self->{parent}{visible} + 1;
230	}	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};
231		277
232	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
233	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
234		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
235	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
236	if $self->{parent};	312	if $self->{parent};
237	}	313	}
238		314
239	sub move {	315	sub move_abs {
240	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
241		317
242	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
243	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
244	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
245		321
246	$self->update;	322	$self->update;
247	}	323	}
248		324
249	sub set_size {	325	sub set_size {
250	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
251		327
252	$self->{user_w} = $w;	328	$self->{force_w} = $w;
253	$self->{user_h} = $h;	329	$self->{force_h} = $h;
254		330
255	$self->check_size;	331	$self->realloc;
256	}	332	}
257		333
258	sub size_request {	334	sub size_request {
259	require Carp;	335	require Carp;
260	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
262		338
263	sub configure {	339	sub configure {
264	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
265		341
266	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
267	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
268	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
269		347
270	# use alignment to adjust x, y	348	# use alignment to adjust x, y
271		349
272	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
273	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
274
275	($w, $h) = ($w2, $h2);
276	}	352	}
277		353
278	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
279	$self->{x} = $x;	355	$self->{x} = $x;
280	$self->{y} = $y;	356	$self->{y} = $y;
281	$self->update;	357	$self->update;
282	}	358	}
283		359
284	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{w} != $w || $self->{h} != $h) {
		361	return unless $self->{visible};
		362
285	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
286	}	364	}
287	}	365	}
288		366
289	sub size_allocate {	367	sub size_allocate {
290	# nothing to be done	368	# nothing to be done
291	}	369	}
292		370
293	sub reconfigure {
294	my ($self) = @_;
295
296	$self->check_size (1);
297	$self->update;
298	}
299
300	sub children {	371	sub children {
301	}	372	}
302		373
303	sub set_max_size {	374	sub set_max_size {
304	my ($self, $w, $h) = @_;	375	my ($self, $w, $h) = @_;
…		…
307	delete $self->{max_h}; $self->{max_h} = $h if $h;	378	delete $self->{max_h}; $self->{max_h} = $h if $h;
308	}	379	}
309		380
310	sub set_tooltip {	381	sub set_tooltip {
311	my ($self, $tooltip) = @_;	382	my ($self, $tooltip) = @_;
		383
		384	$tooltip =~ s/^\s+//;
		385	$tooltip =~ s/\s+$//;
		386
		387	return if $self->{tooltip} eq $tooltip;
312		388
313	$self->{tooltip} = $tooltip;	389	$self->{tooltip} = $tooltip;
314		390
315	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316	delete $CFClient::UI::TOOLTIP->{owner};	392	delete $CFClient::UI::TOOLTIP->{owner};
…		…
338	return if $FOCUS == $self;	414	return if $FOCUS == $self;
339	return unless $self->{can_focus};	415	return unless $self->{can_focus};
340		416
341	my $focus = $FOCUS; $FOCUS = $self;	417	my $focus = $FOCUS; $FOCUS = $self;
342		418
343	$self->emit (focus_in => $focus);	419	$self->_emit (focus_in => $focus);
344		420
345	$focus->update if $focus;	421	$focus->update if $focus;
346	$FOCUS->update;	422	$FOCUS->update;
347	}	423	}
348		424
…		…
351		427
352	return unless $FOCUS == $self;	428	return unless $FOCUS == $self;
353		429
354	my $focus = $FOCUS; undef $FOCUS;	430	my $focus = $FOCUS; undef $FOCUS;
355		431
356	$self->emit (focus_out => $focus);	432	$self->_emit (focus_out => $focus);
357		433
358	$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;
359	}	438	}
360		439
361	sub mouse_motion { }	440	sub mouse_motion { }
362	sub button_up { }	441	sub button_up { }
363	sub key_down { }	442	sub key_down { }
364	sub key_up { }	443	sub key_up { }
365		444
366	sub button_down {	445	sub button_down {
367	my ($self, $ev, $x, $y) = @_;	446	my ($self, $ev, $x, $y) = @_;
368		447
369	$self->focus_in;	448	$self->focus_in;
…		…
372	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
373	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
374	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
375	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
376	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	}
377		525
378	sub draw {	526	sub draw {
379	my ($self) = @_;	527	my ($self) = @_;
380		528
381	return unless $self->{h} && $self->{w};	529	return unless $self->{h} && $self->{w};
…		…
398	glVertex $x , $y + $self->{h};	546	glVertex $x , $y + $self->{h};
399	glEnd;	547	glEnd;
400	glDisable GL_BLEND;	548	glDisable GL_BLEND;
401	}	549	}
402		550
403	if ($ENV{PCLIENT_DEBUG}) {	551	if ($ENV{CFPLUS_DEBUG}) {
404	glPushMatrix;	552	glPushMatrix;
405	glColor 1, 1, 0, 1;	553	glColor 1, 1, 0, 1;
406	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407	glBegin GL_LINE_LOOP;	555	glBegin GL_LINE_LOOP;
408	glVertex 0 , 0;	556	glVertex 0 , 0;
409	glVertex $self->{w}, 0;	557	glVertex $self->{w} - 1, 0;
410	glVertex $self->{w}, $self->{h};	558	glVertex $self->{w} - 1, $self->{h} - 1;
411	glVertex 0 , $self->{h};	559	glVertex 0 , $self->{h} - 1;
412	glEnd;	560	glEnd;
413	glPopMatrix;	561	glPopMatrix;
414	#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;
415	}	563	}
416	}	564	}
417		565
418	sub _draw {	566	sub _draw {
419	my ($self) = @_;	567	my ($self) = @_;
420		568
421	warn "no draw defined for $self\n";	569	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	}	570	}
473		571
474	sub DESTROY {	572	sub DESTROY {
475	my ($self) = @_;	573	my ($self) = @_;
476		574
…		…
534	my ($class, %arg) = @_;	632	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	633	$class->SUPER::new (can_events => 0, %arg);
536	}	634	}
537		635
538	sub size_request {	636	sub size_request {
539	(0, 0)	637	my ($self) = @_;
		638
		639	($self->{w} + 0, $self->{h} + 0)
540	}	640	}
541		641
542	sub draw { }	642	sub draw { }
543		643
544	#############################################################################	644	#############################################################################
…		…
573	$self->{children} = [	673	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	674	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	675	@{$self->{children}}, @widgets
576	];	676	];
577		677
578	$self->check_size (1);	678	$self->realloc;
579	$self->update;
580	}	679	}
581		680
582	sub children {	681	sub children {
583	@{ $_[0]{children} }	682	@{ $_[0]{children} }
584	}	683	}
…		…
589	delete $child->{parent};	688	delete $child->{parent};
590	$child->hide;	689	$child->hide;
591		690
592	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	691	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593		692
594	$self->check_size;	693	$self->realloc;
595	$self->update;
596	}	694	}
597		695
598	sub clear {	696	sub clear {
599	my ($self) = @_;	697	my ($self) = @_;
600		698
…		…
604	for (@$children) {	702	for (@$children) {
605	delete $_->{parent};	703	delete $_->{parent};
606	$_->hide;	704	$_->hide;
607	}	705	}
608		706
609	$self->check_size;	707	$self->realloc;
610	$self->update;
611	}	708	}
612		709
613	sub find_widget {	710	sub find_widget {
614	my ($self, $x, $y) = @_;	711	my ($self, $x, $y) = @_;
615		712
…		…
668	sub size_request {	765	sub size_request {
669	$_[0]{children}[0]->size_request	766	$_[0]{children}[0]->size_request
670	}	767	}
671		768
672	sub size_allocate {	769	sub size_allocate {
673	my ($self, $w, $h) = @_;	770	my ($self, $w, $h, $changed) = @_;
674		771
675	$self->{children}[0]->configure (0, 0, $w, $h);	772	$self->{children}[0]->configure (0, 0, $w, $h);
676	}	773	}
677		774
678	#############################################################################	775	#############################################################################
…		…
695	$ROOT->on_post_alloc ($self => sub { $self->render_child });	792	$ROOT->on_post_alloc ($self => sub { $self->render_child });
696	$self->SUPER::update;	793	$self->SUPER::update;
697	}	794	}
698		795
699	sub size_allocate {	796	sub size_allocate {
700	my ($self, $w, $h) = @_;	797	my ($self, $w, $h, $changed) = @_;
701		798
702	$self->SUPER::size_allocate ($w, $h);	799	$self->SUPER::size_allocate ($w, $h, $changed);
703	$self->update;	800	$self->update
		801	if $changed;
704	}	802	}
705		803
706	sub _render {	804	sub _render {
707	$_[0]{children}[0]->draw;	805	$_[0]{children}[0]->draw;
708	}	806	}
…		…
739		837
740	package CFClient::UI::ViewPort;	838	package CFClient::UI::ViewPort;
741		839
742	our @ISA = CFClient::UI::Window::;	840	our @ISA = CFClient::UI::Window::;
743		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
744	sub size_request {	852	sub size_request {
745	my ($self) = @_;	853	my ($self) = @_;
746		854
747	@$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)};
748	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
749		856
750	@$self{qw(child_w child_h)}	857	$w = 10 if $self->{scroll_x};
		858	$h = 10 if $self->{scroll_y};
		859
		860	($w, $h)
751	}	861	}
752		862
753	sub size_allocate {	863	sub size_allocate {
754	my ($self, $w, $h) = @_;	864	my ($self, $w, $h, $changed) = @_;
755		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);
756	$self->update;	870	$self->update;
757	}	871	}
758		872
759	sub set_offset {	873	sub set_offset {
760	my ($self, $x, $y) = @_;	874	my ($self, $x, $y) = @_;
…		…
811	my $class = shift;	925	my $class = shift;
812		926
813	my $self;	927	my $self;
814		928
815	my $slider = new CFClient::UI::Slider	929	my $slider = new CFClient::UI::Slider
816	vertical => 1,	930	vertical => 1,
817	range => [0, 0, 1, 0.01], # HACK fix	931	range => [0, 0, 1, 0.01], # HACK fix
818	connect_changed => sub {	932	on_changed => sub {
819	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	933	$self->{vp}->set_offset (0, $_[1]);
820	},	934	},
821	;	935	;
822		936
823	$self = $class->SUPER::new (	937	$self = $class->SUPER::new (
824	vp => (new CFClient::UI::ViewPort expand => 1),	938	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
829	$self->{vp}->add ($self->{scrolled});	943	$self->{vp}->add ($self->{scrolled});
830	$self->add ($self->{vp});	944	$self->add ($self->{vp});
831	$self->add ($self->{slider});	945	$self->add ($self->{slider});
832		946
833	$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]);
834	}	967	}
835		968
836	#TODO# update range on size_allocate depending on child	969	#TODO# update range on size_allocate depending on child
837	# update viewport offset on scroll	970	# update viewport offset on scroll
838		971
…		…
882		1015
883	our @ISA = CFClient::UI::Bin::;	1016	our @ISA = CFClient::UI::Bin::;
884		1017
885	use CFClient::OpenGL;	1018	use CFClient::OpenGL;
886		1019
887	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 =
888	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889	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);
890		1027
891	sub new {	1028	sub new {
892	my $class = shift;	1029	my $class = shift;
893		1030
894	# TODO: user_x, user_y, overwrite moveto?
895
896	my $self = $class->SUPER::new (	1031	my $self = $class->SUPER::new (
897	bg => [1, 1, 1, 1],	1032	bg => [1, 1, 1, 1],
898	border_bg => [1, 1, 1, 1],	1033	border_bg => [1, 1, 1, 1],
899	border => 0.6,	1034	border => 0.6,
900	toplevel => 1,
901	can_events => 1,	1035	can_events => 1,
		1036	min_w => 16,
		1037	min_h => 16,
902	@_	1038	@_
903	);	1039	);
904		1040
905	$self->{title} &&= new CFClient::UI::Label	1041	$self->{title} &&= new CFClient::UI::Label
906	align => 0,	1042	align => 0,
…		…
925	$h + $self->border * 2,	1061	$h + $self->border * 2,
926	)	1062	)
927	}	1063	}
928		1064
929	sub size_allocate {	1065	sub size_allocate {
930	my ($self, $w, $h) = @_;	1066	my ($self, $w, $h, $changed) = @_;
		1067
		1068	return unless $changed;
931		1069
932	$h -= List::Util::max 0, $self->border * 2;	1070	$h -= List::Util::max 0, $self->border * 2;
933	$w -= List::Util::max 0, $self->border * 2;	1071	$w -= List::Util::max 0, $self->border * 2;
934		1072
935	$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)
…		…
959	my ($ev, $x, $y) = @_;	1097	my ($ev, $x, $y) = @_;
960		1098
961	my $dx = $ev->{x} - $ox;	1099	my $dx = $ev->{x} - $ox;
962	my $dy = $ev->{y} - $oy;	1100	my $dy = $ev->{y} - $oy;
963		1101
964	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1104
		1105	$self->realloc;
966	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967	$self->check_size;
968	};	1107	};
969		1108
970	} elsif ($lr ^ $td) {	1109	} elsif ($lr ^ $td) {
971	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});
972	my ($bx, $by) = ($self->{x}, $self->{y});	1111	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
974	$self->{motion} = sub {	1113	$self->{motion} = sub {
975	my ($ev, $x, $y) = @_;	1114	my ($ev, $x, $y) = @_;
976		1115
977	($x, $y) = ($ev->{x}, $ev->{y});	1116	($x, $y) = ($ev->{x}, $ev->{y});
978		1117
979	$self->move ($bx + $x - $ox, $by + $y - $oy);	1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980	$self->update;
981	};	1119	};
982	}	1120	}
983	}	1121	}
984		1122
985	sub button_up {	1123	sub button_up {
…		…
1004	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005		1143
1006	my $border = $self->border;	1144	my $border = $self->border;
1007		1145
1008	glColor @{ $self->{border_bg} };	1146	glColor @{ $self->{border_bg} };
1009	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1010	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013		1151
1014	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015	my $bg = $tex[0];	1153	glColor @{ $self->{bg} };
1016		1154
1017	# TODO: repeat texture not scale	1155	# TODO: repeat texture not scale
		1156	# solve this better(?)
1018	my $rep_x = $cw / $bg->{w};	1157	$bg->{s} = $cw / $bg->{w};
1019	my $rep_y = $ch / $bg->{h};	1158	$bg->{t} = $ch / $bg->{h};
1020
1021	glColor @{ $self->{bg} };
1022
1023	$bg->{s} = $rep_x;
1024	$bg->{t} = $rep_y;
1025	$bg->{wrap_mode} = 1;
1026	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027	}	1160	}
1028		1161
1029	glDisable GL_TEXTURE_2D;	1162	glDisable GL_TEXTURE_2D;
1030		1163
…		…
1046	sub new {	1179	sub new {
1047	my $class = shift;	1180	my $class = shift;
1048		1181
1049	$class->SUPER::new (	1182	$class->SUPER::new (
1050	col_expand => [],	1183	col_expand => [],
1051	@_	1184	@_,
1052	)	1185	)
		1186	}
		1187
		1188	sub children {
		1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}	1190	}
1054		1191
1055	sub add {	1192	sub add {
1056	my ($self, $x, $y, $child) = @_;	1193	my ($self, $x, $y, $child) = @_;
1057		1194
1058	$child->set_parent ($self);	1195	$child->set_parent ($self);
1059	$self->{children}[$y][$x] = $child;	1196	$self->{children}[$y][$x] = $child;
1060		1197
1061	$child->check_size;	1198	$self->realloc;
1062	}	1199	}
1063		1200
1064	sub children {
1065	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066	}
1067
1068	# 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?
1069	sub clear {	1202	sub clear {
1070	my ($self) = @_;	1203	my ($self) = @_;
1071		1204
1072	my @children = $self->children;	1205	my @children = $self->children;
1073	delete $self->{children};	1206	delete $self->{children};
…		…
1075	for (@children) {	1208	for (@children) {
1076	delete $_->{parent};	1209	delete $_->{parent};
1077	$_->hide;	1210	$_->hide;
1078	}	1211	}
1079		1212
1080	$self->update;	1213	$self->realloc;
1081	}	1214	}
1082		1215
1083	sub get_wh {	1216	sub get_wh {
1084	my ($self) = @_;	1217	my ($self) = @_;
1085		1218
…		…
1112	(sum @$hs),	1245	(sum @$hs),
1113	)	1246	)
1114	}	1247	}
1115		1248
1116	sub size_allocate {	1249	sub size_allocate {
1117	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h, $changed) = @_;
1118		1251
1119	my ($ws, $hs) = $self->get_wh;	1252	my ($ws, $hs) = $self->get_wh;
1120		1253
1121	my $req_w = sum @$ws;	1254	my $req_w = (sum @$ws) || 1;
1122	my $req_h = sum @$hs;	1255	my $req_h = (sum @$hs) || 1;
1123		1256
1124	# TODO: nicer code && do row_expand	1257	# TODO: nicer code && do row_expand
1125	my @col_expand = @{$self->{col_expand}};	1258	my @col_expand = @{$self->{col_expand}};
1126	@col_expand = (1) x @$ws unless @col_expand;	1259	@col_expand = (1) x @$ws unless @col_expand;
1127	my $col_expand = (sum @col_expand) || 1;	1260	my $col_expand = (sum @col_expand) || 1;
…		…
1181	}	1314	}
1182	}	1315	}
1183		1316
1184	#############################################################################	1317	#############################################################################
1185		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
1186	package CFClient::UI::HBox;	1379	package CFClient::UI::HBox;
1187		1380
1188	# TODO: wrap into common Box base class
1189
1190	our @ISA = CFClient::UI::Container::;	1381	our @ISA = CFClient::UI::Box::;
1191		1382
1192	sub size_request {	1383	sub new {
1193	my ($self) = @_;	1384	my $class = shift;
1194		1385
1195	my @alloc = map [$_->size_request], @{$self->{children}};	1386	$class->SUPER::new (
1196		1387	vertical => 0,
1197	(	1388	@_,
1198	(List::Util::sum map $_->[0], @alloc),
1199	(List::Util::max map $_->[1], @alloc),
1200	)	1389	)
1201	}	1390	}
1202		1391
1203	sub size_allocate {
1204	my ($self, $w, $h) = @_;
1205
1206	($h, $w) = ($w, $h);
1207
1208	my $children = $self->{children};
1209
1210	my @h = map $_->{req_w}, @$children;
1211
1212	my $req_h = List::Util::sum @h;
1213
1214	if ($req_h > $h) {
1215	# ah well, not enough space
1216	$_ *= $h / $req_h for @h;
1217	} else {
1218	my $exp = List::Util::sum map $_->{expand}, @$children;
1219	$exp ||= 1;
1220
1221	for (0 .. $#$children) {
1222	my $child = $children->[$_];
1223
1224	my $alloc_h = $h[$_];
1225	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226	$h[$_] = $alloc_h;
1227	}
1228	}
1229
1230	CFClient::UI::harmonize \@h;
1231
1232	my $y = 0;
1233	for (0 .. $#$children) {
1234	my $child = $children->[$_];
1235	my $h = $h[$_];
1236	$child->configure ($y, 0, $h, $w);
1237
1238	$y += $h;
1239	}
1240
1241	1
1242	}
1243
1244	#############################################################################	1392	#############################################################################
1245		1393
1246	package CFClient::UI::VBox;	1394	package CFClient::UI::VBox;
1247		1395
1248	# TODO: wrap into common Box base class
1249
1250	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Box::;
1251		1397
1252	sub size_request {	1398	sub new {
1253	my ($self) = @_;	1399	my $class = shift;
1254		1400
1255	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$class->SUPER::new (
1256		1402	vertical => 1,
1257	(	1403	@_,
1258	(List::Util::max map $_->[0], @alloc),
1259	(List::Util::sum map $_->[1], @alloc),
1260	)	1404	)
1261	}
1262
1263	sub size_allocate {
1264	my ($self, $w, $h) = @_;
1265
1266	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268	my $children = $self->{children};
1269
1270	my @h = map $_->{req_h}, @$children;
1271
1272	my $req_h = List::Util::sum @h;
1273
1274	if ($req_h > $h) {
1275	# ah well, not enough space
1276	$_ *= $h / $req_h for @h;
1277	} else {
1278	my $exp = List::Util::sum map $_->{expand}, @$children;
1279	$exp ||= 1;
1280
1281	for (0 .. $#$children) {
1282	my $child = $children->[$_];
1283
1284	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285	}
1286	}
1287
1288	CFClient::UI::harmonize \@h;
1289
1290	my $y = 0;
1291	for (0 .. $#$children) {
1292	my $child = $children->[$_];
1293	my $h = $h[$_];
1294	$child->configure (0, $y, $w, $h);
1295
1296	$y += $h;
1297	}
1298
1299	1
1300	}	1405	}
1301		1406
1302	#############################################################################	1407	#############################################################################
1303		1408
1304	package CFClient::UI::Label;	1409	package CFClient::UI::Label;
…		…
1321	ellipsise => 3, # end	1426	ellipsise => 3, # end
1322	layout => (new CFClient::Layout),	1427	layout => (new CFClient::Layout),
1323	fontsize => 1,	1428	fontsize => 1,
1324	align => -1,	1429	align => -1,
1325	valign => -1,	1430	valign => -1,
1326	padding => 2,	1431	padding_x => 2,
		1432	padding_y => 2,
1327	can_events => 0,	1433	can_events => 0,
1328	%arg	1434	%arg
1329	);	1435	);
1330		1436
1331	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1367	$self->{text} = "T$text";	1473	$self->{text} = "T$text";
1368		1474
1369	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370	$self->{layout}->set_text ($text);	1476	$self->{layout}->set_text ($text);
1371		1477
		1478	$self->realloc;
1372	$self->update;	1479	$self->update;
1373	$self->check_size;
1374	}	1480	}
1375		1481
1376	sub set_markup {	1482	sub set_markup {
1377	my ($self, $markup) = @_;	1483	my ($self, $markup) = @_;
1378		1484
…		…
1382	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383		1489
1384	$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;
1385	$self->{layout}->set_markup ($markup);	1491	$self->{layout}->set_markup ($markup);
1386		1492
		1493	$self->realloc;
1387	$self->update;	1494	$self->update;
1388	$self->check_size;
1389	}	1495	}
1390		1496
1391	sub size_request {	1497	sub size_request {
1392	my ($self) = @_;	1498	my ($self) = @_;
1393		1499
…		…
1407		1513
1408	$w = List::Util::max $w, $w2;	1514	$w = List::Util::max $w, $w2;
1409	$h = List::Util::max $h, $h2;	1515	$h = List::Util::max $h, $h2;
1410	}	1516	}
1411		1517
1412	(	1518	($w, $h)
1413	$w + $self->{padding} * 2,
1414	$h + $self->{padding} * 2,
1415	)
1416	}	1519	}
1417		1520
1418	sub size_allocate {	1521	sub size_allocate {
1419	my ($self, $w, $h) = @_;	1522	my ($self, $w, $h, $changed) = @_;
1420		1523
1421	delete $self->{texture};	1524	delete $self->{texture}
		1525	if $changed;
1422	}	1526	}
1423		1527
1424	sub set_fontsize {	1528	sub set_fontsize {
1425	my ($self, $fontsize) = @_;	1529	my ($self, $fontsize) = @_;
1426		1530
1427	$self->{fontsize} = $fontsize;	1531	$self->{fontsize} = $fontsize;
1428	delete $self->{texture};	1532	delete $self->{texture};
1429		1533
1430	$self->update;	1534	$self->realloc;
1431	$self->check_size;
1432	}	1535	}
1433		1536
1434	sub _draw {	1537	sub _draw {
1435	my ($self) = @_;	1538	my ($self) = @_;
1436		1539
…		…
1444	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446		1549
1447	my $tex = new_from_layout CFClient::Texture $self->{layout};	1550	my $tex = new_from_layout CFClient::Texture $self->{layout};
1448		1551
1449	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451	: ($self->{w} - $tex->{w}) * 0.5);	1554	: ($self->{w} - $tex->{w}) * 0.5);
1452		1555
1453	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455	: ($self->{h} - $tex->{h}) * 0.5);	1558	: ($self->{h} - $tex->{h}) * 0.5);
1456		1559
1457	$tex	1560	$tex
1458	};	1561	};
1459		1562
…		…
1488	active_fg => [0, 0, 0],	1591	active_fg => [0, 0, 0],
1489	can_hover => 1,	1592	can_hover => 1,
1490	can_focus => 1,	1593	can_focus => 1,
1491	valign => 0,	1594	valign => 0,
1492	can_events => 1,	1595	can_events => 1,
		1596	#text => ...
1493	@_	1597	@_
1494	)	1598	)
1495	}	1599	}
1496		1600
1497	sub _set_text {	1601	sub _set_text {
…		…
1507	$self->{text} = $text;	1611	$self->{text} = $text;
1508		1612
1509	$text =~ s/./*/g if $self->{hidden};	1613	$text =~ s/./*/g if $self->{hidden};
1510	$self->{layout}->set_text ("$text ");	1614	$self->{layout}->set_text ("$text ");
1511		1615
1512	$self->emit (changed => $self->{text});	1616	$self->_emit (changed => $self->{text});
1513	}	1617	}
1514		1618
1515	sub set_text {	1619	sub set_text {
1516	my ($self, $text) = @_;	1620	my ($self, $text) = @_;
1517		1621
1518	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1519	$self->_set_text ($text);	1623	$self->_set_text ($text);
1520	$self->update;	1624
1521	$self->check_size;	1625	$self->realloc;
1522	}	1626	}
1523		1627
1524	sub get_text {	1628	sub get_text {
1525	$_[0]{text}	1629	$_[0]{text}
1526	}	1630	}
…		…
1529	my ($self) = @_;	1633	my ($self) = @_;
1530		1634
1531	my ($w, $h) = $self->SUPER::size_request;	1635	my ($w, $h) = $self->SUPER::size_request;
1532		1636
1533	($w + 1, $h) # add 1 for cursor	1637	($w + 1, $h) # add 1 for cursor
1534	}
1535
1536	sub size_allocate {
1537	my ($self, $w, $h) = @_;
1538
1539	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540	}	1638	}
1541		1639
1542	sub key_down {	1640	sub key_down {
1543	my ($self, $ev) = @_;	1641	my ($self, $ev) = @_;
1544		1642
…		…
1559	} elsif ($sym == CFClient::SDLK_HOME) {	1657	} elsif ($sym == CFClient::SDLK_HOME) {
1560	$self->{cursor} = 0;	1658	$self->{cursor} = 0;
1561	} elsif ($sym == CFClient::SDLK_END) {	1659	} elsif ($sym == CFClient::SDLK_END) {
1562	$self->{cursor} = length $text;	1660	$self->{cursor} = length $text;
1563	} elsif ($uni == 27) {	1661	} elsif ($uni == 27) {
1564	$self->emit ('escape');	1662	$self->_emit ('escape');
1565	} elsif ($uni) {	1663	} elsif ($uni) {
1566	substr $text, $self->{cursor}++, 0, chr $uni;	1664	substr $text, $self->{cursor}++, 0, chr $uni;
1567	}	1665	}
1568		1666
1569	$self->_set_text ($text);	1667	$self->_set_text ($text);
1570	$self->update;	1668
1571	$self->check_size;	1669	$self->realloc;
1572	}	1670	}
1573		1671
1574	sub focus_in {	1672	sub focus_in {
1575	my ($self) = @_;	1673	my ($self) = @_;
1576		1674
…		…
1656	if ($sym == 13) {	1754	if ($sym == 13) {
1657	unshift @{$self->{history}},	1755	unshift @{$self->{history}},
1658	my $txt = $self->get_text;	1756	my $txt = $self->get_text;
1659	$self->{history_pointer} = -1;	1757	$self->{history_pointer} = -1;
1660	$self->{history_saveback} = '';	1758	$self->{history_saveback} = '';
1661	$self->emit (activate => $txt);	1759	$self->_emit (activate => $txt);
1662	$self->update;	1760	$self->update;
1663		1761
1664	} elsif ($sym == CFClient::SDLK_UP) {	1762	} elsif ($sym == CFClient::SDLK_UP) {
1665	if ($self->{history_pointer} < 0) {	1763	if ($self->{history_pointer} < 0) {
1666	$self->{history_saveback} = $self->get_text;	1764	$self->{history_saveback} = $self->get_text;
…		…
1703		1801
1704	sub new {	1802	sub new {
1705	my $class = shift;	1803	my $class = shift;
1706		1804
1707	$class->SUPER::new (	1805	$class->SUPER::new (
1708	padding => 4,	1806	padding_x => 4,
		1807	padding_y => 4,
1709	fg => [1, 1, 1],	1808	fg => [1, 1, 1],
1710	active_fg => [0, 0, 1],	1809	active_fg => [0, 0, 1],
1711	can_hover => 1,	1810	can_hover => 1,
1712	align => 0,	1811	align => 0,
1713	valign => 0,	1812	valign => 0,
1714	can_events => 1,	1813	can_events => 1,
1715	@_	1814	@_
1716	)	1815	)
1717	}	1816	}
1718		1817
		1818	sub activate { }
		1819
1719	sub button_up {	1820	sub button_up {
1720	my ($self, $ev, $x, $y) = @_;	1821	my ($self, $ev, $x, $y) = @_;
1721		1822
		1823	$self->emit ("activate")
1722	if ($x >= 0 && $x < $self->{w}	1824	if $x >= 0 && $x < $self->{w}
1723	&& $y >= 0 && $y < $self->{h}) {	1825	&& $y >= 0 && $y < $self->{h};
1724	$self->emit ("activate");
1725	}
1726	}	1826	}
1727		1827
1728	sub _draw {	1828	sub _draw {
1729	my ($self) = @_;	1829	my ($self) = @_;
1730		1830
…		…
1759		1859
1760	sub new {	1860	sub new {
1761	my $class = shift;	1861	my $class = shift;
1762		1862
1763	$class->SUPER::new (	1863	$class->SUPER::new (
1764	padding => 2,	1864	padding_x => 2,
		1865	padding_y => 2,
1765	fg => [1, 1, 1],	1866	fg => [1, 1, 1],
1766	active_fg => [1, 1, 0],	1867	active_fg => [1, 1, 0],
1767	bg => [0, 0, 0, 0.2],	1868	bg => [0, 0, 0, 0.2],
1768	active_bg => [1, 1, 1, 0.5],	1869	active_bg => [1, 1, 1, 0.5],
1769	state => 0,	1870	state => 0,
…		…
1773	}	1874	}
1774		1875
1775	sub size_request {	1876	sub size_request {
1776	my ($self) = @_;	1877	my ($self) = @_;
1777		1878
1778	($self->{padding} * 2 + 6) x 2	1879	(6) x 2
1779	}	1880	}
1780		1881
1781	sub button_down {	1882	sub button_down {
1782	my ($self, $ev, $x, $y) = @_;	1883	my ($self, $ev, $x, $y) = @_;
1783		1884
1784	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786	$self->{state} = !$self->{state};	1887	$self->{state} = !$self->{state};
1787	$self->emit (changed => $self->{state});	1888	$self->_emit (changed => $self->{state});
1788	}	1889	}
1789	}	1890	}
1790		1891
1791	sub _draw {	1892	sub _draw {
1792	my ($self) = @_;	1893	my ($self) = @_;
1793		1894
1794	$self->SUPER::_draw;	1895	$self->SUPER::_draw;
1795		1896
1796	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1897	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797		1898
1798	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;
1799		1902
1800	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1903	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801		1904
1802	my $tex = $self->{state} ? $tex[1] : $tex[0];	1905	my $tex = $self->{state} ? $tex[1] : $tex[0];
1803		1906
…		…
2067	my $self = $class->SUPER::new (	2170	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2171	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2172	active_fg => [0, 0, 0],
2070	bg => [0, 0, 0, 0.2],	2173	bg => [0, 0, 0, 0.2],
2071	active_bg => [1, 1, 1, 0.5],	2174	active_bg => [1, 1, 1, 0.5],
2072	range => [0, 0, 100, 10],	2175	range => [0, 0, 100, 10, 0],
2073	req_w => $::WIDTH / 80,	2176	min_w => $::WIDTH / 80,
2074	req_h => $::WIDTH / 80,	2177	min_h => $::WIDTH / 80,
2075	vertical => 0,	2178	vertical => 0,
2076	can_hover => 1,	2179	can_hover => 1,
2077	inner_pad => 0.02,	2180	inner_pad => 0.02,
2078	@_	2181	@_
2079	);	2182	);
…		…
2082	$self->update;	2185	$self->update;
2083		2186
2084	$self	2187	$self
2085	}	2188	}
2086		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
2087	sub set_value {	2201	sub set_value {
2088	my ($self, $value) = @_;	2202	my ($self, $value) = @_;
2089		2203
2090	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2204	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091		2205
2092	$hi = $lo + 1 if $hi <= $lo;	2206	$hi = $lo + 1 if $hi <= $lo;
2093		2207
		2208	$page = $hi - $lo if $page > $hi - $lo;
		2209
2094	$value = $lo if $value < $lo;	2210	$value = $lo if $value < $lo;
2095	$value = $hi if $value > $hi;	2211	$value = $hi - $page if $value > $hi - $page;
2096		2212
2097	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2213	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098	if $unit;	2214	if $unit;
2099		2215
2100	$page = $hi - $lo if $page > $hi - $lo;
2101
2102	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2216	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103		2217
2104	if ($value != $old_value) {	2218	if ($value != $old_value) {
2105	$self->emit (changed => $value);	2219	$self->_emit (changed => $value);
2106	$self->update;	2220	$self->update;
2107	}	2221	}
2108	}	2222	}
2109		2223
2110	sub size_request {	2224	sub size_request {
2111	my ($self) = @_;	2225	my ($self) = @_;
2112		2226
2113	my $w = $self->{req_w};	2227	($self->{req_w}, $self->{req_h})
2114	my $h = $self->{req_h};
2115
2116	$self->{vertical} ? ($h, $w) : ($w, $h)
2117	}	2228	}
2118		2229
2119	sub button_down {	2230	sub button_down {
2120	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
2121		2232
2122	$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
2123	$self->mouse_motion ($ev, $x, $y);	2237	$self->mouse_motion ($ev, $x, $y);
2124	}	2238	}
2125		2239
2126	sub mouse_motion {	2240	sub mouse_motion {
2127	my ($self, $ev, $x, $y) = @_;	2241	my ($self, $ev, $x, $y) = @_;
…		…
2129	if ($GRAB == $self) {	2243	if ($GRAB == $self) {
2130	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2244	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131		2245
2132	my (undef, $lo, $hi, $page) = @{$self->{range}};	2246	my (undef, $lo, $hi, $page) = @{$self->{range}};
2133		2247
2134	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135		2249
2136	$self->set_value ($x * ($hi - $lo) + $lo);	2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2137	}	2251	}
2138	}	2252	}
2139		2253
2140	sub update {	2254	sub update {
2141	my ($self) = @_;	2255	my ($self) = @_;
2142		2256
2143	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2144	$self->set_value ($self->{range}[0]);	2258	$self->set_value ($self->{range}[0]);
2145		2259
2146	my ($value, $lo, $hi, $page) = @{$self->{range}};	2260	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2261	my $range = ($hi - $page - $lo) || 1e-100;
2147		2262
2148	my $inner_w = 1 - 2 * $self->{inner_pad};	2263	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149		2264
2150	$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;
2151		2267
2152	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2268	$value = ($value - $lo) / $range;
2153	$value = $self->{scale} * ($value - $lo);	2269	$value = $value * $self->{scale} + $self->{offset};
2154		2270
2155	$value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157	$value = 0 if $value < 0;
2158	$page = 1 - $value if $value + $page > 1;
2159
2160	$self->{knob_x} = $value;	2271	$self->{knob_x} = $value - $knob_w * 0.5;
2161	$self->{knob_w} = $page;	2272	$self->{knob_w} = $knob_w;
2162	});	2273	});
2163		2274
2164	$self->SUPER::update;	2275	$self->SUPER::update;
2165	}	2276	}
2166		2277
…		…
2190	# draw handle	2301	# draw handle
2191	$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);
2192		2303
2193	glDisable GL_TEXTURE_2D;	2304	glDisable GL_TEXTURE_2D;
2194	}	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 (@_) }
2195		2347
2196	#############################################################################	2348	#############################################################################
2197		2349
2198	package CFClient::UI::TextView;	2350	package CFClient::UI::TextView;
2199		2351
…		…
2230	$self->{fontsize} = $fontsize;	2382	$self->{fontsize} = $fontsize;
2231	$self->reflow;	2383	$self->reflow;
2232	}	2384	}
2233		2385
2234	sub size_allocate {	2386	sub size_allocate {
2235	my ($self, $w, $h) = @_;	2387	my ($self, $w, $h, $changed) = @_;
2236		2388
2237	$self->SUPER::size_allocate ($w, $h);	2389	$self->SUPER::size_allocate ($w, $h, $changed);
		2390
		2391	return unless $changed;
2238		2392
2239	$self->{layout}->set_font ($self->{font}) if $self->{font};	2393	$self->{layout}->set_font ($self->{font}) if $self->{font};
2240	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241	$self->{layout}->set_width ($self->{children}[0]{w});	2395	$self->{layout}->set_width ($self->{children}[0]{w});
2242		2396
2243	$self->reflow;	2397	$self->reflow;
2244	}	2398	}
2245		2399
2246	sub text_height {	2400	sub text_size {
2247	my ($self, $text, $indent) = @_;	2401	my ($self, $text, $indent) = @_;
2248		2402
2249	my $layout = $self->{layout};	2403	my $layout = $self->{layout};
2250		2404
2251	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252	$layout->set_width ($self->{children}[0]{w} - $indent);	2406	$layout->set_width ($self->{children}[0]{w} - $indent);
2253	$layout->set_markup ($text);	2407	$layout->set_markup ($text);
2254		2408
2255	($layout->size)[1]	2409	$layout->size
2256	}	2410	}
2257		2411
2258	sub reflow {	2412	sub reflow {
2259	my ($self) = @_;	2413	my ($self) = @_;
2260		2414
2261	$self->{need_reflow}++;	2415	$self->{need_reflow}++;
2262	$self->update;	2416	$self->update;
2263	}	2417	}
2264		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
2265	sub add_paragraph {	2434	sub add_paragraph {
2266	my ($self, $color, $text, $indent) = @_;	2435	my ($self, $color, $text, $indent) = @_;
2267		2436
2268	#TODO: intelligently "reformat" paragraph
2269
2270	for my $line (split /\n/, $text) {	2437	for my $line (split /\n/, $text) {
2271	my $height = $self->text_height ($line);	2438	my ($w, $h) = $self->text_size ($line);
2272	$self->{height} += $height;	2439	$self->{height} += $h;
2273	push @{$self->{par}}, [$height, $color, $indent, $line];	2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274	}	2441	}
2275		2442
2276	$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]);
2277	$self->{children}[1]->update;
2278	}	2444	}
2279		2445
2280	sub update {	2446	sub update {
2281	my ($self) = @_;	2447	my ($self) = @_;
2282		2448
…		…
2285	return unless $self->{h} > 0;	2451	return unless $self->{h} > 0;
2286		2452
2287	delete $self->{texture};	2453	delete $self->{texture};
2288		2454
2289	$ROOT->on_post_alloc ($self, sub {	2455	$ROOT->on_post_alloc ($self, sub {
		2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2457
2290	if (delete $self->{need_reflow}) {	2458	if (delete $self->{need_reflow}) {
2291	my $height = 0;	2459	my $height = 0;
2292		2460
2293	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2461	my $layout = $self->{layout};
		2462
		2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2464
2294	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	}
2295		2476
2296	$self->{height} = $height;	2477	$self->{height} = $height;
2297		2478
2298	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299	$self->{children}[1]->update;
2300		2480
2301	delete $self->{texture};	2481	delete $self->{texture};
2302	}	2482	}
2303		2483
2304	$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 {
2305	glClearColor 0.5, 0.5, 0.5, 0;	2485	glClearColor 0.5, 0.5, 0.5, 0;
2306	glClear GL_COLOR_BUFFER_BIT;	2486	glClear GL_COLOR_BUFFER_BIT;
2307		2487
2308	my $top = int $self->{children}[1]{range}[0];	2488	my $top = int $self->{children}[1]{range}[0];
2309		2489
2310	my $y0 = $top;	2490	my $y0 = $top;
2311	my $y1 = $top + $self->{h};	2491	my $y1 = $top + $H;
2312		2492
2313	my $y = 0;	2493	my $y = 0;
2314		2494
2315	my $layout = $self->{layout};	2495	my $layout = $self->{layout};
2316		2496
2317	$layout->set_font ($self->{font}) if $self->{font};	2497	$layout->set_font ($self->{font}) if $self->{font};
2318		2498
2319	glEnable GL_BLEND;	2499	glEnable GL_BLEND;
		2500	#TODO# not correct in windows where rgba is forced off
2320	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2501	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321		2502
2322	for my $par (@{$self->{par}}) {	2503	for my $par (@{$self->{par}}) {
2323	my $h = $par->[0];	2504	my $h = $par->[1];
2324		2505
2325	if ($y0 < $y + $h && $y < $y1) {	2506	if ($y0 < $y + $h && $y < $y1) {
2326	$layout->set_foreground (@{ $par->[1] });	2507	$layout->set_foreground (@{ $par->[2] });
2327	$layout->set_width ($self->{w} - $par->[2]);	2508	$layout->set_width ($W - $par->[3]);
2328	$layout->set_markup ($par->[3]);	2509	$layout->set_markup ($par->[4]);
2329		2510
2330	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331		2512
2332	glRasterPos $par->[2], $y - $y0;	2513	glRasterPos $par->[3], $y - $y0;
2333	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334	}	2515	}
2335		2516
2336	$y += $h;	2517	$y += $h;
2337	}	2518	}
…		…
2404		2585
2405	sub new {	2586	sub new {
2406	my $class = shift;	2587	my $class = shift;
2407		2588
2408	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2409	state => 0,	2590	state => 0,
2410	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2411	@_	2592	@_
2412	);	2593	);
2413		2594
2414	if ($self->{state}) {
2415	$self->{state} = 0;
2416	$self->toggle_flopper;
2417	}
2418
2419	$self	2595	$self
2420	}	2596	}
2421		2597
2422	sub toggle_flopper {	2598	sub toggle_flopper {
2423	my ($self) = @_;	2599	my ($self) = @_;
2424		2600
2425	# TODO: use animation	2601	$self->{other}->toggle_visibility;
2426	if ($self->{state} = !$self->{state}) {
2427	$CFClient::UI::ROOT->add ($self->{other});
2428	$self->{other}->move ($self->coord2global (0, $self->{h}));
2429	$self->emit ("open");
2430	} else {
2431	$CFClient::UI::ROOT->remove ($self->{other});
2432	$self->emit ("close");
2433	}
2434
2435	$self->emit (changed => $self->{state});
2436	}	2602	}
2437		2603
2438	#############################################################################	2604	#############################################################################
2439		2605
2440	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2472		2638
2473	($w + 4, $h + 4)	2639	($w + 4, $h + 4)
2474	}	2640	}
2475		2641
2476	sub size_allocate {	2642	sub size_allocate {
2477	my ($self, $w, $h) = @_;	2643	my ($self, $w, $h, $changed) = @_;
2478		2644
		2645	return unless $changed;
		2646
2479	$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	});
2480	}	2666	}
2481		2667
2482	sub _draw {	2668	sub _draw {
2483	my ($self) = @_;	2669	my ($self) = @_;
2484		2670
…		…
2501	glVertex $w, $h;	2687	glVertex $w, $h;
2502	glVertex $w, 0;	2688	glVertex $w, 0;
2503	glEnd;	2689	glEnd;
2504		2690
2505	glTranslate 2 - 0.375, 2 - 0.375;	2691	glTranslate 2 - 0.375, 2 - 0.375;
		2692
2506	$self->SUPER::_draw;	2693	$self->SUPER::_draw;
2507	}	2694	}
2508		2695
2509	#############################################################################	2696	#############################################################################
2510		2697
…		…
2516		2703
2517	sub new {	2704	sub new {
2518	my $class = shift;	2705	my $class = shift;
2519		2706
2520	my $self = $class->SUPER::new (	2707	my $self = $class->SUPER::new (
2521	aspect => 1,	2708	aspect => 1,
		2709	can_events => 0,
2522	@_,	2710	@_,
2523	);	2711	);
2524		2712
2525	if ($self->{anim} && $self->{animspeed}) {	2713	if ($self->{anim} && $self->{animspeed}) {
2526	Scalar::Util::weaken (my $widget = $self);	2714	Scalar::Util::weaken (my $widget = $self);
…		…
2541		2729
2542	sub size_request {	2730	sub size_request {
2543	(32, 8)	2731	(32, 8)
2544	}	2732	}
2545		2733
		2734	sub update {
		2735	my ($self) = @_;
		2736
		2737	return unless $self->{visible};
		2738
		2739	$self->SUPER::update;
		2740	}
		2741
2546	sub _draw {	2742	sub _draw {
2547	my ($self) = @_;	2743	my ($self) = @_;
2548		2744
2549	return unless $::CONN;#d# manage and cache textures differently	2745	return unless $::CONN;
2550		2746
2551	my $face;	2747	my $face;
2552		2748
2553	if ($self->{frame}) {	2749	if ($self->{frame}) {
2554	my $anim = $::CONN->{anim}[$self->{anim}];	2750	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2577	$self->SUPER::DESTROY;	2773	$self->SUPER::DESTROY;
2578	}	2774	}
2579		2775
2580	#############################################################################	2776	#############################################################################
2581		2777
2582	package CFClient::UI::InventoryItem;	2778	package CFClient::UI::Inventory;
2583		2779
2584	our @ISA = CFClient::UI::HBox::;	2780	our @ISA = CFClient::UI::ScrolledWindow::;
2585
2586	sub _item_to_desc {
2587	my ($item) = @_;
2588
2589	my $desc =
2590	$item->{nrof} < 2
2591	? $item->{name}
2592	: "$item->{nrof} × $item->{name_pl}";
2593
2594	$item->{flags} & Crossfire::Protocol::F_OPEN
2595	and $desc .= " (open)";
2596	$item->{flags} & Crossfire::Protocol::F_APPLIED
2597	and $desc .= " (applied)";
2598	$item->{flags} & Crossfire::Protocol::F_UNPAID
2599	and $desc .= " (unpaid)";
2600	$item->{flags} & Crossfire::Protocol::F_MAGIC
2601	and $desc .= " (magic)";
2602	$item->{flags} & Crossfire::Protocol::F_CURSED
2603	and $desc .= " (cursed)";
2604	$item->{flags} & Crossfire::Protocol::F_DAMNED
2605	and $desc .= " (damned)";
2606	$item->{flags} & Crossfire::Protocol::F_LOCKED
2607	and $desc .= " *";
2608
2609	$desc
2610	}
2611		2781
2612	sub new {	2782	sub new {
2613	my $class = shift;	2783	my $class = shift;
2614		2784
2615	my %args = @_;
2616
2617	my $item = delete $args{item};
2618
2619	my $desc = _item_to_desc ($item);
2620
2621	my $self = $class->SUPER::new (	2785	my $self = $class->SUPER::new (
2622	can_hover => 1,	2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2623	can_events => 1,
2624	tooltip => ((CFClient::UI::Label::escape $desc)
2625	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2626	connect_button_down => sub {
2627	my ($self, $ev, $x, $y) = @_;
2628
2629	# todo: maybe put examine on 1? but should just be a tooltip :(
2630	if ($ev->{button} == 1) {
2631	my $targ = $::CONN->{player}{tag};
2632
2633	if ($item->{container} == $::CONN->{player}{tag}) {
2634	$targ = $main::OPENCONT;
2635	}
2636
2637	$::CONN->send ("move $targ $item->{tag} 0");
2638	} elsif ($ev->{button} == 2) {
2639	$::CONN->send ("apply $item->{tag}");
2640	} elsif ($ev->{button} == 3) {
2641	my @menu_items = (
2642	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2643	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2644	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2645	(
2646	$item->{flags} & Crossfire::Protocol::F_LOCKED
2647	? (
2648	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2649	)
2650	: (
2651	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2652	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2653	)
2654	),
2655	);
2656
2657	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2658	}
2659
2660	1
2661	},
2662	%args
2663	);
2664
2665
2666	$self->add (new CFClient::UI::Face
2667	can_events => 0,
2668	face => $item->{face},
2669	anim => $item->{anim},
2670	animspeed => $item->{animspeed},
2671	);
2672
2673	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2674
2675	$self->{item} = $item;
2676
2677	$self->update_item;
2678
2679	$self
2680	}
2681
2682	sub update_item {
2683	my ($self) = @_;
2684
2685	my $desc = _item_to_desc ($self->{item});
2686
2687	$self->{name_lbl}->set_text ($desc);
2688	}
2689
2690	#############################################################################
2691
2692	package CFClient::UI::Inventory;
2693
2694	our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696	sub new {
2697	my $class = shift;
2698
2699	my $self = $class->SUPER::new (
2700	scrolled => (new CFClient::UI::VBox),
2701	@_,	2787	@_,
2702	);	2788	);
2703		2789
2704	$self	2790	$self
2705	}	2791	}
…		…
2715	or ($a->{name} cmp $b->{name})	2801	or ($a->{name} cmp $b->{name})
2716	} @$items;	2802	} @$items;
2717		2803
2718	$self->{real_items} = \@items;	2804	$self->{real_items} = \@items;
2719		2805
		2806	my $row = 0;
2720	for my $item (@items) {	2807	for my $item (@items) {
2721	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2808	CFClient::Item::update_widgets $item;
2722	$item->update_item ();
2723	}
2724		2809
2725	$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});
2726		2813
2727	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2814	$row++;
2728	}	2815	}
2729
2730	sub size_request {
2731	my ($self) = @_;
2732	($self->{req_w}, $self->{req_h});
2733	}	2816	}
2734		2817
2735	#############################################################################	2818	#############################################################################
2736		2819
2737	package CFClient::UI::Menu;	2820	package CFClient::UI::Menu;
…		…
2772		2855
2773	# 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)
2774	sub popup {	2857	sub popup {
2775	my ($self, $ev) = @_;	2858	my ($self, $ev) = @_;
2776		2859
2777	$self->emit ("popdown");	2860	$self->_emit ("popdown");
2778		2861
2779	# maybe save $GRAB? must be careful about events...	2862	# maybe save $GRAB? must be careful about events...
2780	$GRAB = $self;	2863	$GRAB = $self;
2781	$self->{button} = $ev->{button};	2864	$self->{button} = $ev->{button};
2782		2865
2783	$self->show;	2866	$self->show;
2784	$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);
2785	}	2868	}
2786		2869
2787	sub mouse_motion {	2870	sub mouse_motion {
2788	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2789		2872
…		…
2797		2880
2798	if ($ev->{button} == $self->{button}) {	2881	if ($ev->{button} == $self->{button}) {
2799	undef $GRAB;	2882	undef $GRAB;
2800	$self->hide;	2883	$self->hide;
2801		2884
2802	$self->emit ("popdown");	2885	$self->_emit ("popdown");
2803	$self->{hover}[1]->() if $self->{hover};	2886	$self->{hover}[1]->() if $self->{hover};
2804	}	2887	}
2805	}	2888	}
2806		2889
2807	#############################################################################	2890	#############################################################################
…		…
2869	sub add {	2952	sub add {
2870	my ($self, $text, %arg) = @_;	2953	my ($self, $text, %arg) = @_;
2871		2954
2872	$text =~ s/^\s+//;	2955	$text =~ s/^\s+//;
2873	$text =~ s/\s+$//;	2956	$text =~ s/\s+$//;
		2957
		2958	return unless $text;
2874		2959
2875	my $timeout = time + ((delete $arg{timeout}) || 60);	2960	my $timeout = time + ((delete $arg{timeout}) || 60);
2876		2961
2877	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2878		2963
…		…
2921	use CFClient::OpenGL;	3006	use CFClient::OpenGL;
2922		3007
2923	sub new {	3008	sub new {
2924	my $class = shift;	3009	my $class = shift;
2925		3010
2926	$class->SUPER::new (	3011	my $self = $class->SUPER::new (
		3012	visible => 1,
2927	@_,	3013	@_,
2928	)	3014	);
		3015
		3016	Scalar::Util::weaken ($self->{root} = $self);
		3017
		3018	$self
2929	}	3019	}
2930		3020
2931	sub configure {	3021	sub configure {
2932	my ($self, $x, $y, $w, $h) = @_;	3022	my ($self, $x, $y, $w, $h) = @_;
2933		3023
2934	$self->{w} = $w;	3024	$self->{w} = $w;
2935	$self->{h} = $h;	3025	$self->{h} = $h;
2936	}	3026	}
2937		3027
2938	sub check_size {	3028	sub reconfigure {
2939	my ($self) = @_;	3029	my ($self) = @_;
2940		3030
		3031	$self->SUPER::reconfigure;
		3032
2941	$self->size_allocate ($self->{w}, $self->{h})	3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
2942	if $self->{w};	3034	if $self->{w};
2943	}	3035	}
2944		3036
2945	sub size_request {	3037	sub size_request {
2946	my ($self) = @_;	3038	my ($self) = @_;
2947		3039
2948	($self->{w}, $self->{h})	3040	($self->{w}, $self->{h})
2949	}	3041	}
2950		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
2951	sub size_allocate {	3057	sub size_allocate {
2952	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h, $changed) = @_;
2953
2954	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2955	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2956
2957	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2958	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2959		3059
2960	for my $child ($self->children) {	3060	for my $child ($self->children) {
2961	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)};
2962		3062
2963	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3063	$X = $child->{force_x} if exists $child->{force_x};
2964	if exists $child->{req_x};	3064	$Y = $child->{force_y} if exists $child->{force_y};
2965		3065
2966	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3066	$X = _to_pixel $X, $W, $self->{w};
2967	if exists $child->{req_y};	3067	$Y = _to_pixel $Y, $H, $self->{h};
2968
2969	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2970	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2971		3068
2972	$child->configure ($X, $Y, $W, $H);	3069	$child->configure ($X, $Y, $W, $H);
2973	}	3070	}
2974	}	3071	}
2975		3072
…		…
2986	}	3083	}
2987		3084
2988	sub update {	3085	sub update {
2989	my ($self) = @_;	3086	my ($self) = @_;
2990		3087
2991	$self->check_size;
2992	$::WANT_REFRESH++;	3088	$::WANT_REFRESH++;
2993	}	3089	}
2994		3090
2995	sub add {	3091	sub add {
2996	my ($self, @children) = @_;	3092	my ($self, @children) = @_;
2997		3093
2998	for my $child (@children) {
2999	$child->{toplevel} = 1;	3094	$_->{is_toplevel} = 1
3000		3095	for @children;
3001	# integerise window positions
3002	$child->{x} = int $child->{x};
3003	$child->{y} = int $child->{y};
3004	}
3005		3096
3006	$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;
		3107
		3108	while (@children) {
		3109	my $w = pop @children;
		3110	push @children, $w->children;
		3111	$w->set_invisible;
		3112	}
3007	}	3113	}
3008		3114
3009	sub on_refresh {	3115	sub on_refresh {
3010	my ($self, $id, $cb) = @_;	3116	my ($self, $id, $cb) = @_;
3011		3117
…		…
3024	while ($self->{refresh_hook}) {	3130	while ($self->{refresh_hook}) {
3025	$_->()	3131	$_->()
3026	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{refresh_hook}};
3027	}	3133	}
3028		3134
3029	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3030	my @queue = ([], []);	3136	my @queue;
3031		3137
3032	for (;;) {	3138	while () {
3033	if ($self->{check_size}) {	3139	if ($self->{realloc}) {
3034	# heuristic: check containers last	3140	#TODO use array-of-depth approach
3035	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3141
3036	for values %{delete $self->{check_size}}	3142	@queue = sort { $a->{visible} <=> $b->{visible} }
		3143	@queue, values %{delete $self->{realloc}};
3037	}	3144	}
3038		3145
3039	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3146	my $widget = pop @queue || last;
3040		3147
3041	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3148	$widget->{visible} or last; # do not resize invisible widgets
3042	? @$widget{qw(user_w user_h)}	3149
3043	: $widget->size_request;	3150	my ($w, $h) = $widget->size_request;
3044		3151
3045	if (delete $widget->{force_alloc}	3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3046	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3047	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3154
3048		3155	$w = $widget->{force_w} if exists $widget->{force_w};
		3156	$h = $widget->{force_h} if exists $widget->{force_h};
		3157
3049	$widget->{req_w} = $w;	3158	$widget->{req_w} = $w;
3050	$widget->{req_h} = $h;	3159	$widget->{req_h} = $h;
3051		3160
3052	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3053		3162
3054	$widget->{parent}->check_size	3163	push @queue, $widget->{parent}
3055	if $widget->{parent};	3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3056	}
3057	}	3165	}
3058	}	3166	}
3059		3167
3060	while ($self->{size_alloc}) {	3168	while (my $size_alloc = delete $self->{size_alloc}) {
3061	for (values %{delete $self->{size_alloc}}) {	3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3062	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;
3063		3177
3064	$w = 0 if $w < 0;	3178	$w = 0 if $w < 0;
3065	$h = 0 if $h < 0;	3179	$h = 0 if $h < 0;
3066		3180
		3181	$w = int $w + 0.5;
		3182	$h = int $h + 0.5;
		3183
		3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3185
3067	$widget->{w} = $w;	3186	$widget->{w} = $w;
3068	$widget->{h} = $h;	3187	$widget->{h} = $h;
3069	$widget->size_allocate ($w, $h);	3188
3070	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h, $changed);
3071	}	3190	}
3072	}	3191	}
3073		3192
3074	while ($self->{post_alloc_hook}) {	3193	while ($self->{post_alloc_hook}) {
3075	$_->()	3194	$_->()

Diff Legend

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