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.220 by root, Mon May 22 03:28:55 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) = @_;
…		…
212	return if $self->{parent};	235	return if $self->{parent};
213		236
214	$CFClient::UI::ROOT->add ($self);	237	$CFClient::UI::ROOT->add ($self);
215	}	238	}
216		239
217	sub hide {	240	sub center {
218	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};
219		276
220	undef $GRAB if $GRAB == $self;	277	undef $GRAB if $GRAB == $self;
221	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;
222		309
223	$self->{parent}->remove ($self)	310	$self->{parent}->remove ($self)
224	if $self->{parent};	311	if $self->{parent};
225	}	312	}
226		313
…		…
235	}	322	}
236		323
237	sub set_size {	324	sub set_size {
238	my ($self, $w, $h) = @_;	325	my ($self, $w, $h) = @_;
239		326
240	$self->{user_w} = $w;	327	$self->{def_w} = $w;
241	$self->{user_h} = $h;	328	$self->{def_h} = $h;
242		329
243	$self->check_size;	330	$self->realloc;
244	}	331	}
245		332
246	sub size_request {	333	sub size_request {
247	require Carp;	334	require Carp;
248	Carp::confess "size_request is abstract";	335	Carp::confess "size_request is abstract";
…		…
268	$self->{y} = $y;	355	$self->{y} = $y;
269	$self->update;	356	$self->update;
270	}	357	}
271		358
272	if ($self->{w} != $w || $self->{h} != $h) {	359	if ($self->{w} != $w || $self->{h} != $h) {
		360	return unless $self->{visible};
		361
273	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
274	}	363	}
275	}	364	}
276		365
277	sub size_allocate {	366	sub size_allocate {
278	# nothing to be done	367	# nothing to be done
279	}	368	}
280		369
281	sub reconfigure {
282	my ($self) = @_;
283
284	$self->check_size (1);
285	$self->update;
286	}
287
288	sub children {	370	sub children {
289	}	371	}
290		372
291	sub set_max_size {	373	sub set_max_size {
292	my ($self, $w, $h) = @_;	374	my ($self, $w, $h) = @_;
…		…
295	delete $self->{max_h}; $self->{max_h} = $h if $h;	377	delete $self->{max_h}; $self->{max_h} = $h if $h;
296	}	378	}
297		379
298	sub set_tooltip {	380	sub set_tooltip {
299	my ($self, $tooltip) = @_;	381	my ($self, $tooltip) = @_;
		382
		383	$tooltip =~ s/^\s+//;
		384	$tooltip =~ s/\s+$//;
		385
		386	return if $self->{tooltip} eq $tooltip;
300		387
301	$self->{tooltip} = $tooltip;	388	$self->{tooltip} = $tooltip;
302		389
303	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	390	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304	delete $CFClient::UI::TOOLTIP->{owner};	391	delete $CFClient::UI::TOOLTIP->{owner};
…		…
326	return if $FOCUS == $self;	413	return if $FOCUS == $self;
327	return unless $self->{can_focus};	414	return unless $self->{can_focus};
328		415
329	my $focus = $FOCUS; $FOCUS = $self;	416	my $focus = $FOCUS; $FOCUS = $self;
330		417
331	$self->emit (focus_in => $focus);	418	$self->_emit (focus_in => $focus);
332		419
333	$focus->update if $focus;	420	$focus->update if $focus;
334	$FOCUS->update;	421	$FOCUS->update;
335	}	422	}
336		423
…		…
339		426
340	return unless $FOCUS == $self;	427	return unless $FOCUS == $self;
341		428
342	my $focus = $FOCUS; undef $FOCUS;	429	my $focus = $FOCUS; undef $FOCUS;
343		430
344	$self->emit (focus_out => $focus);	431	$self->_emit (focus_out => $focus);
345		432
346	$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;
347	}	437	}
348		438
349	sub mouse_motion { }	439	sub mouse_motion { }
350	sub button_up { }	440	sub button_up { }
351	sub key_down { }	441	sub key_down { }
352	sub key_up { }	442	sub key_up { }
353		443
354	sub button_down {	444	sub button_down {
355	my ($self, $ev, $x, $y) = @_;	445	my ($self, $ev, $x, $y) = @_;
356		446
357	$self->focus_in;	447	$self->focus_in;
…		…
360	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
361	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
362	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
363	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
364	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	}
365		518
366	sub draw {	519	sub draw {
367	my ($self) = @_;	520	my ($self) = @_;
368		521
369	return unless $self->{h} && $self->{w};	522	return unless $self->{h} && $self->{w};
…		…
391	if ($ENV{PCLIENT_DEBUG}) {	544	if ($ENV{PCLIENT_DEBUG}) {
392	glPushMatrix;	545	glPushMatrix;
393	glColor 1, 1, 0, 1;	546	glColor 1, 1, 0, 1;
394	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395	glBegin GL_LINE_LOOP;	548	glBegin GL_LINE_LOOP;
396	glVertex 0 , 0;	549	glVertex 0 , 0;
397	glVertex $self->{w}, 0;	550	glVertex $self->{w} - 1, 0;
398	glVertex $self->{w}, $self->{h};	551	glVertex $self->{w} - 1, $self->{h} - 1;
399	glVertex 0 , $self->{h};	552	glVertex 0 , $self->{h} - 1;
400	glEnd;	553	glEnd;
401	glPopMatrix;	554	glPopMatrix;
402	#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;
403	}	556	}
404	}	557	}
405		558
406	sub _draw {	559	sub _draw {
407	my ($self) = @_;	560	my ($self) = @_;
408		561
409	warn "no draw defined for $self\n";	562	warn "no draw defined for $self\n";
410	}
411
412	sub find_widget {
413	my ($self, $x, $y) = @_;
414
415	return () unless $self->{can_events};
416
417	return $self
418	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421	()
422	}
423
424	sub set_parent {
425	my ($self, $parent) = @_;
426
427	Scalar::Util::weaken ($self->{parent} = $parent);
428
429	# TODO: req_w _does_change after ->reconfigure
430	$self->check_size
431	unless exists $self->{req_w};
432	}
433
434	sub check_size {
435	my ($self, $forced) = @_;
436
437	$self->{force_alloc} = 1 if $forced;
438	$CFClient::UI::ROOT->{check_size}{$self} = $self;
439	}
440
441	sub update {
442	my ($self) = @_;
443
444	$self->{parent}->update
445	if $self->{parent};
446	}
447
448	sub connect {
449	my ($self, $signal, $cb) = @_;
450
451	push @{ $self->{signal_cb}{$signal} }, $cb;
452	}
453
454	sub emit {
455	my ($self, $signal, @args) = @_;
456
457	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458	}	563	}
459		564
460	sub DESTROY {	565	sub DESTROY {
461	my ($self) = @_;	566	my ($self) = @_;
462		567
…		…
559	$self->{children} = [	664	$self->{children} = [
560	sort { $a->{z} <=> $b->{z} }	665	sort { $a->{z} <=> $b->{z} }
561	@{$self->{children}}, @widgets	666	@{$self->{children}}, @widgets
562	];	667	];
563		668
564	$self->check_size (1);	669	$self->realloc;
565	$self->update;
566	}	670	}
567		671
568	sub children {	672	sub children {
569	@{ $_[0]{children} }	673	@{ $_[0]{children} }
570	}	674	}
…		…
575	delete $child->{parent};	679	delete $child->{parent};
576	$child->hide;	680	$child->hide;
577		681
578	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	682	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579		683
580	$self->check_size;	684	$self->realloc;
581	$self->update;
582	}	685	}
583		686
584	sub clear {	687	sub clear {
585	my ($self) = @_;	688	my ($self) = @_;
586		689
…		…
590	for (@$children) {	693	for (@$children) {
591	delete $_->{parent};	694	delete $_->{parent};
592	$_->hide;	695	$_->hide;
593	}	696	}
594		697
595	$self->check_size;	698	$self->realloc;
596	$self->update;
597	}	699	}
598		700
599	sub find_widget {	701	sub find_widget {
600	my ($self, $x, $y) = @_;	702	my ($self, $x, $y) = @_;
601		703
…		…
654	sub size_request {	756	sub size_request {
655	$_[0]{children}[0]->size_request	757	$_[0]{children}[0]->size_request
656	}	758	}
657		759
658	sub size_allocate {	760	sub size_allocate {
659	my ($self, $w, $h) = @_;	761	my ($self, $w, $h, $changed) = @_;
660		762
661	$self->{children}[0]->configure (0, 0, $w, $h);	763	$self->{children}[0]->configure (0, 0, $w, $h);
662	}	764	}
663		765
664	#############################################################################	766	#############################################################################
…		…
681	$ROOT->on_post_alloc ($self => sub { $self->render_child });	783	$ROOT->on_post_alloc ($self => sub { $self->render_child });
682	$self->SUPER::update;	784	$self->SUPER::update;
683	}	785	}
684		786
685	sub size_allocate {	787	sub size_allocate {
686	my ($self, $w, $h) = @_;	788	my ($self, $w, $h, $changed) = @_;
687		789
688	$self->SUPER::size_allocate ($w, $h);	790	$self->SUPER::size_allocate ($w, $h, $changed);
689	$self->update;	791	$self->update
		792	if $changed;
690	}	793	}
691		794
692	sub _render {	795	sub _render {
693	$_[0]{children}[0]->draw;	796	$_[0]{children}[0]->draw;
694	}	797	}
…		…
725		828
726	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
727		830
728	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
729		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
730	sub size_request {	843	sub size_request {
731	my ($self) = @_;	844	my ($self) = @_;
732		845
733	@$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)};
734	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
735		847
736	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
737	}	852	}
738		853
739	sub size_allocate {	854	sub size_allocate {
740	my ($self, $w, $h) = @_;	855	my ($self, $w, $h, $changed) = @_;
741		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);
742	$self->update;	861	$self->update;
743	}	862	}
744		863
745	sub set_offset {	864	sub set_offset {
746	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
797	my $class = shift;	916	my $class = shift;
798		917
799	my $self;	918	my $self;
800		919
801	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
802	vertical => 1,	921	vertical => 1,
803	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
804	connect_changed => sub {	923	on_changed => sub {
805	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
806	},	925	},
807	;	926	;
808		927
809	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
810	vp => (new CFClient::UI::ViewPort expand => 1),	929	vp => (new CFClient::UI::ViewPort expand => 1),
…		…
815	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
816	$self->add ($self->{vp});	935	$self->add ($self->{vp});
817	$self->add ($self->{slider});	936	$self->add ($self->{slider});
818		937
819	$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]);
820	}	958	}
821		959
822	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
823	# update viewport offset on scroll	961	# update viewport offset on scroll
824		962
…		…
875	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);
876		1014
877	sub new {	1015	sub new {
878	my $class = shift;	1016	my $class = shift;
879		1017
880	# TODO: user_x, user_y, overwrite moveto?
881
882	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
883	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
884	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
885	border => 0.6,	1021	border => 0.6,
886	toplevel => 1,	1022	is_toplevel => 1,
887	can_events => 1,	1023	can_events => 1,
888	@_	1024	@_
889	);	1025	);
890		1026
891	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
892	align => 0,	1028	align => 0,
…		…
911	$h + $self->border * 2,	1047	$h + $self->border * 2,
912	)	1048	)
913	}	1049	}
914		1050
915	sub size_allocate {	1051	sub size_allocate {
916	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h, $changed) = @_;
		1053
		1054	return unless $changed;
917		1055
918	$h -= List::Util::max 0, $self->border * 2;	1056	$h -= List::Util::max 0, $self->border * 2;
919	$w -= List::Util::max 0, $self->border * 2;	1057	$w -= List::Util::max 0, $self->border * 2;
920		1058
921	$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)
…		…
945	my ($ev, $x, $y) = @_;	1083	my ($ev, $x, $y) = @_;
946		1084
947	my $dx = $ev->{x} - $ox;	1085	my $dx = $ev->{x} - $ox;
948	my $dy = $ev->{y} - $oy;	1086	my $dy = $ev->{y} - $oy;
949		1087
		1088	$self->{user_x} = $wx + $dx * $mx;
		1089	$self->{user_y} = $wy + $dy * $my;
950	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
951	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
952	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1092	$self->move ($self->{user_x}, $self->{user_y});
953	$self->check_size;	1093	$self->realloc;
954	};	1094	};
955		1095
956	} elsif ($lr ^ $td) {	1096	} elsif ($lr ^ $td) {
957	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});
958	my ($bx, $by) = ($self->{x}, $self->{y});	1098	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
960	$self->{motion} = sub {	1100	$self->{motion} = sub {
961	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
962		1102
963	($x, $y) = ($ev->{x}, $ev->{y});	1103	($x, $y) = ($ev->{x}, $ev->{y});
964		1104
965	$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});
966	$self->update;	1109	$self->realloc;
967	};	1110	};
968	}	1111	}
969	}	1112	}
970		1113
971	sub button_up {	1114	sub button_up {
…		…
1032	sub new {	1175	sub new {
1033	my $class = shift;	1176	my $class = shift;
1034		1177
1035	$class->SUPER::new (	1178	$class->SUPER::new (
1036	col_expand => [],	1179	col_expand => [],
1037	@_	1180	@_,
1038	)	1181	)
		1182	}
		1183
		1184	sub children {
		1185	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039	}	1186	}
1040		1187
1041	sub add {	1188	sub add {
1042	my ($self, $x, $y, $child) = @_;	1189	my ($self, $x, $y, $child) = @_;
1043		1190
1044	$child->set_parent ($self);	1191	$child->set_parent ($self);
1045	$self->{children}[$y][$x] = $child;	1192	$self->{children}[$y][$x] = $child;
1046		1193
1047	$child->check_size;	1194	$self->realloc;
1048	}	1195	}
1049		1196
1050	sub children {
1051	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1052	}
1053
1054	# 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?
1055	sub clear {	1198	sub clear {
1056	my ($self) = @_;	1199	my ($self) = @_;
1057		1200
1058	my @children = $self->children;	1201	my @children = $self->children;
1059	delete $self->{children};	1202	delete $self->{children};
…		…
1061	for (@children) {	1204	for (@children) {
1062	delete $_->{parent};	1205	delete $_->{parent};
1063	$_->hide;	1206	$_->hide;
1064	}	1207	}
1065		1208
1066	$self->update;	1209	$self->realloc;
1067	}	1210	}
1068		1211
1069	sub get_wh {	1212	sub get_wh {
1070	my ($self) = @_;	1213	my ($self) = @_;
1071		1214
…		…
1098	(sum @$hs),	1241	(sum @$hs),
1099	)	1242	)
1100	}	1243	}
1101		1244
1102	sub size_allocate {	1245	sub size_allocate {
1103	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h, $changed) = @_;
1104		1247
1105	my ($ws, $hs) = $self->get_wh;	1248	my ($ws, $hs) = $self->get_wh;
1106		1249
1107	my $req_w = sum @$ws;	1250	my $req_w = (sum @$ws) || 1;
1108	my $req_h = sum @$hs;	1251	my $req_h = (sum @$hs) || 1;
1109		1252
1110	# TODO: nicer code && do row_expand	1253	# TODO: nicer code && do row_expand
1111	my @col_expand = @{$self->{col_expand}};	1254	my @col_expand = @{$self->{col_expand}};
1112	@col_expand = (1) x @$ws unless @col_expand;	1255	@col_expand = (1) x @$ws unless @col_expand;
1113	my $col_expand = (sum @col_expand) || 1;	1256	my $col_expand = (sum @col_expand) || 1;
…		…
1167	}	1310	}
1168	}	1311	}
1169		1312
1170	#############################################################################	1313	#############################################################################
1171		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
1172	package CFClient::UI::HBox;	1375	package CFClient::UI::HBox;
1173		1376
1174	# TODO: wrap into common Box base class
1175
1176	our @ISA = CFClient::UI::Container::;	1377	our @ISA = CFClient::UI::Box::;
1177		1378
1178	sub size_request {	1379	sub new {
1179	my ($self) = @_;	1380	my $class = shift;
1180		1381
1181	my @alloc = map [$_->size_request], @{$self->{children}};	1382	$class->SUPER::new (
1182		1383	vertical => 0,
1183	(	1384	@_,
1184	(List::Util::sum map $_->[0], @alloc),
1185	(List::Util::max map $_->[1], @alloc),
1186	)	1385	)
1187	}	1386	}
1188		1387
1189	sub size_allocate {
1190	my ($self, $w, $h) = @_;
1191
1192	($h, $w) = ($w, $h);
1193
1194	my $children = $self->{children};
1195
1196	my @h = map $_->{req_w}, @$children;
1197
1198	my $req_h = List::Util::sum @h;
1199
1200	if ($req_h > $h) {
1201	# ah well, not enough space
1202	$_ *= $h / $req_h for @h;
1203	} else {
1204	my $exp = List::Util::sum map $_->{expand}, @$children;
1205	$exp ||= 1;
1206
1207	for (0 .. $#$children) {
1208	my $child = $children->[$_];
1209
1210	my $alloc_h = $h[$_];
1211	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212	$h[$_] = $alloc_h;
1213	}
1214	}
1215
1216	CFClient::UI::harmonize \@h;
1217
1218	my $y = 0;
1219	for (0 .. $#$children) {
1220	my $child = $children->[$_];
1221	my $h = $h[$_];
1222	$child->configure ($y, 0, $h, $w);
1223
1224	$y += $h;
1225	}
1226
1227	1
1228	}
1229
1230	#############################################################################	1388	#############################################################################
1231		1389
1232	package CFClient::UI::VBox;	1390	package CFClient::UI::VBox;
1233		1391
1234	# TODO: wrap into common Box base class
1235
1236	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Box::;
1237		1393
1238	sub size_request {	1394	sub new {
1239	my ($self) = @_;	1395	my $class = shift;
1240		1396
1241	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$class->SUPER::new (
1242		1398	vertical => 1,
1243	(	1399	@_,
1244	(List::Util::max map $_->[0], @alloc),
1245	(List::Util::sum map $_->[1], @alloc),
1246	)	1400	)
1247	}
1248
1249	sub size_allocate {
1250	my ($self, $w, $h) = @_;
1251
1252	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254	my $children = $self->{children};
1255
1256	my @h = map $_->{req_h}, @$children;
1257
1258	my $req_h = List::Util::sum @h;
1259
1260	if ($req_h > $h) {
1261	# ah well, not enough space
1262	$_ *= $h / $req_h for @h;
1263	} else {
1264	my $exp = List::Util::sum map $_->{expand}, @$children;
1265	$exp ||= 1;
1266
1267	for (0 .. $#$children) {
1268	my $child = $children->[$_];
1269
1270	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271	}
1272	}
1273
1274	CFClient::UI::harmonize \@h;
1275
1276	my $y = 0;
1277	for (0 .. $#$children) {
1278	my $child = $children->[$_];
1279	my $h = $h[$_];
1280	$child->configure (0, $y, $w, $h);
1281
1282	$y += $h;
1283	}
1284
1285	1
1286	}	1401	}
1287		1402
1288	#############################################################################	1403	#############################################################################
1289		1404
1290	package CFClient::UI::Label;	1405	package CFClient::UI::Label;
…		…
1353	$self->{text} = "T$text";	1468	$self->{text} = "T$text";
1354		1469
1355	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356	$self->{layout}->set_text ($text);	1471	$self->{layout}->set_text ($text);
1357		1472
1358	$self->update;	1473	$self->realloc;
1359	$self->check_size;
1360	}	1474	}
1361		1475
1362	sub set_markup {	1476	sub set_markup {
1363	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1364		1478
…		…
1368	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369		1483
1370	$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;
1371	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1372		1486
1373	$self->update;	1487	$self->realloc;
1374	$self->check_size;
1375	}	1488	}
1376		1489
1377	sub size_request {	1490	sub size_request {
1378	my ($self) = @_;	1491	my ($self) = @_;
1379		1492
…		…
1400	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1401	)	1514	)
1402	}	1515	}
1403		1516
1404	sub size_allocate {	1517	sub size_allocate {
1405	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1406		1519
1407	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1408	}	1522	}
1409		1523
1410	sub set_fontsize {	1524	sub set_fontsize {
1411	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1412		1526
1413	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1414	delete $self->{texture};	1528	delete $self->{texture};
1415		1529
1416	$self->update;	1530	$self->realloc;
1417	$self->check_size;
1418	}	1531	}
1419		1532
1420	sub _draw {	1533	sub _draw {
1421	my ($self) = @_;	1534	my ($self) = @_;
1422		1535
…		…
1474	active_fg => [0, 0, 0],	1587	active_fg => [0, 0, 0],
1475	can_hover => 1,	1588	can_hover => 1,
1476	can_focus => 1,	1589	can_focus => 1,
1477	valign => 0,	1590	valign => 0,
1478	can_events => 1,	1591	can_events => 1,
		1592	#text => ...
1479	@_	1593	@_
1480	)	1594	)
1481	}	1595	}
1482		1596
1483	sub _set_text {	1597	sub _set_text {
…		…
1493	$self->{text} = $text;	1607	$self->{text} = $text;
1494		1608
1495	$text =~ s/./*/g if $self->{hidden};	1609	$text =~ s/./*/g if $self->{hidden};
1496	$self->{layout}->set_text ("$text ");	1610	$self->{layout}->set_text ("$text ");
1497		1611
1498	$self->emit (changed => $self->{text});	1612	$self->_emit (changed => $self->{text});
1499	}	1613	}
1500		1614
1501	sub set_text {	1615	sub set_text {
1502	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1503		1617
1504	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1505	$self->_set_text ($text);	1619	$self->_set_text ($text);
1506	$self->update;	1620
1507	$self->check_size;	1621	$self->realloc;
1508	}	1622	}
1509		1623
1510	sub get_text {	1624	sub get_text {
1511	$_[0]{text}	1625	$_[0]{text}
1512	}	1626	}
…		…
1515	my ($self) = @_;	1629	my ($self) = @_;
1516		1630
1517	my ($w, $h) = $self->SUPER::size_request;	1631	my ($w, $h) = $self->SUPER::size_request;
1518		1632
1519	($w + 1, $h) # add 1 for cursor	1633	($w + 1, $h) # add 1 for cursor
1520	}
1521
1522	sub size_allocate {
1523	my ($self, $w, $h) = @_;
1524
1525	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526	}	1634	}
1527		1635
1528	sub key_down {	1636	sub key_down {
1529	my ($self, $ev) = @_;	1637	my ($self, $ev) = @_;
1530		1638
…		…
1545	} elsif ($sym == CFClient::SDLK_HOME) {	1653	} elsif ($sym == CFClient::SDLK_HOME) {
1546	$self->{cursor} = 0;	1654	$self->{cursor} = 0;
1547	} elsif ($sym == CFClient::SDLK_END) {	1655	} elsif ($sym == CFClient::SDLK_END) {
1548	$self->{cursor} = length $text;	1656	$self->{cursor} = length $text;
1549	} elsif ($uni == 27) {	1657	} elsif ($uni == 27) {
1550	$self->emit ('escape');	1658	$self->_emit ('escape');
1551	} elsif ($uni) {	1659	} elsif ($uni) {
1552	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1553	}	1661	}
1554		1662
1555	$self->_set_text ($text);	1663	$self->_set_text ($text);
1556	$self->update;	1664
1557	$self->check_size;	1665	$self->realloc;
1558	}	1666	}
1559		1667
1560	sub focus_in {	1668	sub focus_in {
1561	my ($self) = @_;	1669	my ($self) = @_;
1562		1670
…		…
1642	if ($sym == 13) {	1750	if ($sym == 13) {
1643	unshift @{$self->{history}},	1751	unshift @{$self->{history}},
1644	my $txt = $self->get_text;	1752	my $txt = $self->get_text;
1645	$self->{history_pointer} = -1;	1753	$self->{history_pointer} = -1;
1646	$self->{history_saveback} = '';	1754	$self->{history_saveback} = '';
1647	$self->emit (activate => $txt);	1755	$self->_emit (activate => $txt);
1648	$self->update;	1756	$self->update;
1649		1757
1650	} elsif ($sym == CFClient::SDLK_UP) {	1758	} elsif ($sym == CFClient::SDLK_UP) {
1651	if ($self->{history_pointer} < 0) {	1759	if ($self->{history_pointer} < 0) {
1652	$self->{history_saveback} = $self->get_text;	1760	$self->{history_saveback} = $self->get_text;
…		…
1700	can_events => 1,	1808	can_events => 1,
1701	@_	1809	@_
1702	)	1810	)
1703	}	1811	}
1704		1812
		1813	sub activate { }
		1814
1705	sub button_up {	1815	sub button_up {
1706	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1707		1817
		1818	$self->emit ("activate")
1708	if ($x >= 0 && $x < $self->{w}	1819	if $x >= 0 && $x < $self->{w}
1709	&& $y >= 0 && $y < $self->{h}) {	1820	&& $y >= 0 && $y < $self->{h};
1710	$self->emit ("activate");
1711	}
1712	}	1821	}
1713		1822
1714	sub _draw {	1823	sub _draw {
1715	my ($self) = @_;	1824	my ($self) = @_;
1716		1825
…		…
1768	my ($self, $ev, $x, $y) = @_;	1877	my ($self, $ev, $x, $y) = @_;
1769		1878
1770	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1771	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1772	$self->{state} = !$self->{state};	1881	$self->{state} = !$self->{state};
1773	$self->emit (changed => $self->{state});	1882	$self->_emit (changed => $self->{state});
1774	}	1883	}
1775	}	1884	}
1776		1885
1777	sub _draw {	1886	sub _draw {
1778	my ($self) = @_;	1887	my ($self) = @_;
…		…
2053	my $self = $class->SUPER::new (	2162	my $self = $class->SUPER::new (
2054	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2055	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
2056	bg => [0, 0, 0, 0.2],	2165	bg => [0, 0, 0, 0.2],
2057	active_bg => [1, 1, 1, 0.5],	2166	active_bg => [1, 1, 1, 0.5],
2058	range => [0, 0, 100, 10],	2167	range => [0, 0, 100, 10, 0],
2059	req_w => $::WIDTH / 80,	2168	req_w => $::WIDTH / 80,
2060	req_h => $::WIDTH / 80,	2169	req_h => $::WIDTH / 80,
2061	vertical => 0,	2170	vertical => 0,
2062	can_hover => 1,	2171	can_hover => 1,
2063	inner_pad => 0.02,	2172	inner_pad => 0.02,
…		…
2068	$self->update;	2177	$self->update;
2069		2178
2070	$self	2179	$self
2071	}	2180	}
2072		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
2073	sub set_value {	2193	sub set_value {
2074	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2075		2195
2076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2196	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077		2197
2078	$hi = $lo + 1 if $hi <= $lo;	2198	$hi = $lo + 1 if $hi <= $lo;
2079		2199
		2200	$page = $hi - $lo if $page > $hi - $lo;
		2201
2080	$value = $lo if $value < $lo;	2202	$value = $lo if $value < $lo;
2081	$value = $hi if $value > $hi;	2203	$value = $hi - $page if $value > $hi - $page;
2082		2204
2083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2205	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084	if $unit;	2206	if $unit;
2085		2207
2086	$page = $hi - $lo if $page > $hi - $lo;
2087
2088	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2208	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089		2209
2090	if ($value != $old_value) {	2210	if ($value != $old_value) {
2091	$self->emit (changed => $value);	2211	$self->_emit (changed => $value);
2092	$self->update;	2212	$self->update;
2093	}	2213	}
2094	}	2214	}
2095		2215
2096	sub size_request {	2216	sub size_request {
…		…
2104		2224
2105	sub button_down {	2225	sub button_down {
2106	my ($self, $ev, $x, $y) = @_;	2226	my ($self, $ev, $x, $y) = @_;
2107		2227
2108	$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
2109	$self->mouse_motion ($ev, $x, $y);	2232	$self->mouse_motion ($ev, $x, $y);
2110	}	2233	}
2111		2234
2112	sub mouse_motion {	2235	sub mouse_motion {
2113	my ($self, $ev, $x, $y) = @_;	2236	my ($self, $ev, $x, $y) = @_;
…		…
2115	if ($GRAB == $self) {	2238	if ($GRAB == $self) {
2116	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2239	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117		2240
2118	my (undef, $lo, $hi, $page) = @{$self->{range}};	2241	my (undef, $lo, $hi, $page) = @{$self->{range}};
2119		2242
2120	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121		2244
2122	$self->set_value ($x * ($hi - $lo) + $lo);	2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123	}	2246	}
2124	}	2247	}
2125		2248
2126	sub update {	2249	sub update {
2127	my ($self) = @_;	2250	my ($self) = @_;
2128		2251
2129	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130	$self->set_value ($self->{range}[0]);	2253	$self->set_value ($self->{range}[0]);
2131		2254
2132	my ($value, $lo, $hi, $page) = @{$self->{range}};	2255	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2256	my $range = ($hi - $page - $lo) || 1e-100;
2133		2257
2134	my $inner_w = 1 - 2 * $self->{inner_pad};	2258	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135		2259
2136	$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;
2137		2262
2138	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2263	$value = ($value - $lo) / $range;
2139	$value = $self->{scale} * ($value - $lo);	2264	$value = $value * $self->{scale} + $self->{offset};
2140		2265
2141	$value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143	$value = 0 if $value < 0;
2144	$page = 1 - $value if $value + $page > 1;
2145
2146	$self->{knob_x} = $value;	2266	$self->{knob_x} = $value - $knob_w * 0.5;
2147	$self->{knob_w} = $page;	2267	$self->{knob_w} = $knob_w;
2148	});	2268	});
2149		2269
2150	$self->SUPER::update;	2270	$self->SUPER::update;
2151	}	2271	}
2152		2272
…		…
2176	# draw handle	2296	# draw handle
2177	$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);
2178		2298
2179	glDisable GL_TEXTURE_2D;	2299	glDisable GL_TEXTURE_2D;
2180	}	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 (@_) }
2181		2342
2182	#############################################################################	2343	#############################################################################
2183		2344
2184	package CFClient::UI::TextView;	2345	package CFClient::UI::TextView;
2185		2346
…		…
2216	$self->{fontsize} = $fontsize;	2377	$self->{fontsize} = $fontsize;
2217	$self->reflow;	2378	$self->reflow;
2218	}	2379	}
2219		2380
2220	sub size_allocate {	2381	sub size_allocate {
2221	my ($self, $w, $h) = @_;	2382	my ($self, $w, $h, $changed) = @_;
2222		2383
2223	$self->SUPER::size_allocate ($w, $h);	2384	$self->SUPER::size_allocate ($w, $h, $changed);
		2385
		2386	return unless $changed;
2224		2387
2225	$self->{layout}->set_font ($self->{font}) if $self->{font};	2388	$self->{layout}->set_font ($self->{font}) if $self->{font};
2226	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227	$self->{layout}->set_width ($self->{children}[0]{w});	2390	$self->{layout}->set_width ($self->{children}[0]{w});
2228		2391
2229	$self->reflow;	2392	$self->reflow;
2230	}	2393	}
2231		2394
2232	sub text_height {	2395	sub text_size {
2233	my ($self, $text, $indent) = @_;	2396	my ($self, $text, $indent) = @_;
2234		2397
2235	my $layout = $self->{layout};	2398	my $layout = $self->{layout};
2236		2399
2237	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2400	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238	$layout->set_width ($self->{children}[0]{w} - $indent);	2401	$layout->set_width ($self->{children}[0]{w} - $indent);
2239	$layout->set_markup ($text);	2402	$layout->set_markup ($text);
2240		2403
2241	($layout->size)[1]	2404	$layout->size
2242	}	2405	}
2243		2406
2244	sub reflow {	2407	sub reflow {
2245	my ($self) = @_;	2408	my ($self) = @_;
2246		2409
2247	$self->{need_reflow}++;	2410	$self->{need_reflow}++;
2248	$self->update;	2411	$self->update;
2249	}	2412	}
2250		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
2251	sub add_paragraph {	2429	sub add_paragraph {
2252	my ($self, $color, $text, $indent) = @_;	2430	my ($self, $color, $text, $indent) = @_;
2253		2431
2254	#TODO: intelligently "reformat" paragraph
2255
2256	for my $line (split /\n/, $text) {	2432	for my $line (split /\n/, $text) {
2257	my $height = $self->text_height ($line);	2433	my ($w, $h) = $self->text_size ($line);
2258	$self->{height} += $height;	2434	$self->{height} += $h;
2259	push @{$self->{par}}, [$height, $color, $indent, $line];	2435	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260	}	2436	}
2261		2437
2262	$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]);
2263	$self->{children}[1]->update;
2264	}	2439	}
2265		2440
2266	sub update {	2441	sub update {
2267	my ($self) = @_;	2442	my ($self) = @_;
2268		2443
…		…
2271	return unless $self->{h} > 0;	2446	return unless $self->{h} > 0;
2272		2447
2273	delete $self->{texture};	2448	delete $self->{texture};
2274		2449
2275	$ROOT->on_post_alloc ($self, sub {	2450	$ROOT->on_post_alloc ($self, sub {
		2451	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2452
2276	if (delete $self->{need_reflow}) {	2453	if (delete $self->{need_reflow}) {
2277	my $height = 0;	2454	my $height = 0;
2278		2455
2279	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2456	my $layout = $self->{layout};
		2457
		2458	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2459
2280	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	}
2281		2471
2282	$self->{height} = $height;	2472	$self->{height} = $height;
2283		2473
2284	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2474	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285	$self->{children}[1]->update;
2286		2475
2287	delete $self->{texture};	2476	delete $self->{texture};
2288	}	2477	}
2289		2478
2290	$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 {
2291	glClearColor 0.5, 0.5, 0.5, 0;	2480	glClearColor 0.5, 0.5, 0.5, 0;
2292	glClear GL_COLOR_BUFFER_BIT;	2481	glClear GL_COLOR_BUFFER_BIT;
2293		2482
2294	my $top = int $self->{children}[1]{range}[0];	2483	my $top = int $self->{children}[1]{range}[0];
2295		2484
2296	my $y0 = $top;	2485	my $y0 = $top;
2297	my $y1 = $top + $self->{h};	2486	my $y1 = $top + $H;
2298		2487
2299	my $y = 0;	2488	my $y = 0;
2300		2489
2301	my $layout = $self->{layout};	2490	my $layout = $self->{layout};
2302		2491
2303	$layout->set_font ($self->{font}) if $self->{font};	2492	$layout->set_font ($self->{font}) if $self->{font};
2304		2493
2305	glEnable GL_BLEND;	2494	glEnable GL_BLEND;
		2495	#TODO# not correct in windows where rgba is forced off
2306	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2496	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307		2497
2308	for my $par (@{$self->{par}}) {	2498	for my $par (@{$self->{par}}) {
2309	my $h = $par->[0];	2499	my $h = $par->[1];
2310		2500
2311	if ($y0 < $y + $h && $y < $y1) {	2501	if ($y0 < $y + $h && $y < $y1) {
2312	$layout->set_foreground (@{ $par->[1] });	2502	$layout->set_foreground (@{ $par->[2] });
2313	$layout->set_width ($self->{w} - $par->[2]);	2503	$layout->set_width ($W - $par->[3]);
2314	$layout->set_markup ($par->[3]);	2504	$layout->set_markup ($par->[4]);
2315		2505
2316	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2506	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317		2507
2318	glRasterPos $par->[2], $y - $y0;	2508	glRasterPos $par->[3], $y - $y0;
2319	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2509	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320	}	2510	}
2321		2511
2322	$y += $h;	2512	$y += $h;
2323	}	2513	}
…		…
2390		2580
2391	sub new {	2581	sub new {
2392	my $class = shift;	2582	my $class = shift;
2393		2583
2394	my $self = $class->SUPER::new (	2584	my $self = $class->SUPER::new (
2395	state => 0,	2585	state => 0,
2396	connect_activate => \&toggle_flopper,	2586	on_activate => \&toggle_flopper,
2397	@_	2587	@_
2398	);	2588	);
2399		2589
2400	if ($self->{state}) {
2401	$self->{state} = 0;
2402	$self->toggle_flopper;
2403	}
2404
2405	$self	2590	$self
2406	}	2591	}
2407		2592
2408	sub toggle_flopper {	2593	sub toggle_flopper {
2409	my ($self) = @_;	2594	my ($self) = @_;
2410		2595
2411	# TODO: use animation	2596	$self->{other}->toggle_visibility;
2412	if ($self->{state} = !$self->{state}) {
2413	$CFClient::UI::ROOT->add ($self->{other});
2414	$self->{other}->move ($self->coord2global (0, $self->{h}));
2415	$self->emit ("open");
2416	} else {
2417	$CFClient::UI::ROOT->remove ($self->{other});
2418	$self->emit ("close");
2419	}
2420
2421	$self->emit (changed => $self->{state});
2422	}	2597	}
2423		2598
2424	#############################################################################	2599	#############################################################################
2425		2600
2426	package CFClient::UI::Tooltip;	2601	package CFClient::UI::Tooltip;
…		…
2458		2633
2459	($w + 4, $h + 4)	2634	($w + 4, $h + 4)
2460	}	2635	}
2461		2636
2462	sub size_allocate {	2637	sub size_allocate {
2463	my ($self, $w, $h) = @_;	2638	my ($self, $w, $h, $changed) = @_;
2464		2639
		2640	return unless $changed;
		2641
2465	$self->SUPER::size_allocate ($w - 4, $h - 4);	2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2466	}	2643	}
2467		2644
2468	sub _draw {	2645	sub _draw {
2469	my ($self) = @_;	2646	my ($self) = @_;
2470		2647
…		…
2502		2679
2503	sub new {	2680	sub new {
2504	my $class = shift;	2681	my $class = shift;
2505		2682
2506	my $self = $class->SUPER::new (	2683	my $self = $class->SUPER::new (
2507	aspect => 1,	2684	aspect => 1,
		2685	can_events => 0,
2508	@_,	2686	@_,
2509	);	2687	);
2510		2688
2511	if ($self->{anim} && $self->{animspeed}) {	2689	if ($self->{anim} && $self->{animspeed}) {
2512	Scalar::Util::weaken (my $widget = $self);	2690	Scalar::Util::weaken (my $widget = $self);
…		…
2527		2705
2528	sub size_request {	2706	sub size_request {
2529	(32, 8)	2707	(32, 8)
2530	}	2708	}
2531		2709
		2710	sub update {
		2711	my ($self) = @_;
		2712
		2713	return unless $self->{visible};
		2714
		2715	$self->SUPER::update;
		2716	}
		2717
2532	sub _draw {	2718	sub _draw {
2533	my ($self) = @_;	2719	my ($self) = @_;
2534		2720
2535	return unless $::CONN;#d# manage and cache textures differently	2721	return unless $::CONN;
2536		2722
2537	my $face;	2723	my $face;
2538		2724
2539	if ($self->{frame}) {	2725	if ($self->{frame}) {
2540	my $anim = $::CONN->{anim}[$self->{anim}];	2726	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2563	$self->SUPER::DESTROY;	2749	$self->SUPER::DESTROY;
2564	}	2750	}
2565		2751
2566	#############################################################################	2752	#############################################################################
2567		2753
2568	package CFClient::UI::InventoryItem;	2754	package CFClient::UI::Inventory;
2569		2755
2570	our @ISA = CFClient::UI::HBox::;	2756	our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572	sub _item_to_desc {
2573	my ($item) = @_;
2574
2575	my $desc =
2576	$item->{nrof} < 2
2577	? $item->{name}
2578	: "$item->{nrof} × $item->{name_pl}";
2579
2580	$item->{flags} & Crossfire::Protocol::F_OPEN
2581	and $desc .= " (open)";
2582	$item->{flags} & Crossfire::Protocol::F_APPLIED
2583	and $desc .= " (applied)";
2584	$item->{flags} & Crossfire::Protocol::F_UNPAID
2585	and $desc .= " (unpaid)";
2586	$item->{flags} & Crossfire::Protocol::F_MAGIC
2587	and $desc .= " (magic)";
2588	$item->{flags} & Crossfire::Protocol::F_CURSED
2589	and $desc .= " (cursed)";
2590	$item->{flags} & Crossfire::Protocol::F_DAMNED
2591	and $desc .= " (damned)";
2592	$item->{flags} & Crossfire::Protocol::F_LOCKED
2593	and $desc .= " *";
2594
2595	$desc
2596	}
2597		2757
2598	sub new {	2758	sub new {
2599	my $class = shift;	2759	my $class = shift;
2600		2760
2601	my %args = @_;
2602
2603	my $item = delete $args{item};
2604
2605	my $desc = _item_to_desc ($item);
2606
2607	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2608	can_hover => 1,	2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2609	can_events => 1,
2610	tooltip => ((CFClient::UI::Label::escape $desc)
2611	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612	connect_button_down => sub {
2613	my ($self, $ev, $x, $y) = @_;
2614
2615	# todo: maybe put examine on 1? but should just be a tooltip :(
2616	if ($ev->{button} == 1) {
2617	my $targ = $::CONN->{player}{tag};
2618
2619	if ($item->{container} == $::CONN->{player}{tag}) {
2620	$targ = $main::OPENCONT;
2621	}
2622
2623	$::CONN->send ("move $targ $item->{tag} 0");
2624	} elsif ($ev->{button} == 2) {
2625	$::CONN->send ("apply $item->{tag}");
2626	} elsif ($ev->{button} == 3) {
2627	my @menu_items = (
2628	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631	(
2632	$item->{flags} & Crossfire::Protocol::F_LOCKED
2633	? (
2634	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635	)
2636	: (
2637	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639	)
2640	),
2641	);
2642
2643	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644	}
2645
2646	1
2647	},
2648	%args
2649	);
2650
2651
2652	$self->add (new CFClient::UI::Face
2653	can_events => 0,
2654	face => $item->{face},
2655	anim => $item->{anim},
2656	animspeed => $item->{animspeed},
2657	);
2658
2659	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661	$self->{item} = $item;
2662
2663	$self->update_item;
2664
2665	$self
2666	}
2667
2668	sub update_item {
2669	my ($self) = @_;
2670
2671	my $desc = _item_to_desc ($self->{item});
2672
2673	$self->{name_lbl}->set_text ($desc);
2674	}
2675
2676	#############################################################################
2677
2678	package CFClient::UI::Inventory;
2679
2680	our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682	sub new {
2683	my $class = shift;
2684
2685	my $self = $class->SUPER::new (
2686	scrolled => (new CFClient::UI::VBox),
2687	@_,	2763	@_,
2688	);	2764	);
2689		2765
2690	$self	2766	$self
2691	}	2767	}
…		…
2701	or ($a->{name} cmp $b->{name})	2777	or ($a->{name} cmp $b->{name})
2702	} @$items;	2778	} @$items;
2703		2779
2704	$self->{real_items} = \@items;	2780	$self->{real_items} = \@items;
2705		2781
		2782	my $row = 0;
2706	for my $item (@items) {	2783	for my $item (@items) {
2707	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2784	CFClient::Item::update_widgets $item;
2708	$item->update_item ();
2709	}
2710		2785
2711	$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});
2712		2789
2713	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2790	$row++;
2714	}	2791	}
2715
2716	sub size_request {
2717	my ($self) = @_;
2718	($self->{req_w}, $self->{req_h});
2719	}	2792	}
2720		2793
2721	#############################################################################	2794	#############################################################################
2722		2795
2723	package CFClient::UI::Menu;	2796	package CFClient::UI::Menu;
…		…
2758		2831
2759	# 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)
2760	sub popup {	2833	sub popup {
2761	my ($self, $ev) = @_;	2834	my ($self, $ev) = @_;
2762		2835
2763	$self->emit ("popdown");	2836	$self->_emit ("popdown");
2764		2837
2765	# maybe save $GRAB? must be careful about events...	2838	# maybe save $GRAB? must be careful about events...
2766	$GRAB = $self;	2839	$GRAB = $self;
2767	$self->{button} = $ev->{button};	2840	$self->{button} = $ev->{button};
2768		2841
…		…
2783		2856
2784	if ($ev->{button} == $self->{button}) {	2857	if ($ev->{button} == $self->{button}) {
2785	undef $GRAB;	2858	undef $GRAB;
2786	$self->hide;	2859	$self->hide;
2787		2860
2788	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2789	$self->{hover}[1]->() if $self->{hover};	2862	$self->{hover}[1]->() if $self->{hover};
2790	}	2863	}
2791	}	2864	}
2792		2865
2793	#############################################################################	2866	#############################################################################
…		…
2855	sub add {	2928	sub add {
2856	my ($self, $text, %arg) = @_;	2929	my ($self, $text, %arg) = @_;
2857		2930
2858	$text =~ s/^\s+//;	2931	$text =~ s/^\s+//;
2859	$text =~ s/\s+$//;	2932	$text =~ s/\s+$//;
		2933
		2934	return unless $text;
2860		2935
2861	my $timeout = time + ((delete $arg{timeout}) || 60);	2936	my $timeout = time + ((delete $arg{timeout}) || 60);
2862		2937
2863	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2938	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864		2939
…		…
2907	use CFClient::OpenGL;	2982	use CFClient::OpenGL;
2908		2983
2909	sub new {	2984	sub new {
2910	my $class = shift;	2985	my $class = shift;
2911		2986
2912	$class->SUPER::new (	2987	my $self = $class->SUPER::new (
		2988	visible => 1,
2913	@_,	2989	@_,
2914	)	2990	);
		2991
		2992	Scalar::Util::weaken ($self->{root} = $self);
		2993
		2994	$self
2915	}	2995	}
2916		2996
2917	sub configure {	2997	sub configure {
2918	my ($self, $x, $y, $w, $h) = @_;	2998	my ($self, $x, $y, $w, $h) = @_;
2919		2999
2920	$self->{w} = $w;	3000	$self->{w} = $w;
2921	$self->{h} = $h;	3001	$self->{h} = $h;
2922	}	3002	}
2923		3003
2924	sub check_size {	3004	sub reconfigure {
2925	my ($self) = @_;	3005	my ($self) = @_;
2926		3006
		3007	$self->SUPER::reconfigure;
		3008
2927	$self->size_allocate ($self->{w}, $self->{h})	3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
2928	if $self->{w};	3010	if $self->{w};
2929	}	3011	}
2930		3012
2931	sub size_request {	3013	sub size_request {
2932	my ($self) = @_;	3014	my ($self) = @_;
2933		3015
2934	($self->{w}, $self->{h})	3016	($self->{w}, $self->{h})
2935	}	3017	}
2936		3018
2937	sub size_allocate {	3019	sub size_allocate {
2938	my ($self, $w, $h) = @_;	3020	my ($self, $w, $h, $changed) = @_;
2939
2940	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945		3021
2946	for my $child ($self->children) {	3022	for my $child ($self->children) {
2947	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)};
2948		3024
2949	$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
2950	if exists $child->{req_x};	3026	if exists $child->{req_x};
2951		3027
2952	$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
2953	if exists $child->{req_y};	3029	if exists $child->{req_y};
2954		3030
		3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3032
2955	$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;
2956	$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;
2957		3035
2958	$child->configure ($X, $Y, $W, $H);	3036	$child->configure ($X, $Y, $W, $H);
2959	}	3037	}
…		…
2972	}	3050	}
2973		3051
2974	sub update {	3052	sub update {
2975	my ($self) = @_;	3053	my ($self) = @_;
2976		3054
2977	$self->check_size;
2978	$::WANT_REFRESH++;	3055	$::WANT_REFRESH++;
2979	}	3056	}
2980		3057
2981	sub add {	3058	sub add {
2982	my ($self, @children) = @_;	3059	my ($self, @children) = @_;
2983		3060
2984	for my $child (@children) {	3061	for my $child (@children) {
2985	$child->{toplevel} = 1;	3062	$child->{is_toplevel} = 1;
2986		3063
2987	# integerise window positions	3064	# integerise window positions
2988	$child->{x} = int $child->{x};	3065	$child->{x} = int $child->{x};
2989	$child->{y} = int $child->{y};	3066	$child->{y} = int $child->{y};
2990	}	3067	}
2991		3068
2992	$self->SUPER::add (@children);	3069	$self->SUPER::add (@children);
2993	}	3070	}
2994		3071
		3072	sub remove {
		3073	my ($self, @children) = @_;
		3074
		3075	$self->SUPER::remove (@children);
		3076
		3077	while (@children) {
		3078	my $w = pop @children;
		3079	push @children, $w->children;
		3080	$w->set_invisible;
		3081	}
		3082	}
		3083
2995	sub on_refresh {	3084	sub on_refresh {
2996	my ($self, $id, $cb) = @_;	3085	my ($self, $id, $cb) = @_;
2997		3086
2998	$self->{refresh_hook}{$id} = $cb;	3087	$self->{refresh_hook}{$id} = $cb;
2999	}	3088	}
…		…
3010	while ($self->{refresh_hook}) {	3099	while ($self->{refresh_hook}) {
3011	$_->()	3100	$_->()
3012	for values %{delete $self->{refresh_hook}};	3101	for values %{delete $self->{refresh_hook}};
3013	}	3102	}
3014		3103
3015	if ($self->{check_size}) {	3104	if ($self->{realloc}) {
3016	my @queue = ([], []);	3105	my @queue;
3017		3106
3018	for (;;) {	3107	while () {
3019	if ($self->{check_size}) {	3108	if ($self->{realloc}) {
3020	# heuristic: check containers last	3109	#TODO use array-of-depth approach
3021	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3110
3022	for values %{delete $self->{check_size}}	3111	@queue = sort { $a->{visible} <=> $b->{visible} }
		3112	@queue, values %{delete $self->{realloc}};
3023	}	3113	}
3024		3114
3025	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3115	my $widget = pop @queue || last;
3026		3116
		3117	$widget->{visible} or last; # do not resize invisible widgets
		3118
3027	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3028	? @$widget{qw(user_w user_h)}	3120	? @$widget{qw(def_w def_h)}
3029	: $widget->size_request;	3121	: $widget->size_request;
3030		3122
3031	if (delete $widget->{force_alloc}
3032	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033	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#
3034		3124
3035	$widget->{req_w} = $w;	3125	$widget->{req_w} = $w;
3036	$widget->{req_h} = $h;	3126	$widget->{req_h} = $h;
3037		3127
3038	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3039		3129
3040	$widget->{parent}->check_size	3130	push @queue, $widget->{parent}
3041	if $widget->{parent};	3131	if $widget->{parent};
3042	}
3043	}	3132	}
3044	}	3133	}
3045		3134
3046	while ($self->{size_alloc}) {	3135	while (my $size_alloc = delete $self->{size_alloc}) {
3047	for (values %{delete $self->{size_alloc}}) {	3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3048	my ($widget, $w, $h) = @$_;	3137	values %$size_alloc;
		3138
		3139	while () {
		3140	my ($widget, $w, $h) = @{ pop @queue or last };
3049		3141
3050	$w = 0 if $w < 0;	3142	$w = 0 if $w < 0;
3051	$h = 0 if $h < 0;	3143	$h = 0 if $h < 0;
3052		3144
3053	$widget->{w} = $w;	3145	$widget->{w} = $w;
3054	$widget->{h} = $h;	3146	$widget->{h} = $h;
3055	$widget->size_allocate ($w, $h);
3056	$widget->emit (size_allocate => $w, $h);	3147	$widget->emit (size_allocate => $w, $h, 1);
3057	}	3148	}
3058	}	3149	}
3059		3150
3060	while ($self->{post_alloc_hook}) {	3151	while ($self->{post_alloc_hook}) {
3061	$_->()	3152	$_->()

Diff Legend

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