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.251 by root, Sun May 28 22:24:24 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
35		55
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;	57	if $x + $TOOLTIP->{w} > $::WIDTH;
38		58
39	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;	60	$TOOLTIP->realloc;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	176	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	177	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	178	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	179	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	180	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	181	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166	}	182	}
167
168	$widget->reconfigure;
169	}	183	}
		184
		185	reconfigure_widgets;
170	}	186	}
171		187
172	#############################################################################	188	#############################################################################
173		189
174	package CFClient::UI::Base;	190	package CFClient::UI::Base;
…		…
187	can_events => 1,	203	can_events => 1,
188	@_	204	@_
189	}, $class;	205	}, $class;
190		206
191	for (keys %$self) {	207	for (keys %$self) {
192	if (/^connect_(.*)$/) {	208	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	209	$self->connect ($1 => delete $self->{$_});
194	}	210	}
195	}	211	}
196		212
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198		214
		215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		216	$self->{req_x} = $layout->{x} * $::WIDTH;
		217	$self->{req_y} = $layout->{y} * $::HEIGHT;
		218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		220	}
		221
199	$self	222	$self
200	}	223	}
201		224
202	sub destroy {	225	sub destroy {
203	my ($self) = @_;	226	my ($self) = @_;
…		…
206	%$self = ();	229	%$self = ();
207	}	230	}
208		231
209	sub show {	232	sub show {
210	my ($self) = @_;	233	my ($self) = @_;
		234
211	return if $self->{parent};	235	return if $self->{parent};
212		236
213	$CFClient::UI::ROOT->add ($self);	237	$CFClient::UI::ROOT->add ($self);
214	}	238	}
215		239
216	sub hide {	240	sub center {
217	my ($self) = @_;	241	my ($self) = @_;
		242
		243	$CFClient::UI::ROOT->on_post_alloc (
		244	"center_$self" => sub {
		245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		246	},
		247	);
		248
		249	$self->update;
		250	}
		251
		252	sub set_visible {
		253	my ($self) = @_;
		254
		255	return if $self->{visible};
		256
		257	$self->{root} = $self->{parent}{root};
		258	$self->{visible} = $self->{parent}{visible} + 1;
		259
		260	$self->emit (visibility_change => 1);
		261
		262	$self->realloc unless exists $self->{req_w};
		263
		264	$_->set_visible for $self->children;
		265	}
		266
		267	sub set_invisible {
		268	my ($self) = @_;
		269
		270	return unless $self->{visible};
		271
		272	$_->set_invisible for $self->children;
		273
		274	delete $self->{root};
		275	delete $self->{visible};
218		276
219	undef $GRAB if $GRAB == $self;	277	undef $GRAB if $GRAB == $self;
220	undef $HOVER if $HOVER == $self;	278	undef $HOVER if $HOVER == $self;
		279
		280	CFClient::UI::check_tooltip
		281	if $TOOLTIP->{owner} == $self;
		282
		283	$self->focus_out;
		284
		285	$self->emit (visibility_change => 0);
		286	}
		287
		288	sub set_visibility {
		289	my ($self, $visible) = @_;
		290
		291	return if $self->{visible} == $visible;
		292
		293	$visible ? $self->hide
		294	: $self->show;
		295	}
		296
		297	sub toggle_visibility {
		298	my ($self) = @_;
		299
		300	$self->{visible}
		301	? $self->hide
		302	: $self->show;
		303	}
		304
		305	sub hide {
		306	my ($self) = @_;
		307
		308	$self->set_invisible;
221		309
222	$self->{parent}->remove ($self)	310	$self->{parent}->remove ($self)
223	if $self->{parent};	311	if $self->{parent};
224	}	312	}
225		313
…		…
234	}	322	}
235		323
236	sub set_size {	324	sub set_size {
237	my ($self, $w, $h) = @_;	325	my ($self, $w, $h) = @_;
238		326
239	$self->{user_w} = $w;	327	$self->{def_w} = $w;
240	$self->{user_h} = $h;	328	$self->{def_h} = $h;
241		329
242	$self->check_size;	330	$self->realloc;
243	}	331	}
244		332
245	sub size_request {	333	sub size_request {
246	require Carp;	334	require Carp;
247	Carp::confess "size_request is abstract";	335	Carp::confess "size_request is abstract";
…		…
267	$self->{y} = $y;	355	$self->{y} = $y;
268	$self->update;	356	$self->update;
269	}	357	}
270		358
271	if ($self->{w} != $w || $self->{h} != $h) {	359	if ($self->{w} != $w || $self->{h} != $h) {
		360	return unless $self->{visible};
		361
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
273	}	363	}
274	}	364	}
275		365
276	sub size_allocate {	366	sub size_allocate {
277	# nothing to be done	367	# nothing to be done
278	}	368	}
279		369
280	sub reconfigure {
281	my ($self) = @_;
282
283	$self->check_size (1);
284	$self->update;
285	}
286
287	sub children {	370	sub children {
288	}	371	}
289		372
290	sub set_max_size {	373	sub set_max_size {
291	my ($self, $w, $h) = @_;	374	my ($self, $w, $h) = @_;
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	377	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	378	}
296		379
297	sub set_tooltip {	380	sub set_tooltip {
298	my ($self, $tooltip) = @_;	381	my ($self, $tooltip) = @_;
		382
		383	$tooltip =~ s/^\s+//;
		384	$tooltip =~ s/\s+$//;
		385
		386	return if $self->{tooltip} eq $tooltip;
299		387
300	$self->{tooltip} = $tooltip;	388	$self->{tooltip} = $tooltip;
301		389
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	390	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	391	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	413	return if $FOCUS == $self;
326	return unless $self->{can_focus};	414	return unless $self->{can_focus};
327		415
328	my $focus = $FOCUS; $FOCUS = $self;	416	my $focus = $FOCUS; $FOCUS = $self;
329		417
330	$self->emit (focus_in => $focus);	418	$self->_emit (focus_in => $focus);
331		419
332	$focus->update if $focus;	420	$focus->update if $focus;
333	$FOCUS->update;	421	$FOCUS->update;
334	}	422	}
335		423
…		…
338		426
339	return unless $FOCUS == $self;	427	return unless $FOCUS == $self;
340		428
341	my $focus = $FOCUS; undef $FOCUS;	429	my $focus = $FOCUS; undef $FOCUS;
342		430
343	$self->emit (focus_out => $focus);	431	$self->_emit (focus_out => $focus);
344		432
345	$focus->update if $focus; #?	433	$focus->update if $focus; #?
		434
		435	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		436	unless $FOCUS;
346	}	437	}
347		438
348	sub mouse_motion { }	439	sub mouse_motion { }
349	sub button_up { }	440	sub button_up { }
350	sub key_down { }	441	sub key_down { }
351	sub key_up { }	442	sub key_up { }
352		443
353	sub button_down {	444	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	445	my ($self, $ev, $x, $y) = @_;
355		446
356	$self->focus_in;	447	$self->focus_in;
…		…
359	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
360	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
361	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
362	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
363	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		455
		456	sub find_widget {
		457	my ($self, $x, $y) = @_;
		458
		459	return () unless $self->{can_events};
		460
		461	return $self
		462	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		463	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		464
		465	()
		466	}
		467
		468	sub set_parent {
		469	my ($self, $parent) = @_;
		470
		471	Scalar::Util::weaken ($self->{parent} = $parent);
		472
		473	$self->set_visible if $parent->{visible};
		474
		475	$self->realloc;
		476	}
		477
		478	sub connect {
		479	my ($self, $signal, $cb) = @_;
		480
		481	push @{ $self->{signal_cb}{$signal} }, $cb;
		482	}
		483
		484	sub _emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		488	}
		489
		490	sub emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	$self->_emit ($signal, @args)
		494	|| $self->$signal (@args);
		495	}
		496
		497	sub visibility_change {
		498	#my ($self, $visible) = @_;
		499	}
		500
		501	sub realloc {
		502	my ($self) = @_;
		503
		504	return unless $self->{visible};
		505
		506	return if $self->{root}{realloc}{$self};
		507
		508	$self->{root}{realloc}{$self} = $self;
		509	$self->{root}->update;
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
364		518
365	sub draw {	519	sub draw {
366	my ($self) = @_;	520	my ($self) = @_;
367		521
368	return unless $self->{h} && $self->{w};	522	return unless $self->{h} && $self->{w};
…		…
390	if ($ENV{PCLIENT_DEBUG}) {	544	if ($ENV{PCLIENT_DEBUG}) {
391	glPushMatrix;	545	glPushMatrix;
392	glColor 1, 1, 0, 1;	546	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	548	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	549	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	550	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	551	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	552	glVertex 0 , $self->{h} - 1;
399	glEnd;	553	glEnd;
400	glPopMatrix;	554	glPopMatrix;
401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	555	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402	}	556	}
403	}	557	}
404		558
405	sub _draw {	559	sub _draw {
406	my ($self) = @_;	560	my ($self) = @_;
407		561
408	warn "no draw defined for $self\n";	562	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	}	563	}
460		564
461	sub DESTROY {	565	sub DESTROY {
462	my ($self) = @_;	566	my ($self) = @_;
463		567
…		…
560	$self->{children} = [	664	$self->{children} = [
561	sort { $a->{z} <=> $b->{z} }	665	sort { $a->{z} <=> $b->{z} }
562	@{$self->{children}}, @widgets	666	@{$self->{children}}, @widgets
563	];	667	];
564		668
565	$self->check_size (1);	669	$self->realloc;
566	$self->update;
567	}	670	}
568		671
569	sub children {	672	sub children {
570	@{ $_[0]{children} }	673	@{ $_[0]{children} }
571	}	674	}
…		…
576	delete $child->{parent};	679	delete $child->{parent};
577	$child->hide;	680	$child->hide;
578		681
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	682	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		683
581	$self->check_size;	684	$self->realloc;
582	$self->update;
583	}	685	}
584		686
585	sub clear {	687	sub clear {
586	my ($self) = @_;	688	my ($self) = @_;
587		689
…		…
591	for (@$children) {	693	for (@$children) {
592	delete $_->{parent};	694	delete $_->{parent};
593	$_->hide;	695	$_->hide;
594	}	696	}
595		697
596	$self->check_size;	698	$self->realloc;
597	$self->update;
598	}	699	}
599		700
600	sub find_widget {	701	sub find_widget {
601	my ($self, $x, $y) = @_;	702	my ($self, $x, $y) = @_;
602		703
…		…
655	sub size_request {	756	sub size_request {
656	$_[0]{children}[0]->size_request	757	$_[0]{children}[0]->size_request
657	}	758	}
658		759
659	sub size_allocate {	760	sub size_allocate {
660	my ($self, $w, $h) = @_;	761	my ($self, $w, $h, $changed) = @_;
661		762
662	$self->{children}[0]->configure (0, 0, $w, $h);	763	$self->{children}[0]->configure (0, 0, $w, $h);
663	}	764	}
664		765
665	#############################################################################	766	#############################################################################
…		…
682	$ROOT->on_post_alloc ($self => sub { $self->render_child });	783	$ROOT->on_post_alloc ($self => sub { $self->render_child });
683	$self->SUPER::update;	784	$self->SUPER::update;
684	}	785	}
685		786
686	sub size_allocate {	787	sub size_allocate {
687	my ($self, $w, $h) = @_;	788	my ($self, $w, $h, $changed) = @_;
688		789
689	$self->SUPER::size_allocate ($w, $h);	790	$self->SUPER::size_allocate ($w, $h, $changed);
690	$self->update;	791	$self->update
		792	if $changed;
691	}	793	}
692		794
693	sub _render {	795	sub _render {
694	$_[0]{children}[0]->draw;	796	$_[0]{children}[0]->draw;
695	}	797	}
…		…
726		828
727	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
728		830
729	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
730		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
731	sub size_request {	843	sub size_request {
732	my ($self) = @_;	844	my ($self) = @_;
733		845
734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		847
737	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
738	}	852	}
739		853
740	sub size_allocate {	854	sub size_allocate {
741	my ($self, $w, $h) = @_;	855	my ($self, $w, $h, $changed) = @_;
742		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
743	$self->update;	861	$self->update;
744	}	862	}
745		863
746	sub set_offset {	864	sub set_offset {
747	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
798	my $class = shift;	916	my $class = shift;
799		917
800	my $self;	918	my $self;
801		919
802	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
803	vertical => 1,	921	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	923	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
807	},	925	},
808	;	926	;
809		927
810	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	929	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
816	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});	935	$self->add ($self->{vp});
818	$self->add ($self->{slider});	936	$self->add ($self->{slider});
819		937
820	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h, $changed) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h, $changed);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821	}	958	}
822		959
823	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	961	# update viewport offset on scroll
825		962
…		…
876	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877		1014
878	sub new {	1015	sub new {
879	my $class = shift;	1016	my $class = shift;
880		1017
881	# TODO: user_x, user_y, overwrite moveto?
882
883	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1021	border => 0.6,
887	toplevel => 1,	1022	is_toplevel => 1,
888	can_events => 1,	1023	can_events => 1,
889	@_	1024	@_
890	);	1025	);
891		1026
892	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
893	align => 0,	1028	align => 0,
…		…
912	$h + $self->border * 2,	1047	$h + $self->border * 2,
913	)	1048	)
914	}	1049	}
915		1050
916	sub size_allocate {	1051	sub size_allocate {
917	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h, $changed) = @_;
		1053
		1054	return unless $changed;
918		1055
919	$h -= List::Util::max 0, $self->border * 2;	1056	$h -= List::Util::max 0, $self->border * 2;
920	$w -= List::Util::max 0, $self->border * 2;	1057	$w -= List::Util::max 0, $self->border * 2;
921		1058
922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
946	my ($ev, $x, $y) = @_;	1083	my ($ev, $x, $y) = @_;
947		1084
948	my $dx = $ev->{x} - $ox;	1085	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1086	my $dy = $ev->{y} - $oy;
950		1087
		1088	$self->{user_x} = $wx + $dx * $mx;
		1089	$self->{user_y} = $wy + $dy * $my;
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1092	$self->move ($self->{user_x}, $self->{user_y});
954	$self->check_size;	1093	$self->realloc;
955	};	1094	};
956		1095
957	} elsif ($lr ^ $td) {	1096	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});
959	my ($bx, $by) = ($self->{x}, $self->{y});	1098	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
961	$self->{motion} = sub {	1100	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
963		1102
964	($x, $y) = ($ev->{x}, $ev->{y});	1103	($x, $y) = ($ev->{x}, $ev->{y});
965		1104
966	$self->move ($bx + $x - $ox, $by + $y - $oy);	1105	$self->{user_x} = $bx + $x - $ox;
		1106	$self->{user_y} = $by + $y - $oy;
		1107
		1108	$self->move ($self->{user_x}, $self->{user_y});
967	$self->update;	1109	$self->realloc;
968	};	1110	};
969	}	1111	}
970	}	1112	}
971		1113
972	sub button_up {	1114	sub button_up {
…		…
1033	sub new {	1175	sub new {
1034	my $class = shift;	1176	my $class = shift;
1035		1177
1036	$class->SUPER::new (	1178	$class->SUPER::new (
1037	col_expand => [],	1179	col_expand => [],
1038	@_	1180	@_,
1039	)	1181	)
		1182	}
		1183
		1184	sub children {
		1185	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1186	}
1041		1187
1042	sub add {	1188	sub add {
1043	my ($self, $x, $y, $child) = @_;	1189	my ($self, $x, $y, $child) = @_;
1044		1190
1045	$child->set_parent ($self);	1191	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1192	$self->{children}[$y][$x] = $child;
1047		1193
1048	$child->check_size;	1194	$self->realloc;
1049	}	1195	}
1050		1196
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# TODO: move to container class maybe? send childs a signal on removal?	1197	# TODO: move to container class maybe? send children a signal on removal?
1056	sub clear {	1198	sub clear {
1057	my ($self) = @_;	1199	my ($self) = @_;
1058		1200
1059	my @children = $self->children;	1201	my @children = $self->children;
1060	delete $self->{children};	1202	delete $self->{children};
…		…
1062	for (@children) {	1204	for (@children) {
1063	delete $_->{parent};	1205	delete $_->{parent};
1064	$_->hide;	1206	$_->hide;
1065	}	1207	}
1066		1208
1067	$self->update;	1209	$self->realloc;
1068	}	1210	}
1069		1211
1070	sub get_wh {	1212	sub get_wh {
1071	my ($self) = @_;	1213	my ($self) = @_;
1072		1214
…		…
1099	(sum @$hs),	1241	(sum @$hs),
1100	)	1242	)
1101	}	1243	}
1102		1244
1103	sub size_allocate {	1245	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h, $changed) = @_;
1105		1247
1106	my ($ws, $hs) = $self->get_wh;	1248	my ($ws, $hs) = $self->get_wh;
1107		1249
1108	my $req_w = sum @$ws;	1250	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1251	my $req_h = (sum @$hs) || 1;
1110		1252
1111	# TODO: nicer code && do row_expand	1253	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1254	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1255	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1256	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1310	}
1169	}	1311	}
1170		1312
1171	#############################################################################	1313	#############################################################################
1172		1314
		1315	package CFClient::UI::Box;
		1316
		1317	our @ISA = CFClient::UI::Container::;
		1318
		1319	sub size_request {
		1320	my ($self) = @_;
		1321
		1322	$self->{vertical}
		1323	? (
		1324	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1325	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1326	)
		1327	: (
		1328	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	}
		1332
		1333	sub size_allocate {
		1334	my ($self, $w, $h, $changed) = @_;
		1335
		1336	my $space = $self->{vertical} ? $h : $w;
		1337	my $children = $self->{children};
		1338
		1339	my @req;
		1340
		1341	if ($self->{homogeneous}) {
		1342	@req = ($space / (@$children || 1)) x @$children;
		1343	} else {
		1344	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1345	my $req = List::Util::sum @req;
		1346
		1347	if ($req > $space) {
		1348	# ah well, not enough space
		1349	$_ *= $space / $req for @req;
		1350	} else {
		1351	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1352
		1353	$space = ($space - $req) / $expand; # remaining space to give away
		1354
		1355	$req[$_] += $space * $children->[$_]{expand}
		1356	for 0 .. $#$children;
		1357	}
		1358	}
		1359
		1360	CFClient::UI::harmonize \@req;
		1361
		1362	my $pos = 0;
		1363	for (0 .. $#$children) {
		1364	my $alloc = $req[$_];
		1365	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1366
		1367	$pos += $alloc;
		1368	}
		1369
		1370	1
		1371	}
		1372
		1373	#############################################################################
		1374
1173	package CFClient::UI::HBox;	1375	package CFClient::UI::HBox;
1174		1376
1175	# TODO: wrap into common Box base class
1176
1177	our @ISA = CFClient::UI::Container::;	1377	our @ISA = CFClient::UI::Box::;
1178		1378
1179	sub size_request {	1379	sub new {
1180	my ($self) = @_;	1380	my $class = shift;
1181		1381
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1382	$class->SUPER::new (
1183		1383	vertical => 0,
1184	(	1384	@_,
1185	(List::Util::sum map $_->[0], @alloc),
1186	(List::Util::max map $_->[1], @alloc),
1187	)	1385	)
1188	}	1386	}
1189		1387
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	#############################################################################	1388	#############################################################################
1232		1389
1233	package CFClient::UI::VBox;	1390	package CFClient::UI::VBox;
1234		1391
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Box::;
1238		1393
1239	sub size_request {	1394	sub new {
1240	my ($self) = @_;	1395	my $class = shift;
1241		1396
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$class->SUPER::new (
1243		1398	vertical => 1,
1244	(	1399	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1400	)
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	}	1401	}
1288		1402
1289	#############################################################################	1403	#############################################################################
1290		1404
1291	package CFClient::UI::Label;	1405	package CFClient::UI::Label;
…		…
1354	$self->{text} = "T$text";	1468	$self->{text} = "T$text";
1355		1469
1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357	$self->{layout}->set_text ($text);	1471	$self->{layout}->set_text ($text);
1358		1472
1359	$self->update;	1473	$self->realloc;
1360	$self->check_size;
1361	}	1474	}
1362		1475
1363	sub set_markup {	1476	sub set_markup {
1364	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1365		1478
…		…
1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370		1483
1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1373		1486
1374	$self->update;	1487	$self->realloc;
1375	$self->check_size;
1376	}	1488	}
1377		1489
1378	sub size_request {	1490	sub size_request {
1379	my ($self) = @_;	1491	my ($self) = @_;
1380		1492
…		…
1401	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1402	)	1514	)
1403	}	1515	}
1404		1516
1405	sub size_allocate {	1517	sub size_allocate {
1406	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1407		1519
1408	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1409	}	1522	}
1410		1523
1411	sub set_fontsize {	1524	sub set_fontsize {
1412	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1413		1526
1414	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1415	delete $self->{texture};	1528	delete $self->{texture};
1416		1529
1417	$self->update;	1530	$self->realloc;
1418	$self->check_size;
1419	}	1531	}
1420		1532
1421	sub _draw {	1533	sub _draw {
1422	my ($self) = @_;	1534	my ($self) = @_;
1423		1535
…		…
1475	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1476	can_hover => 1,	1588	can_hover => 1,
1477	can_focus => 1,	1589	can_focus => 1,
1478	valign => 0,	1590	valign => 0,
1479	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1480	@_	1593	@_
1481	)	1594	)
1482	}	1595	}
1483		1596
1484	sub _set_text {	1597	sub _set_text {
…		…
1494	$self->{text} = $text;	1607	$self->{text} = $text;
1495		1608
1496	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1498		1611
1499	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1500	}	1613	}
1501		1614
1502	sub set_text {	1615	sub set_text {
1503	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1504		1617
1505	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1506	$self->_set_text ($text);	1619	$self->_set_text ($text);
1507	$self->update;	1620
1508	$self->check_size;	1621	$self->realloc;
1509	}	1622	}
1510		1623
1511	sub get_text {	1624	sub get_text {
1512	$_[0]{text}	1625	$_[0]{text}
1513	}	1626	}
…		…
1516	my ($self) = @_;	1629	my ($self) = @_;
1517		1630
1518	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1519		1632
1520	($w + 1, $h) # add 1 for cursor	1633	($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	}	1634	}
1528		1635
1529	sub key_down {	1636	sub key_down {
1530	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1531		1638
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1658	$self->_emit ('escape');
1552	} elsif ($uni) {	1659	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1554	}	1661	}
1555		1662
1556	$self->_set_text ($text);	1663	$self->_set_text ($text);
1557	$self->update;	1664
1558	$self->check_size;	1665	$self->realloc;
1559	}	1666	}
1560		1667
1561	sub focus_in {	1668	sub focus_in {
1562	my ($self) = @_;	1669	my ($self) = @_;
1563		1670
…		…
1643	if ($sym == 13) {	1750	if ($sym == 13) {
1644	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1649	$self->update;	1756	$self->update;
1650		1757
1651	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1701	can_events => 1,	1808	can_events => 1,
1702	@_	1809	@_
1703	)	1810	)
1704	}	1811	}
1705		1812
		1813	sub activate { }
		1814
1706	sub button_up {	1815	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1708		1817
		1818	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");
1712	}
1713	}	1821	}
1714		1822
1715	sub _draw {	1823	sub _draw {
1716	my ($self) = @_;	1824	my ($self) = @_;
1717		1825
…		…
1769	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1770		1878
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1773	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1775	}	1883	}
1776	}	1884	}
1777		1885
1778	sub _draw {	1886	sub _draw {
1779	my ($self) = @_;	1887	my ($self) = @_;
…		…
2054	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2165	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2166	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2168	req_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2169	req_h => $::WIDTH / 80,
2062	vertical => 0,	2170	vertical => 0,
2063	can_hover => 1,	2171	can_hover => 1,
2064	inner_pad => 0.02,	2172	inner_pad => 0.02,
…		…
2069	$self->update;	2177	$self->update;
2070		2178
2071	$self	2179	$self
2072	}	2180	}
2073		2181
		2182	sub changed { }
		2183
		2184	sub set_range {
		2185	my ($self, $range) = @_;
		2186
		2187	($range, $self->{range}) = ($self->{range}, $range);
		2188
		2189	$self->update
		2190	if "@$range" ne "@{$self->{range}}";
		2191	}
		2192
2074	sub set_value {	2193	sub set_value {
2075	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2076		2195
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2197
2079	$hi = $lo + 1 if $hi <= $lo;	2198	$hi = $lo + 1 if $hi <= $lo;
2080		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
2081	$value = $lo if $value < $lo;	2202	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2203	$value = $hi - $page if $value > $hi - $page;
2083		2204
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2206	if $unit;
2086		2207
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2209
2091	if ($value != $old_value) {	2210	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2093	$self->update;	2212	$self->update;
2094	}	2213	}
2095	}	2214	}
2096		2215
2097	sub size_request {	2216	sub size_request {
…		…
2105		2224
2106	sub button_down {	2225	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2226	my ($self, $ev, $x, $y) = @_;
2108		2227
2109	$self->SUPER::button_down ($ev, $x, $y);	2228	$self->SUPER::button_down ($ev, $x, $y);
		2229
		2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2231
2110	$self->mouse_motion ($ev, $x, $y);	2232	$self->mouse_motion ($ev, $x, $y);
2111	}	2233	}
2112		2234
2113	sub mouse_motion {	2235	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2236	my ($self, $ev, $x, $y) = @_;
…		…
2116	if ($GRAB == $self) {	2238	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2239	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2240
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2241	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2242
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2244
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2124	}	2246	}
2125	}	2247	}
2126		2248
2127	sub update {	2249	sub update {
2128	my ($self) = @_;	2250	my ($self) = @_;
2129		2251
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2253	$self->set_value ($self->{range}[0]);
2132		2254
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2255	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2256	my $range = ($hi - $page - $lo) || 1e-100;
2134		2257
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2258	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2259
2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2260	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2261	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138		2262
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2263	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2264	$value = $value * $self->{scale} + $self->{offset};
2141		2265
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;	2266	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2267	$self->{knob_w} = $knob_w;
2149	});	2268	});
2150		2269
2151	$self->SUPER::update;	2270	$self->SUPER::update;
2152	}	2271	}
2153		2272
…		…
2177	# draw handle	2296	# draw handle
2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2297	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179		2298
2180	glDisable GL_TEXTURE_2D;	2299	glDisable GL_TEXTURE_2D;
2181	}	2300	}
		2301
		2302	#############################################################################
		2303
		2304	package CFClient::UI::ValSlider;
		2305
		2306	our @ISA = CFClient::UI::HBox::;
		2307
		2308	sub new {
		2309	my ($class, %arg) = @_;
		2310
		2311	my $range = delete $arg{range};
		2312
		2313	my $self = $class->SUPER::new (
		2314	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2315	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2316	to_value => sub { shift },
		2317	from_value => sub { shift },
		2318	%arg,
		2319	);
		2320
		2321	$self->{slider}->connect (changed => sub {
		2322	my ($self, $value) = @_;
		2323	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2324	$self->{parent}->emit (changed => $value);
		2325	});
		2326
		2327	# $self->{entry}->connect (changed => sub {
		2328	# my ($self, $value) = @_;
		2329	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2330	# $self->{parent}->emit (changed => $value);
		2331	# });
		2332
		2333	$self->add ($self->{slider}, $self->{entry});
		2334
		2335	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2336
		2337	$self
		2338	}
		2339
		2340	sub set_range { shift->{slider}->set_range (@_) }
		2341	sub set_value { shift->{slider}->set_value (@_) }
2182		2342
2183	#############################################################################	2343	#############################################################################
2184		2344
2185	package CFClient::UI::TextView;	2345	package CFClient::UI::TextView;
2186		2346
…		…
2217	$self->{fontsize} = $fontsize;	2377	$self->{fontsize} = $fontsize;
2218	$self->reflow;	2378	$self->reflow;
2219	}	2379	}
2220		2380
2221	sub size_allocate {	2381	sub size_allocate {
2222	my ($self, $w, $h) = @_;	2382	my ($self, $w, $h, $changed) = @_;
2223		2383
2224	$self->SUPER::size_allocate ($w, $h);	2384	$self->SUPER::size_allocate ($w, $h, $changed);
		2385
		2386	return unless $changed;
2225		2387
2226	$self->{layout}->set_font ($self->{font}) if $self->{font};	2388	$self->{layout}->set_font ($self->{font}) if $self->{font};
2227	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2390	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2391
2230	$self->reflow;	2392	$self->reflow;
2231	}	2393	}
2232		2394
2233	sub text_height {	2395	sub text_size {
2234	my ($self, $text, $indent) = @_;	2396	my ($self, $text, $indent) = @_;
2235		2397
2236	my $layout = $self->{layout};	2398	my $layout = $self->{layout};
2237		2399
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2400	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2401	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2402	$layout->set_markup ($text);
2241		2403
2242	($layout->size)[1]	2404	$layout->size
2243	}	2405	}
2244		2406
2245	sub reflow {	2407	sub reflow {
2246	my ($self) = @_;	2408	my ($self) = @_;
2247		2409
2248	$self->{need_reflow}++;	2410	$self->{need_reflow}++;
2249	$self->update;	2411	$self->update;
2250	}	2412	}
2251		2413
		2414	sub set_offset {
		2415	my ($self, $offset) = @_;
		2416
		2417	# todo: base offset on lines or so, not on pixels
		2418	$self->{children}[1]->set_value ($offset);
		2419	}
		2420
		2421	sub clear {
		2422	my ($self) = @_;
		2423
		2424	$self->{par} = [];
		2425	$self->{height} = 0;
		2426	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2427	}
		2428
2252	sub add_paragraph {	2429	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2430	my ($self, $color, $text, $indent) = @_;
2254		2431
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2432	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2433	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2434	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2435	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2436	}
2262		2437
2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2438	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264	$self->{children}[1]->update;
2265	}	2439	}
2266		2440
2267	sub update {	2441	sub update {
2268	my ($self) = @_;	2442	my ($self) = @_;
2269		2443
…		…
2272	return unless $self->{h} > 0;	2446	return unless $self->{h} > 0;
2273		2447
2274	delete $self->{texture};	2448	delete $self->{texture};
2275		2449
2276	$ROOT->on_post_alloc ($self, sub {	2450	$ROOT->on_post_alloc ($self, sub {
		2451	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2452
2277	if (delete $self->{need_reflow}) {	2453	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2454	my $height = 0;
2279		2455
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2456	my $layout = $self->{layout};
		2457
		2458	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2459
2281	for @{$self->{par}};	2460	for (@{$self->{par}}) {
		2461	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2462	$layout->set_width ($W - $_->[3]);
		2463	$layout->set_markup ($_->[4]);
		2464	my ($w, $h) = $layout->size;
		2465	$_->[0] = $w + $_->[3];
		2466	$_->[1] = $h;
		2467	}
		2468
		2469	$height += $_->[1];
		2470	}
2282		2471
2283	$self->{height} = $height;	2472	$self->{height} = $height;
2284		2473
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2474	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2475
2288	delete $self->{texture};	2476	delete $self->{texture};
2289	}	2477	}
2290		2478
2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2479	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2480	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2481	glClear GL_COLOR_BUFFER_BIT;
2294		2482
2295	my $top = int $self->{children}[1]{range}[0];	2483	my $top = int $self->{children}[1]{range}[0];
2296		2484
2297	my $y0 = $top;	2485	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2486	my $y1 = $top + $H;
2299		2487
2300	my $y = 0;	2488	my $y = 0;
2301		2489
2302	my $layout = $self->{layout};	2490	my $layout = $self->{layout};
2303		2491
2304	$layout->set_font ($self->{font}) if $self->{font};	2492	$layout->set_font ($self->{font}) if $self->{font};
2305		2493
2306	glEnable GL_BLEND;	2494	glEnable GL_BLEND;
		2495	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2496	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2497
2309	for my $par (@{$self->{par}}) {	2498	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2499	my $h = $par->[1];
2311		2500
2312	if ($y0 < $y + $h && $y < $y1) {	2501	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2502	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2503	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2504	$layout->set_markup ($par->[4]);
2316		2505
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2506	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2507
2319	glRasterPos $par->[2], $y - $y0;	2508	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2509	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2510	}
2322		2511
2323	$y += $h;	2512	$y += $h;
2324	}	2513	}
…		…
2391		2580
2392	sub new {	2581	sub new {
2393	my $class = shift;	2582	my $class = shift;
2394		2583
2395	my $self = $class->SUPER::new (	2584	my $self = $class->SUPER::new (
2396	state => 0,	2585	state => 0,
2397	connect_activate => \&toggle_flopper,	2586	on_activate => \&toggle_flopper,
2398	@_	2587	@_
2399	);	2588	);
2400		2589
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2590	$self
2407	}	2591	}
2408		2592
2409	sub toggle_flopper {	2593	sub toggle_flopper {
2410	my ($self) = @_;	2594	my ($self) = @_;
2411		2595
2412	# TODO: use animation	2596	$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	}	2597	}
2424		2598
2425	#############################################################################	2599	#############################################################################
2426		2600
2427	package CFClient::UI::Tooltip;	2601	package CFClient::UI::Tooltip;
…		…
2459		2633
2460	($w + 4, $h + 4)	2634	($w + 4, $h + 4)
2461	}	2635	}
2462		2636
2463	sub size_allocate {	2637	sub size_allocate {
2464	my ($self, $w, $h) = @_;	2638	my ($self, $w, $h, $changed) = @_;
2465		2639
		2640	return unless $changed;
		2641
2466	$self->SUPER::size_allocate ($w - 4, $h - 4);	2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2467	}	2643	}
2468		2644
2469	sub _draw {	2645	sub _draw {
2470	my ($self) = @_;	2646	my ($self) = @_;
2471		2647
…		…
2503		2679
2504	sub new {	2680	sub new {
2505	my $class = shift;	2681	my $class = shift;
2506		2682
2507	my $self = $class->SUPER::new (	2683	my $self = $class->SUPER::new (
2508	aspect => 1,	2684	aspect => 1,
		2685	can_events => 0,
2509	@_,	2686	@_,
2510	);	2687	);
2511		2688
2512	if ($self->{anim} && $self->{animspeed}) {	2689	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2690	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2716	}
2540		2717
2541	sub _draw {	2718	sub _draw {
2542	my ($self) = @_;	2719	my ($self) = @_;
2543		2720
2544	return unless $::CONN;#d# manage and cache textures differently	2721	return unless $::CONN;
2545		2722
2546	my $face;	2723	my $face;
2547		2724
2548	if ($self->{frame}) {	2725	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2726	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2572	$self->SUPER::DESTROY;	2749	$self->SUPER::DESTROY;
2573	}	2750	}
2574		2751
2575	#############################################################################	2752	#############################################################################
2576		2753
2577	package CFClient::UI::InventoryItem;	2754	package CFClient::UI::Inventory;
2578		2755
2579	our @ISA = CFClient::UI::HBox::;	2756	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		2757
2607	sub new {	2758	sub new {
2608	my $class = shift;	2759	my $class = shift;
2609		2760
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 (	2761	my $self = $class->SUPER::new (
2617	can_hover => 1,	2762	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	@_,	2763	@_,
2697	);	2764	);
2698		2765
2699	$self	2766	$self
2700	}	2767	}
…		…
2710	or ($a->{name} cmp $b->{name})	2777	or ($a->{name} cmp $b->{name})
2711	} @$items;	2778	} @$items;
2712		2779
2713	$self->{real_items} = \@items;	2780	$self->{real_items} = \@items;
2714		2781
		2782	my $row = 0;
2715	for my $item (@items) {	2783	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2784	CFClient::Item::update_widgets $item;
2717	$item->update_item ();
2718	}
2719		2785
2720	$self->{scrolled}->add (@items);	2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2721		2789
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2790	$row++;
2723	}	2791	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}	2792	}
2729		2793
2730	#############################################################################	2794	#############################################################################
2731		2795
2732	package CFClient::UI::Menu;	2796	package CFClient::UI::Menu;
…		…
2767		2831
2768	# popup given the event (must be a mouse button down event currently)	2832	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2833	sub popup {
2770	my ($self, $ev) = @_;	2834	my ($self, $ev) = @_;
2771		2835
2772	$self->emit ("popdown");	2836	$self->_emit ("popdown");
2773		2837
2774	# maybe save $GRAB? must be careful about events...	2838	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2839	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2840	$self->{button} = $ev->{button};
2777		2841
…		…
2792		2856
2793	if ($ev->{button} == $self->{button}) {	2857	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2858	undef $GRAB;
2795	$self->hide;	2859	$self->hide;
2796		2860
2797	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2862	$self->{hover}[1]->() if $self->{hover};
2799	}	2863	}
2800	}	2864	}
2801		2865
2802	#############################################################################	2866	#############################################################################
…		…
2864	sub add {	2928	sub add {
2865	my ($self, $text, %arg) = @_;	2929	my ($self, $text, %arg) = @_;
2866		2930
2867	$text =~ s/^\s+//;	2931	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	2932	$text =~ s/\s+$//;
		2933
		2934	return unless $text;
2869		2935
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	2936	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		2937
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		2939
…		…
2916	use CFClient::OpenGL;	2982	use CFClient::OpenGL;
2917		2983
2918	sub new {	2984	sub new {
2919	my $class = shift;	2985	my $class = shift;
2920		2986
2921	$class->SUPER::new (	2987	my $self = $class->SUPER::new (
		2988	visible => 1,
2922	@_,	2989	@_,
2923	)	2990	);
		2991
		2992	Scalar::Util::weaken ($self->{root} = $self);
		2993
		2994	$self
2924	}	2995	}
2925		2996
2926	sub configure {	2997	sub configure {
2927	my ($self, $x, $y, $w, $h) = @_;	2998	my ($self, $x, $y, $w, $h) = @_;
2928		2999
2929	$self->{w} = $w;	3000	$self->{w} = $w;
2930	$self->{h} = $h;	3001	$self->{h} = $h;
2931	}	3002	}
2932		3003
2933	sub check_size {	3004	sub reconfigure {
2934	my ($self) = @_;	3005	my ($self) = @_;
2935		3006
		3007	$self->SUPER::reconfigure;
		3008
2936	$self->size_allocate ($self->{w}, $self->{h})	3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
2937	if $self->{w};	3010	if $self->{w};
2938	}	3011	}
2939		3012
2940	sub size_request {	3013	sub size_request {
2941	my ($self) = @_;	3014	my ($self) = @_;
2942		3015
2943	($self->{w}, $self->{h})	3016	($self->{w}, $self->{h})
2944	}	3017	}
2945		3018
2946	sub size_allocate {	3019	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3020	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		3021
2955	for my $child ($self->children) {	3022	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3024
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2959	if exists $child->{req_x};	3026	if exists $child->{req_x};
2960		3027
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2962	if exists $child->{req_y};	3029	if exists $child->{req_y};
2963		3030
		3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3032
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3035
2967	$child->configure ($X, $Y, $W, $H);	3036	$child->configure ($X, $Y, $W, $H);
2968	}	3037	}
…		…
2981	}	3050	}
2982		3051
2983	sub update {	3052	sub update {
2984	my ($self) = @_;	3053	my ($self) = @_;
2985		3054
2986	$self->check_size;
2987	$::WANT_REFRESH++;	3055	$::WANT_REFRESH++;
2988	}	3056	}
2989		3057
2990	sub add {	3058	sub add {
2991	my ($self, @children) = @_;	3059	my ($self, @children) = @_;
2992		3060
2993	for my $child (@children) {	3061	for my $child (@children) {
2994	$child->{toplevel} = 1;	3062	$child->{is_toplevel} = 1;
2995		3063
2996	# integerise window positions	3064	# integerise window positions
2997	$child->{x} = int $child->{x};	3065	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};	3066	$child->{y} = int $child->{y};
2999	}	3067	}
3000		3068
3001	$self->SUPER::add (@children);	3069	$self->SUPER::add (@children);
		3070	}
		3071
		3072	sub remove {
		3073	my ($self, @children) = @_;
		3074
		3075	$self->SUPER::remove (@children);
3002		3076
3003	while (@children) {	3077	while (@children) {
3004	my $w = pop @children;	3078	my $w = pop @children;
3005	push @children, $w->children;	3079	push @children, $w->children;
3006	$w->{visible} = 1;	3080	$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	}	3081	}
3020	}	3082	}
3021		3083
3022	sub on_refresh {	3084	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3085	my ($self, $id, $cb) = @_;
…		…
3037	while ($self->{refresh_hook}) {	3099	while ($self->{refresh_hook}) {
3038	$_->()	3100	$_->()
3039	for values %{delete $self->{refresh_hook}};	3101	for values %{delete $self->{refresh_hook}};
3040	}	3102	}
3041		3103
3042	if ($self->{check_size}) {	3104	if ($self->{realloc}) {
3043	my @queue = ([], []);	3105	my @queue;
3044		3106
3045	for (;;) {	3107	while () {
3046	if ($self->{check_size}) {	3108	if ($self->{realloc}) {
3047	# heuristic: check containers last	3109	#TODO use array-of-depth approach
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3110
3049	for values %{delete $self->{check_size}}	3111	@queue = sort { $a->{visible} <=> $b->{visible} }
		3112	@queue, values %{delete $self->{realloc}};
3050	}	3113	}
3051		3114
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3115	my $widget = pop @queue || last;
3053		3116
		3117	$widget->{visible} or last; # do not resize invisible widgets
		3118
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3055	? @$widget{qw(user_w user_h)}	3120	? @$widget{qw(def_w def_h)}
3056	: $widget->size_request;	3121	: $widget->size_request;
3057		3122
3058	if (delete $widget->{force_alloc}
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061		3124
3062	$widget->{req_w} = $w;	3125	$widget->{req_w} = $w;
3063	$widget->{req_h} = $h;	3126	$widget->{req_h} = $h;
3064		3127
3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3066		3129
3067	$widget->{parent}->check_size	3130	push @queue, $widget->{parent}
3068	if $widget->{parent};	3131	if $widget->{parent};
3069	}
3070	}	3132	}
3071	}	3133	}
3072		3134
3073	while ($self->{size_alloc}) {	3135	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3075	my ($widget, $w, $h) = @$_;	3137	values %$size_alloc;
		3138
		3139	while () {
		3140	my ($widget, $w, $h) = @{ pop @queue or last };
3076		3141
3077	$w = 0 if $w < 0;	3142	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3143	$h = 0 if $h < 0;
3079		3144
3080	$widget->{w} = $w;	3145	$widget->{w} = $w;
3081	$widget->{h} = $h;	3146	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);
3083	$widget->emit (size_allocate => $w, $h);	3147	$widget->emit (size_allocate => $w, $h, 1);
3084	}	3148	}
3085	}	3149	}
3086		3150
3087	while ($self->{post_alloc_hook}) {	3151	while ($self->{post_alloc_hook}) {
3088	$_->()	3152	$_->()

Diff Legend

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