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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 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
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
315	}	376	}
316		377
317	sub set_max_size {	378	sub set_max_size {
318	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
321	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
322	}	383	}
323		384
324	sub set_tooltip {	385	sub set_tooltip {
325	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
326		392
327	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
328		394
329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
389	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		460
		461	sub find_widget {
		462	my ($self, $x, $y) = @_;
		463
		464	return () unless $self->{can_events};
		465
		466	return $self
		467	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		468	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		469
		470	()
		471	}
		472
		473	sub set_parent {
		474	my ($self, $parent) = @_;
		475
		476	Scalar::Util::weaken ($self->{parent} = $parent);
		477	$self->set_visible if $parent->{visible};
		478	}
		479
		480	sub connect {
		481	my ($self, $signal, $cb) = @_;
		482
		483	push @{ $self->{signal_cb}{$signal} }, $cb;
		484	}
		485
		486	sub _emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		490	}
		491
		492	sub emit {
		493	my ($self, $signal, @args) = @_;
		494
		495	$self->_emit ($signal, @args)
		496	|| $self->$signal (@args);
		497	}
		498
		499	sub visibility_change {
		500	#my ($self, $visible) = @_;
		501	}
		502
		503	sub realloc {
		504	my ($self) = @_;
		505
		506	if ($self->{visible}) {
		507	return if $self->{root}{realloc}{$self+0};
		508
		509	$self->{root}{realloc}{$self+0} = $self;
		510	$self->{root}->update;
		511	} else {
		512	delete $self->{req_w};
		513	delete $self->{req_h};
		514	}
		515	}
		516
		517	sub update {
		518	my ($self) = @_;
		519
		520	$self->{parent}->update
		521	if $self->{parent};
		522	}
		523
		524	sub reconfigure {
		525	my ($self) = @_;
		526
		527	$self->realloc;
		528	$self->update;
		529	}
394		530
395	sub draw {	531	sub draw {
396	my ($self) = @_;	532	my ($self) = @_;
397		533
398	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
415	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
416	glEnd;	552	glEnd;
417	glDisable GL_BLEND;	553	glDisable GL_BLEND;
418	}	554	}
419		555
420	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
421	glPushMatrix;	557	glPushMatrix;
422	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
423	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
425	glVertex 0 , 0;	561	glVertex 0 , 0;
426	glVertex $self->{w}, 0;	562	glVertex $self->{w} - 1, 0;
427	glVertex $self->{w}, $self->{h};	563	glVertex $self->{w} - 1, $self->{h} - 1;
428	glVertex 0 , $self->{h};	564	glVertex 0 , $self->{h} - 1;
429	glEnd;	565	glEnd;
430	glPopMatrix;	566	glPopMatrix;
431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	567	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432	}	568	}
433	}	569	}
434		570
435	sub _draw {	571	sub _draw {
436	my ($self) = @_;	572	my ($self) = @_;
437		573
438	warn "no draw defined for $self\n";	574	warn "no draw defined for $self\n";
439	}
440
441	sub find_widget {
442	my ($self, $x, $y) = @_;
443
444	return () unless $self->{can_events};
445
446	return $self
447	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450	()
451	}
452
453	sub set_parent {
454	my ($self, $parent) = @_;
455
456	Scalar::Util::weaken ($self->{parent} = $parent);
457
458	# TODO: req_w _does_change after ->reconfigure
459	$self->check_size
460	unless exists $self->{req_w};
461
462	$self->show;
463	}
464
465	sub check_size {
466	my ($self, $forced) = @_;
467
468	$self->{force_alloc} = 1 if $forced;
469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
470	}
471
472	sub update {
473	my ($self) = @_;
474
475	$self->{parent}->update
476	if $self->{parent};
477	}
478
479	sub connect {
480	my ($self, $signal, $cb) = @_;
481
482	push @{ $self->{signal_cb}{$signal} }, $cb;
483	}
484
485	sub _emit {
486	my ($self, $signal, @args) = @_;
487
488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489	}
490
491	sub emit {
492	my ($self, $signal, @args) = @_;
493
494	$self->_emit ($signal, @args)
495	|| $self->$signal (@args);
496	}	575	}
497		576
498	sub DESTROY {	577	sub DESTROY {
499	my ($self) = @_;	578	my ($self) = @_;
500		579
…		…
558	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
559	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
560	}	639	}
561		640
562	sub size_request {	641	sub size_request {
563	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
564	}	645	}
565		646
566	sub draw { }	647	sub draw { }
567		648
568	#############################################################################	649	#############################################################################
…		…
597	$self->{children} = [	678	$self->{children} = [
598	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
599	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
600	];	681	];
601		682
602	$self->check_size (1);	683	$self->realloc;
603	$self->update;
604	}	684	}
605		685
606	sub children {	686	sub children {
607	@{ $_[0]{children} }	687	@{ $_[0]{children} }
608	}	688	}
…		…
613	delete $child->{parent};	693	delete $child->{parent};
614	$child->hide;	694	$child->hide;
615		695
616	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617		697
618	$self->check_size;	698	$self->realloc;
619	$self->update;
620	}	699	}
621		700
622	sub clear {	701	sub clear {
623	my ($self) = @_;	702	my ($self) = @_;
624		703
…		…
628	for (@$children) {	707	for (@$children) {
629	delete $_->{parent};	708	delete $_->{parent};
630	$_->hide;	709	$_->hide;
631	}	710	}
632		711
633	$self->check_size;	712	$self->realloc;
634	$self->update;
635	}	713	}
636		714
637	sub find_widget {	715	sub find_widget {
638	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
639		717
…		…
763		841
764	package CFClient::UI::ViewPort;	842	package CFClient::UI::ViewPort;
765		843
766	our @ISA = CFClient::UI::Window::;	844	our @ISA = CFClient::UI::Window::;
767		845
		846	sub new {
		847	my $class = shift;
		848
		849	$class->SUPER::new (
		850	scroll_x => 0,
		851	scroll_y => 1,
		852	@_,
		853	)
		854	}
		855
768	sub size_request {	856	sub size_request {
769	my ($self) = @_;	857	my ($self) = @_;
770		858
771	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772		860
773	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
774	}	865	}
775		866
776	sub size_allocate {	867	sub size_allocate {
777	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
778		869
779	my ($cw, $ch) = @$self{qw(child_w child_h)};	870	my $child = $self->child;
780	# $w = $self->{w};	871
		872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		874
781	$self->child->configure (0, 0, $cw, $ch);	875	$self->child->configure (0, 0, $w, $h);
782	$self->update;	876	$self->update;
783	}	877	}
784		878
785	sub set_offset {	879	sub set_offset {
786	my ($self, $x, $y) = @_;	880	my ($self, $x, $y) = @_;
…		…
837	my $class = shift;	931	my $class = shift;
838		932
839	my $self;	933	my $self;
840		934
841	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
842	vertical => 1,	936	vertical => 1,
843	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
844	connect_changed => sub {	938	on_changed => sub {
845	$self->{vp}->set_offset (0, $_[1]);	939	$self->{vp}->set_offset (0, $_[1]);
846	},	940	},
847	;	941	;
848		942
849	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
…		…
855	$self->{vp}->add ($self->{scrolled});	949	$self->{vp}->add ($self->{scrolled});
856	$self->add ($self->{vp});	950	$self->add ($self->{vp});
857	$self->add ($self->{slider});	951	$self->add ($self->{slider});
858		952
859	$self	953	$self
		954	}
		955
		956	sub update {
		957	my ($self) = @_;
		958
		959	$self->SUPER::update;
		960
		961	# todo: overwrite size_allocate of child
		962	my $child = $self->{vp}->child;
		963	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860	}	964	}
861		965
862	sub size_allocate {	966	sub size_allocate {
863	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
864		968
…		…
917		1021
918	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
919		1023
920	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
921		1025
922	my @tex =	1026	my $bg =
		1027	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1028	mipmap => 1, wrap => 1;
		1029
		1030	my @border =
923	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1032	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925		1033
926	sub new {	1034	sub new {
927	my $class = shift;	1035	my $class = shift;
928
929	# TODO: user_x, user_y, overwrite moveto?
930		1036
931	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
932	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
933	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
934	border => 0.6,	1040	border => 0.6,
935	is_toplevel => 1,
936	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
937	@_	1044	@_
938	);	1045	);
939		1046
940	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
941	align => 0,	1048	align => 0,
…		…
994	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
995		1102
996	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
997	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
998		1105
999	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
1001	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002	$self->check_size;
1003	};	1111	};
1004		1112
1005	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1006	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1009	$self->{motion} = sub {	1117	$self->{motion} = sub {
1010	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1011		1119
1012	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1013		1121
1014	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015	$self->update;
1016	};	1123	};
1017	}	1124	}
1018	}	1125	}
1019		1126
1020	sub button_up {	1127	sub button_up {
…		…
1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040		1147
1041	my $border = $self->border;	1148	my $border = $self->border;
1042		1149
1043	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048		1155
1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1051		1158
1052	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1053	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1054	my $rep_y = $ch / $bg->{h};	1162	$bg->{t} = $ch / $bg->{h};
1055
1056	glColor @{ $self->{bg} };
1057
1058	$bg->{s} = $rep_x;
1059	$bg->{t} = $rep_y;
1060	$bg->{wrap_mode} = 1;
1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062	}	1164	}
1063		1165
1064	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1065		1167
…		…
1081	sub new {	1183	sub new {
1082	my $class = shift;	1184	my $class = shift;
1083		1185
1084	$class->SUPER::new (	1186	$class->SUPER::new (
1085	col_expand => [],	1187	col_expand => [],
1086	@_	1188	@_,
1087	)	1189	)
		1190	}
		1191
		1192	sub children {
		1193	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088	}	1194	}
1089		1195
1090	sub add {	1196	sub add {
1091	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1092		1198
1093	$child->set_parent ($self);	1199	$child->set_parent ($self);
1094	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1095		1201
1096	$child->check_size;	1202	$self->realloc;
1097	}	1203	}
1098		1204
1099	sub children {
1100	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101	}
1102
1103	# TODO: move to container class maybe? send childs a signal on removal?	1205	# TODO: move to container class maybe? send children a signal on removal?
1104	sub clear {	1206	sub clear {
1105	my ($self) = @_;	1207	my ($self) = @_;
1106		1208
1107	my @children = $self->children;	1209	my @children = $self->children;
1108	delete $self->{children};	1210	delete $self->{children};
…		…
1110	for (@children) {	1212	for (@children) {
1111	delete $_->{parent};	1213	delete $_->{parent};
1112	$_->hide;	1214	$_->hide;
1113	}	1215	}
1114		1216
1115	$self->update;	1217	$self->realloc;
1116	}	1218	}
1117		1219
1118	sub get_wh {	1220	sub get_wh {
1119	my ($self) = @_;	1221	my ($self) = @_;
1120		1222
…		…
1151	sub size_allocate {	1253	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1254	my ($self, $w, $h) = @_;
1153		1255
1154	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1155		1257
1156	my $req_w = sum @$ws;	1258	my $req_w = (sum @$ws) || 1;
1157	my $req_h = sum @$hs;	1259	my $req_h = (sum @$hs) || 1;
1158		1260
1159	# TODO: nicer code && do row_expand	1261	# TODO: nicer code && do row_expand
1160	my @col_expand = @{$self->{col_expand}};	1262	my @col_expand = @{$self->{col_expand}};
1161	@col_expand = (1) x @$ws unless @col_expand;	1263	@col_expand = (1) x @$ws unless @col_expand;
1162	my $col_expand = (sum @col_expand) || 1;	1264	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1318	}
1217	}	1319	}
1218		1320
1219	#############################################################################	1321	#############################################################################
1220		1322
1221	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1222
1223	# TODO: wrap into common Box base class
1224		1324
1225	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1226		1326
1227	sub size_request {	1327	sub size_request {
1228	my ($self) = @_;	1328	my ($self) = @_;
1229		1329
1230	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1231		1331	? (
1232	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1233	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234	(List::Util::max map $_->[1], @alloc),	1334	)
1235	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1236	}	1339	}
1237		1340
1238	sub size_allocate {	1341	sub size_allocate {
1239	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1240		1343
1241	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1242
1243	my $children = $self->{children};	1345	my $children = $self->{children};
1244		1346
1245	my @h = map $_->{req_w}, @$children;	1347	my @req;
1246		1348
1247	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1248		1350	@req = ($space / (@$children || 1)) x @$children;
1249	if ($req_h > $h) {
1250	# ah well, not enough space
1251	$_ *= $h / $req_h for @h;
1252	} else {	1351	} else {
		1352	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1353	my $req = List::Util::sum @req;
		1354
		1355	if ($req > $space) {
		1356	# ah well, not enough space
		1357	$_ *= $space / $req for @req;
		1358	} else {
1253	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254	$exp ||= 1;
1255		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1256	for (0 .. $#$children) {	1364	for 0 .. $#$children;
1257	my $child = $children->[$_];
1258
1259	my $alloc_h = $h[$_];
1260	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261	$h[$_] = $alloc_h;
1262	}	1365	}
1263	}	1366	}
1264		1367
1265	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1266		1369
1267	my $y = 0;	1370	my $pos = 0;
1268	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270	my $h = $h[$_];	1372	my $alloc = $req[$_];
1271	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272		1374
1273	$y += $h;	1375	$pos += $alloc;
1274	}	1376	}
1275		1377
1276	1	1378	1
1277	}	1379	}
1278		1380
1279	#############################################################################	1381	#############################################################################
1280		1382
		1383	package CFClient::UI::HBox;
		1384
		1385	our @ISA = CFClient::UI::Box::;
		1386
		1387	sub new {
		1388	my $class = shift;
		1389
		1390	$class->SUPER::new (
		1391	vertical => 0,
		1392	@_,
		1393	)
		1394	}
		1395
		1396	#############################################################################
		1397
1281	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1282		1399
1283	# TODO: wrap into common Box base class
1284
1285	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1286		1401
1287	sub size_request {	1402	sub new {
1288	my ($self) = @_;	1403	my $class = shift;
1289		1404
1290	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1291		1406	vertical => 1,
1292	(	1407	@_,
1293	(List::Util::max map $_->[0], @alloc),
1294	(List::Util::sum map $_->[1], @alloc),
1295	)	1408	)
1296	}
1297
1298	sub size_allocate {
1299	my ($self, $w, $h) = @_;
1300
1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303	my $children = $self->{children};
1304
1305	my @h = map $_->{req_h}, @$children;
1306
1307	my $req_h = List::Util::sum @h;
1308
1309	if ($req_h > $h) {
1310	# ah well, not enough space
1311	$_ *= $h / $req_h for @h;
1312	} else {
1313	my $exp = List::Util::sum map $_->{expand}, @$children;
1314	$exp ||= 1;
1315
1316	for (0 .. $#$children) {
1317	my $child = $children->[$_];
1318
1319	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320	}
1321	}
1322
1323	CFClient::UI::harmonize \@h;
1324
1325	my $y = 0;
1326	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];
1329	$child->configure (0, $y, $w, $h);
1330
1331	$y += $h;
1332	}
1333
1334	1
1335	}	1409	}
1336		1410
1337	#############################################################################	1411	#############################################################################
1338		1412
1339	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1356	ellipsise => 3, # end	1430	ellipsise => 3, # end
1357	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1358	fontsize => 1,	1432	fontsize => 1,
1359	align => -1,	1433	align => -1,
1360	valign => -1,	1434	valign => -1,
1361	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1362	can_events => 0,	1437	can_events => 0,
1363	%arg	1438	%arg
1364	);	1439	);
1365		1440
1366	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1402	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1403		1478
1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1406		1481
		1482	$self->realloc;
1407	$self->update;	1483	$self->update;
1408	$self->check_size;
1409	}	1484	}
1410		1485
1411	sub set_markup {	1486	sub set_markup {
1412	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1413		1488
…		…
1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418		1493
1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1421		1496
		1497	$self->realloc;
1422	$self->update;	1498	$self->update;
1423	$self->check_size;
1424	}	1499	}
1425		1500
1426	sub size_request {	1501	sub size_request {
1427	my ($self) = @_;	1502	my ($self) = @_;
1428		1503
…		…
1442		1517
1443	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1444	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1445	}	1520	}
1446		1521
1447	(	1522	($w, $h)
1448	$w + $self->{padding} * 2,
1449	$h + $self->{padding} * 2,
1450	)
1451	}	1523	}
1452		1524
1453	sub size_allocate {	1525	sub size_allocate {
1454	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1455		1527
1456	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457	}	1530	}
1458		1531
1459	sub set_fontsize {	1532	sub set_fontsize {
1460	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1461		1534
1462	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1463	delete $self->{texture};	1536	delete $self->{texture};
1464		1537
1465	$self->update;	1538	$self->realloc;
1466	$self->check_size;
1467	}	1539	}
1468		1540
1469	sub _draw {	1541	sub _draw {
1470	my ($self) = @_;	1542	my ($self) = @_;
1471		1543
…		…
1479	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481		1553
1482	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1483		1555
1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1487		1559
1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1491		1563
1492	$tex	1564	$tex
1493	};	1565	};
1494		1566
…		…
1551	sub set_text {	1623	sub set_text {
1552	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1553		1625
1554	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1555	$self->_set_text ($text);	1627	$self->_set_text ($text);
1556	$self->update;	1628
1557	$self->check_size;	1629	$self->realloc;
1558	}	1630	}
1559		1631
1560	sub get_text {	1632	sub get_text {
1561	$_[0]{text}	1633	$_[0]{text}
1562	}	1634	}
…		…
1595	} elsif ($uni) {	1667	} elsif ($uni) {
1596	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1597	}	1669	}
1598		1670
1599	$self->_set_text ($text);	1671	$self->_set_text ($text);
1600	$self->update;	1672
1601	$self->check_size;	1673	$self->realloc;
1602	}	1674	}
1603		1675
1604	sub focus_in {	1676	sub focus_in {
1605	my ($self) = @_;	1677	my ($self) = @_;
1606		1678
…		…
1733		1805
1734	sub new {	1806	sub new {
1735	my $class = shift;	1807	my $class = shift;
1736		1808
1737	$class->SUPER::new (	1809	$class->SUPER::new (
1738	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1739	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1740	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1741	can_hover => 1,	1814	can_hover => 1,
1742	align => 0,	1815	align => 0,
1743	valign => 0,	1816	valign => 0,
…		…
1790		1863
1791	sub new {	1864	sub new {
1792	my $class = shift;	1865	my $class = shift;
1793		1866
1794	$class->SUPER::new (	1867	$class->SUPER::new (
1795	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1796	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1797	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1798	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1799	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1800	state => 0,	1874	state => 0,
…		…
1804	}	1878	}
1805		1879
1806	sub size_request {	1880	sub size_request {
1807	my ($self) = @_;	1881	my ($self) = @_;
1808		1882
1809	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1810	}	1884	}
1811		1885
1812	sub button_down {	1886	sub button_down {
1813	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1814		1888
1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1818	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1819	}	1893	}
1820	}	1894	}
1821		1895
1822	sub _draw {	1896	sub _draw {
1823	my ($self) = @_;	1897	my ($self) = @_;
1824		1898
1825	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1826		1900
1827	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828		1902
1829	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1903	my ($w, $h) = @$self{qw(w h)};
		1904
		1905	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830		1906
1831	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832		1908
1833	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1834		1910
…		…
2099	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2100	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2101	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2102	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2103	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2104	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2105	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2106	vertical => 0,	2182	vertical => 0,
2107	can_hover => 1,	2183	can_hover => 1,
2108	inner_pad => 0.02,	2184	inner_pad => 0.02,
2109	@_	2185	@_
2110	);	2186	);
…		…
2113	$self->update;	2189	$self->update;
2114		2190
2115	$self	2191	$self
2116	}	2192	}
2117		2193
		2194	sub changed { }
		2195
2118	sub set_range {	2196	sub set_range {
2119	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2120		2198
2121	$self->{range} = $range;	2199	($range, $self->{range}) = ($self->{range}, $range);
2122		2200
2123	$self->update;	2201	$self->update
		2202	if "@$range" ne "@{$self->{range}}";
2124	}	2203	}
2125		2204
2126	sub set_value {	2205	sub set_value {
2127	my ($self, $value) = @_;	2206	my ($self, $value) = @_;
2128		2207
…		…
2147	}	2226	}
2148		2227
2149	sub size_request {	2228	sub size_request {
2150	my ($self) = @_;	2229	my ($self) = @_;
2151		2230
2152	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2153	my $h = $self->{req_h};
2154
2155	$self->{vertical} ? ($h, $w) : ($w, $h)
2156	}	2232	}
2157		2233
2158	sub button_down {	2234	sub button_down {
2159	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2160		2236
…		…
2511		2587
2512	sub new {	2588	sub new {
2513	my $class = shift;	2589	my $class = shift;
2514		2590
2515	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2516	state => 0,	2592	state => 0,
2517	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2518	@_	2594	@_
2519	);	2595	);
2520		2596
2521	if ($self->{state}) {
2522	$self->{state} = 0;
2523	$self->toggle_flopper;
2524	}
2525
2526	$self	2597	$self
2527	}	2598	}
2528		2599
2529	sub toggle_flopper {	2600	sub toggle_flopper {
2530	my ($self) = @_;	2601	my ($self) = @_;
2531		2602
2532	# TODO: use animation	2603	$self->{other}->toggle_visibility;
2533	if ($self->{state} = !$self->{state}) {
2534	$CFClient::UI::ROOT->add ($self->{other});
2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2536	$self->_emit ("open");
2537	} else {
2538	$CFClient::UI::ROOT->remove ($self->{other});
2539	$self->_emit ("close");
2540	}
2541
2542	$self->_emit (changed => $self->{state});
2543	}	2604	}
2544		2605
2545	#############################################################################	2606	#############################################################################
2546		2607
2547	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2560	}	2621	}
2561		2622
2562	sub set_tooltip_from {	2623	sub set_tooltip_from {
2563	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2564		2625
		2626	my $tooltip = $widget->{tooltip};
		2627
		2628	if ($ENV{CFPLUS_DEBUG} & 2) {
		2629	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2630	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2631	. "req $widget->{req_w} $widget->{req_h}\n"
		2632	. "visible $widget->{visible}";
		2633	}
		2634
2565	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2566	markup => $widget->{tooltip},	2636	markup => $tooltip,
2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568	fontsize => 0.8,	2638	fontsize => 0.8,
2569	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2570	ellipsise => 0,	2640	ellipsise => 0,
2571	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2582		2652
2583	sub size_allocate {	2653	sub size_allocate {
2584	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2585		2655
2586	$self->SUPER::size_allocate ($w - 4, $h - 4);	2656	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2657	}
		2658
		2659	sub visibility_change {
		2660	my ($self, $visible) = @_;
		2661
		2662	return unless $visible;
		2663
		2664	$self->{root}->on_post_alloc ("move_$self" => sub {
		2665	my $widget = $self->{owner}
		2666	or return;
		2667
		2668	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2669
		2670	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2671	if $x + $self->{w} > $::WIDTH;
		2672
		2673	$self->move_abs ($x, $y);
		2674	});
2587	}	2675	}
2588		2676
2589	sub _draw {	2677	sub _draw {
2590	my ($self) = @_;	2678	my ($self) = @_;
2591		2679
…		…
2608	glVertex $w, $h;	2696	glVertex $w, $h;
2609	glVertex $w, 0;	2697	glVertex $w, 0;
2610	glEnd;	2698	glEnd;
2611		2699
2612	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2613	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2614	}	2703	}
2615		2704
2616	#############################################################################	2705	#############################################################################
2617		2706
…		…
2623		2712
2624	sub new {	2713	sub new {
2625	my $class = shift;	2714	my $class = shift;
2626		2715
2627	my $self = $class->SUPER::new (	2716	my $self = $class->SUPER::new (
2628	aspect => 1,	2717	aspect => 1,
		2718	can_events => 0,
2629	@_,	2719	@_,
2630	);	2720	);
2631		2721
2632	if ($self->{anim} && $self->{animspeed}) {	2722	if ($self->{anim} && $self->{animspeed}) {
2633	Scalar::Util::weaken (my $widget = $self);	2723	Scalar::Util::weaken (my $widget = $self);
…		…
2692	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2693	}	2783	}
2694		2784
2695	#############################################################################	2785	#############################################################################
2696		2786
2697	package CFClient::UI::InventoryItem;
2698
2699	our @ISA = CFClient::UI::HBox::;
2700
2701	sub _item_to_desc {
2702	my ($item) = @_;
2703
2704	my $desc =
2705	$item->{nrof} < 2
2706	? $item->{name}
2707	: "$item->{nrof} × $item->{name_pl}";
2708
2709	$item->{flags} & Crossfire::Protocol::F_OPEN
2710	and $desc .= " (open)";
2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
2712	and $desc .= " (applied)";
2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
2714	and $desc .= " (unpaid)";
2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
2716	and $desc .= " (magic)";
2717	$item->{flags} & Crossfire::Protocol::F_CURSED
2718	and $desc .= " (cursed)";
2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
2720	and $desc .= " (damned)";
2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
2722	and $desc .= " *";
2723
2724	$desc
2725	}
2726
2727	sub new {
2728	my $class = shift;
2729
2730	my %args = @_;
2731
2732	my $item = delete $args{item};
2733
2734	my $desc = _item_to_desc ($item);
2735
2736	my $self = $class->SUPER::new (
2737	can_hover => 1,
2738	can_events => 1,
2739	tooltip => ((CFClient::UI::Label::escape $desc)
2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741	connect_button_down => sub {
2742	my ($self, $ev, $x, $y) = @_;
2743
2744	# todo: maybe put examine on 1? but should just be a tooltip :(
2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746	my $targ = $::CONN->{player}{tag};
2747
2748	if ($item->{container} == $::CONN->{player}{tag}) {
2749	$targ = $main::OPENCONT;
2750	}
2751
2752	$::CONN->send ("move $targ $item->{tag} 0");
2753	} elsif ($ev->{button} == 1) {
2754	$::CONN->send ("examine $item->{tag}");
2755	} elsif ($ev->{button} == 2) {
2756	$::CONN->send ("apply $item->{tag}");
2757	} elsif ($ev->{button} == 3) {
2758	my @menu_items = (
2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762	(
2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
2764	? (
2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766	)
2767	: (
2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770	)
2771	),
2772	);
2773
2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775	}
2776
2777	1
2778	},
2779	%args
2780	);
2781
2782
2783	$self->add (new CFClient::UI::Face
2784	can_events => 0,
2785	face => $item->{face},
2786	anim => $item->{anim},
2787	animspeed => $item->{animspeed},
2788	);
2789
2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792	$self->{item} = $item;
2793
2794	$self->update_item;
2795
2796	$self
2797	}
2798
2799	sub update_item {
2800	my ($self) = @_;
2801
2802	my $desc = _item_to_desc ($self->{item});
2803
2804	$self->{name_lbl}->set_text ($desc);
2805	}
2806
2807	#############################################################################
2808
2809	package CFClient::UI::Inventory;
2810
2811	our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813	sub new {
2814	my $class = shift;
2815
2816	my $self = $class->SUPER::new (
2817	scrolled => (new CFClient::UI::Table),
2818	@_,
2819	);
2820
2821	$self
2822	}
2823
2824	sub set_items {
2825	my ($self, $items) = @_;
2826
2827	$self->{scrolled}->clear;
2828	return unless $items;
2829
2830	my @items = sort {
2831	($a->{type} <=> $b->{type})
2832	or ($a->{name} cmp $b->{name})
2833	} @$items;
2834
2835	$self->{real_items} = \@items;
2836
2837	for my $item (@items) {
2838	$item->{item} = $item;
2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840	$item->update_item ();
2841	}
2842
2843	my $i = 0;
2844	for (@items) {
2845	$self->{scrolled}->add (0, $i, $_);
2846	my $nrof = $_->{item}->{nrof} || 1;
2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848	}
2849
2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851	}
2852
2853	sub size_request {
2854	my ($self) = @_;
2855	($self->{req_w}, $self->{req_h});
2856	}
2857
2858	#############################################################################
2859
2860	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2861		2788
2862	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2863		2790
2864	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2902	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2903	$GRAB = $self;	2830	$GRAB = $self;
2904	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2905		2832
2906	$self->show;	2833	$self->show;
2907	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2834	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908	}	2835	}
2909		2836
2910	sub mouse_motion {	2837	sub mouse_motion {
2911	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2912		2839
…		…
2992	sub add {	2919	sub add {
2993	my ($self, $text, %arg) = @_;	2920	my ($self, $text, %arg) = @_;
2994		2921
2995	$text =~ s/^\s+//;	2922	$text =~ s/^\s+//;
2996	$text =~ s/\s+$//;	2923	$text =~ s/\s+$//;
		2924
		2925	return unless $text;
2997		2926
2998	my $timeout = time + ((delete $arg{timeout}) || 60);	2927	my $timeout = time + ((delete $arg{timeout}) || 60);
2999		2928
3000	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2929	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001		2930
…		…
3035	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
3036	}	2965	}
3037		2966
3038	#############################################################################	2967	#############################################################################
3039		2968
3040	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
3041		2970
3042	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044	use CFClient::OpenGL;
3045		2972
3046	sub new {	2973	sub new {
3047	my $class = shift;	2974	my $class = shift;
3048		2975
3049	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3050	@_,	2978	@_,
3051	)	2979	);
3052	}
3053		2980
3054	sub configure {	2981	$self
		2982	}
		2983
		2984	sub set_items {
		2985	my ($self, $items) = @_;
		2986
		2987	$self->{scrolled}->clear;
		2988	return unless $items;
		2989
		2990	my @items = sort {
		2991	($a->{type} <=> $b->{type})
		2992	or ($a->{name} cmp $b->{name})
		2993	} @$items;
		2994
		2995	$self->{real_items} = \@items;
		2996
		2997	my $row = 0;
		2998	for my $item (@items) {
		2999	CFClient::Item::update_widgets $item;
		3000
		3001	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3004
		3005	$row++;
		3006	}
		3007	}
		3008
		3009	#############################################################################
		3010
		3011	package CFClient::UI::BindEditor;
		3012
		3013	our @ISA = CFClient::UI::FancyFrame::;
		3014
		3015	sub new {
		3016	my $class = shift;
		3017
		3018	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3019
		3020	$self->add (my $vb = new CFClient::UI::VBox);
		3021
		3022
		3023	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3024	text => "start recording",
		3025	tooltip => "Start/Stops recording of actions."
		3026	."All subsequent actions after the recording started will be captured."
		3027	."The actions are displayed after the record was stopped."
		3028	."To bind the action you have to click on the 'Bind' button",
		3029	on_activate => sub {
		3030	unless ($self->{recording}) {
		3031	$self->start;
		3032	} else {
		3033	$self->stop;
		3034	}
		3035	});
		3036
		3037	$vb->add (new CFClient::UI::Label text => "Actions:");
		3038	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3039
		3040	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3041	$vb->add (my $hb = new CFClient::UI::HBox);
		3042	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3043	$hb->add (new CFClient::UI::Button
		3044	text => "bind",
		3045	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3046	on_activate => sub {
		3047	$self->ask_for_bind;
		3048	});
		3049
		3050	$vb->add (my $hb = new CFClient::UI::HBox);
		3051	$hb->add (new CFClient::UI::Button
		3052	text => "ok",
		3053	expand => 1,
		3054	tooltip => "This closes the binding editor and saves the binding",
		3055	on_activate => sub {
		3056	$self->hide;
		3057	$self->commit;
		3058	});
		3059
		3060	$hb->add (new CFClient::UI::Button
		3061	text => "cancel",
		3062	expand => 1,
		3063	tooltip => "This closes the binding editor without saving",
		3064	on_activate => sub {
		3065	$self->hide;
		3066	$self->{binding_cancel}->()
		3067	if $self->{binding_cancel};
		3068	});
		3069
		3070	$self->update_binding_widgets;
		3071
		3072	$self
		3073	}
		3074
		3075	sub commit {
		3076	my ($self) = @_;
		3077	my ($mod, $sym, $cmds) = $self->get_binding;
		3078	if ($sym != 0 && @$cmds > 0) {
		3079	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3080	."'. Don't forget 'Save Config'!");
		3081	$self->{binding_change}->($mod, $sym, $cmds)
		3082	if $self->{binding_change};
		3083	} else {
		3084	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3085	$self->{binding_cancel}->()
		3086	if $self->{binding_cancel};
		3087	}
		3088	}
		3089
		3090	sub start {
		3091	my ($self) = @_;
		3092
		3093	$self->{rec_btn}->set_text ("stop recording");
		3094	$self->{recording} = 1;
		3095	$self->clear_command_list;
		3096	$::CONN->start_record if $::CONN;
		3097	}
		3098
		3099	sub stop {
		3100	my ($self) = @_;
		3101
		3102	$self->{rec_btn}->set_text ("start recording");
		3103	$self->{recording} = 0;
		3104
		3105	my $rec;
		3106	$rec = $::CONN->stop_record if $::CONN;
		3107	return unless ref $rec eq 'ARRAY';
		3108	$self->set_command_list ($rec);
		3109	}
		3110
		3111	# if $commit is true, the binding will be set after the user entered a key combo
		3112	sub ask_for_bind {
		3113	my ($self, $commit) = @_;
		3114
		3115	CFClient::Binder::open_binding_dialog (sub {
		3116	my ($mod, $sym) = @_;
		3117	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3118	$self->update_binding_widgets;
		3119	$self->commit if $commit;
		3120	});
		3121	}
		3122
		3123	# $mod and $sym are the modifiers and key symbol
		3124	# $cmds is a array ref of strings (the commands)
		3125	# $cb is the callback that is executed on OK
		3126	# $ccb is the callback that is executed on CANCEL and
		3127	# when the binding was unsuccessful on OK
		3128	sub set_binding {
3055	my ($self, $x, $y, $w, $h) = @_;	3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3056		3130
3057	$self->{w} = $w;	3131	$self->clear_command_list;
3058	$self->{h} = $h;	3132	$self->{recording} = 0;
3059	}	3133	$self->{rec_btn}->set_text ("start recording");
3060		3134
3061	sub check_size {	3135	$self->{binding} = [$mod, $sym];
		3136	$self->{commands} = $cmds;
		3137
		3138	$self->{binding_change} = $cb;
		3139	$self->{binding_cancel} = $ccb;
		3140
		3141	$self->update_binding_widgets;
		3142	}
		3143
		3144	# this is a shortcut method that asks for a binding
		3145	# and then just binds it.
		3146	sub do_quick_binding {
3062	my ($self) = @_;	3147	my ($self, $cmds) = @_;
		3148	$self->set_binding (undef, undef, $cmds, sub {
		3149	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3150	});
		3151	$self->ask_for_bind (1);
		3152	}
3063		3153
3064	$self->size_allocate ($self->{w}, $self->{h})	3154	sub update_binding_widgets {
3065	if $self->{w};	3155	my ($self) = @_;
		3156	my ($mod, $sym, $cmds) = $self->get_binding;
		3157	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3158	$self->set_command_list ($cmds);
		3159	}
		3160
		3161	sub get_binding {
		3162	my ($self) = @_;
		3163	return (
		3164	$self->{binding}->[0],
		3165	$self->{binding}->[1],
		3166	[ grep { defined $_ } @{$self->{commands}} ]
		3167	);
		3168	}
		3169
		3170	sub clear_command_list {
		3171	my ($self) = @_;
		3172	$self->{cmdbox}->clear ();
		3173	}
		3174
		3175	sub set_command_list {
		3176	my ($self, $cmds) = @_;
		3177
		3178	$self->{cmdbox}->clear ();
		3179	$self->{commands} = $cmds;
		3180
		3181	my $idx = 0;
		3182
		3183	for (@$cmds) {
		3184	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3185
		3186	my $i = $idx;
		3187	$hb->add (new CFClient::UI::Label text => $_);
		3188	$hb->add (new CFClient::UI::Button
		3189	text => "delete",
		3190	tooltip => "Deletes the action from the record",
		3191	on_activate => sub {
		3192	$self->{cmdbox}->remove ($hb);
		3193	$cmds->[$i] = undef;
		3194	});
		3195
		3196
		3197	$idx++
		3198	}
		3199	}
		3200
		3201	#############################################################################
		3202
		3203	package CFClient::UI::SpellList;
		3204
		3205	our @ISA = CFClient::UI::FancyFrame::;
		3206
		3207	sub new {
		3208	my $class = shift;
		3209
		3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3211
		3212	$self->add (new CFClient::UI::ScrolledWindow
		3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3214
		3215	$self;
		3216	}
		3217
		3218	# XXX: Do sorting? Argl...
		3219	sub add_spell {
		3220	my ($self, $spell) = @_;
		3221	$self->{spells}->{$spell->{name}} = $spell;
		3222
		3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3224	face => $spell->{face},
		3225	can_hover => 1,
		3226	can_events => 1,
		3227	tooltip => $spell->{message});
		3228
		3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3230	text => $spell->{name},
		3231	can_hover => 1,
		3232	can_events => 1,
		3233	tooltip => $spell->{message},
		3234	expand => 1);
		3235
		3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3238	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3239	expand => 1);
		3240
		3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3242	text => "bind to key",
		3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3244	}
		3245
		3246	sub rebuild_spell_list {
		3247	my ($self) = @_;
		3248	$self->{tbl_idx} = 0;
		3249	$self->add_spell ($_) for values %{$self->{spells}};
		3250	}
		3251
		3252	sub remove_spell {
		3253	my ($self, $spell) = @_;
		3254	delete $self->{spells}->{$spell->{name}};
		3255	$self->rebuild_spell_list;
		3256	}
		3257
		3258	#############################################################################
		3259
		3260	package CFClient::UI::Root;
		3261
		3262	our @ISA = CFClient::UI::Container::;
		3263
		3264	use CFClient::OpenGL;
		3265
		3266	sub new {
		3267	my $class = shift;
		3268
		3269	my $self = $class->SUPER::new (
		3270	visible => 1,
		3271	@_,
		3272	);
		3273
		3274	Scalar::Util::weaken ($self->{root} = $self);
		3275
		3276	$self
3066	}	3277	}
3067		3278
3068	sub size_request {	3279	sub size_request {
3069	my ($self) = @_;	3280	my ($self) = @_;
3070		3281
3071	($self->{w}, $self->{h})	3282	($self->{w}, $self->{h})
		3283	}
		3284
		3285	sub _to_pixel {
		3286	my ($coord, $size, $max) = @_;
		3287
		3288	$coord =
		3289	$coord eq "center" ? ($max - $size) * 0.5
		3290	: $coord eq "max" ? $max
		3291	: $coord;
		3292
		3293	$coord = 0 if $coord < 0;
		3294	$coord = $max - $size if $coord > $max - $size;
		3295
		3296	int $coord + 0.5
3072	}	3297	}
3073		3298
3074	sub size_allocate {	3299	sub size_allocate {
3075	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3076		3301
3077	for my $child ($self->children) {	3302	for my $child ($self->children) {
3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3303	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079		3304
3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3081	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3082		3307
3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3084	if exists $child->{req_y};	3309	$Y = _to_pixel $Y, $H, $self->{h};
3085
3086	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088		3310
3089	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3090	}	3312	}
3091	}	3313	}
3092		3314
…		…
3103	}	3325	}
3104		3326
3105	sub update {	3327	sub update {
3106	my ($self) = @_;	3328	my ($self) = @_;
3107		3329
3108	$self->check_size;
3109	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3110	}	3331	}
3111		3332
3112	sub add {	3333	sub add {
3113	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3114		3335
3115	for (my @widgets = @children; my $w = pop @widgets; ) {
3116	push @widgets, $w->children;
3117	$w->{root} = $self;
3118	$w->{visible} = 1;
3119	}
3120
3121	for my $child (@children) {
3122	$child->{is_toplevel} = 1;	3336	$_->{is_toplevel} = 1
3123		3337	for @children;
3124	# integerise window positions
3125	$child->{x} = int $child->{x};
3126	$child->{y} = int $child->{y};
3127	}
3128		3338
3129	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3130	}	3340	}
3131		3341
3132	sub remove {	3342	sub remove {
3133	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3134		3344
3135	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3136		3349
3137	while (@children) {	3350	while (@children) {
3138	my $w = pop @children;	3351	my $w = pop @children;
3139	push @children, $w->children;	3352	push @children, $w->children;
3140	$w->set_invisible;	3353	$w->set_invisible;
…		…
3159	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3160	$_->()	3373	$_->()
3161	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3162	}	3375	}
3163		3376
3164	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3165	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3166		3381
3167	for (;;) {	3382	outer:
3168	if ($self->{check_size}) {	3383	while () {
3169	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3170	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3171	for values %{delete $self->{check_size}}	3386	$widget->{visible} or next; # do not resize invisible widgets
		3387
		3388	$queue{$widget+0}++ and next; # duplicates are common
		3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3172	}	3392	}
3173		3393
3174	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3175		3396
3176	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3177	? @$widget{qw(user_w user_h)}	3398	and last;
3178	: $widget->size_request;
3179
3180	if (delete $widget->{force_alloc}
3181	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183		3399
		3400	pop @queue;
		3401	}
		3402
		3403	delete $queue{$widget+0};
		3404
		3405	my ($w, $h) = $widget->size_request;
		3406
		3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3409
		3410	$w = $widget->{force_w} if exists $widget->{force_w};
		3411	$h = $widget->{force_h} if exists $widget->{force_h};
		3412
		3413	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3414	|| delete $widget->{force_realloc}) {
3184	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3185	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3186		3417
3187	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3188		3419
3189	$widget->{parent}->check_size
3190	if $widget->{parent};	3420	if (my $parent = $widget->{parent}) {
		3421	$self->{realloc}{$parent+0} = $parent
		3422	unless $queue{$parent+0};
		3423
		3424	$parent->{force_size_alloc} = 1;
		3425	$self->{size_alloc}{$parent+0} = $parent;
		3426	}
3191	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3192	}	3430	}
3193	}	3431	}
3194		3432
3195	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3196	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3197	my ($widget, $w, $h) = @$_;	3435	values %$size_alloc;
		3436
		3437	while () {
		3438	my $widget = pop @queue || last;
		3439
		3440	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198		3441
3199	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3200	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3201		3444
		3445	$w = int $w + 0.5;
		3446	$h = int $h + 0.5;
		3447
		3448	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3449	$widget->{old_w} = $widget->{w};
		3450	$widget->{old_h} = $widget->{h};
		3451
3202	$widget->{w} = $w;	3452	$widget->{w} = $w;
3203	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3204	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3205	}	3457	}
3206	}	3458	}
3207		3459
3208	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3209	$_->()	3461	$_->()
3210	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3211	}	3463	}
		3464
3212		3465
3213	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3216		3469

Diff Legend

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