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

Diff Legend

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