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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
177	$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.]+$/;
178	$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};
179	$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};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$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.]+$/;
182	$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};
183	$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};
184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
209		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}
334
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}	373	}
341		374
342	sub children {	375	sub children {
343	}	376	}
344		377
…		…
417	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
418		451
419	$self->focus_in;	452	$self->focus_in;
420	}	453	}
421		454
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
426	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427		528
428	sub draw {	529	sub draw {
429	my ($self) = @_;	530	my ($self) = @_;
430		531
431	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432		543
433	glPushMatrix;	544	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	546	$self->_draw;
436	glPopMatrix;	547	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
449	glEnd;	560	glEnd;
450	glDisable GL_BLEND;	561	glDisable GL_BLEND;
451	}	562	}
452		563
453	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	565	glPushMatrix;
455	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
469	my ($self) = @_;	580	my ($self) = @_;
470		581
471	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
472	}	583	}
473		584
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	585	sub DESTROY {
535	my ($self) = @_;	586	my ($self) = @_;
536		587
537	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
538	#$self->deactivate;	589	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
596	}	647	}
597		648
598	sub size_request {	649	sub size_request {
599	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
600	}	653	}
601		654
602	sub draw { }	655	sub draw { }
603		656
604	#############################################################################	657	#############################################################################
…		…
633	$self->{children} = [	686	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
636	];	689	];
637		690
638	$self->check_size (1);	691	$self->realloc;
639	$self->update;
640	}	692	}
641		693
642	sub children {	694	sub children {
643	@{ $_[0]{children} }	695	@{ $_[0]{children} }
644	}	696	}
…		…
649	delete $child->{parent};	701	delete $child->{parent};
650	$child->hide;	702	$child->hide;
651		703
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		705
654	$self->check_size (1);	706	$self->realloc;
655	$self->update;
656	}	707	}
657		708
658	sub clear {	709	sub clear {
659	my ($self) = @_;	710	my ($self) = @_;
660		711
…		…
664	for (@$children) {	715	for (@$children) {
665	delete $_->{parent};	716	delete $_->{parent};
666	$_->hide;	717	$_->hide;
667	}	718	}
668		719
669	$self->check_size;	720	$self->realloc;
670	$self->update;
671	}	721	}
672		722
673	sub find_widget {	723	sub find_widget {
674	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
675		725
…		…
762	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	813	$self->update;
764	}	814	}
765		815
766	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
767	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
768	}	820	}
769		821
770	sub render_child {	822	sub render_child {
771	my ($self) = @_;	823	my ($self) = @_;
772		824
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
776		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
777	$self->_render;	836	$self->_render;
778	};	837	};
779	}	838	}
780		839
781	sub _draw {	840	sub _draw {
782	my ($self) = @_;	841	my ($self) = @_;
783		842
784	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
785		844
786	my $tex = $self->{texture}	845	my $tex = $self->{texture}
787	or return;	846	or return;
788		847
789	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
812	}	871	}
813		872
814	sub size_request {	873	sub size_request {
815	my ($self) = @_;	874	my ($self) = @_;
816		875
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		877
819	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
820	}	882	}
821		883
822	sub size_allocate {	884	sub size_allocate {
823	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
824		886
		887	my $child = $self->child;
		888
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		891
828	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
829	$self->update;	893	$self->update;
830	}	894	}
831		895
…		…
867	}	931	}
868		932
869	sub _render {	933	sub _render {
870	my ($self) = @_;	934	my ($self) = @_;
871		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		940
874	$self->SUPER::_render;	941	$self->SUPER::_render;
875	}	942	}
876		943
…		…
884	my $class = shift;	951	my $class = shift;
885		952
886	my $self;	953	my $self;
887		954
888	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
889	vertical => 1,	956	vertical => 1,
890	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
891	connect_changed => sub {	958	on_changed => sub {
892	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
893	},	960	},
894	;	961	;
895		962
896	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
974		1041
975	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
976		1043
977	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
978		1045
979	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1053
983	sub new {	1054	sub new {
984	my $class = shift;	1055	my ($class, %arg) = @_;
985		1056
986	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
987		1058
988	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1062	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1063	can_events => 1,
994	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
995	);	1067	);
996		1068
997	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
998	align => 0,	1070	align => 0,
999	valign => 1,	1071	valign => 1,
1000	text => $self->{title},	1072	text => $title,
1001	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
1002		1075
1003	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004	}	1084	}
1005		1085
1006	sub border {	1086	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
1008	}	1088	}
1009		1089
1010	sub size_request {	1090	sub size_request {
1011	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
1012		1095
1013	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
1014		1097
1015	(	1098	(
1016	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
1019	}	1102	}
1020		1103
1021	sub size_allocate {	1104	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
1023		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
1024	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
1026		1117
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1031	}	1119	}
1032		1120
1033	sub button_down {	1121	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1035		1123
…		…
1051	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1052		1140
1053	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1055		1143
1056	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
1058	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059	$self->check_size;
1060	};	1149	};
1061		1150
1062	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1063	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1066	$self->{motion} = sub {	1155	$self->{motion} = sub {
1067	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1068		1157
1069	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1070		1159
1071	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072	$self->update;
1073	};	1161	};
1074	}	1162	}
1075	}	1163	}
1076		1164
1077	sub button_up {	1165	sub button_up {
…		…
1087	}	1175	}
1088		1176
1089	sub _draw {	1177	sub _draw {
1090	my ($self) = @_;	1178	my ($self) = @_;
1091		1179
		1180	my $child = $self->{children}[0];
		1181
1092	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1093	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1094		1184
1095	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1096	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097		1187
1098	my $border = $self->border;	1188	my $border = $self->border;
1099		1189
1100	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1101	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1102	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105		1195
1106	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1108		1198
1109	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1110	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1111	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1112
1113	glColor @{ $self->{bg} };
1114
1115	$bg->{s} = $rep_x;
1116	$bg->{t} = $rep_y;
1117	$bg->{wrap_mode} = 1;
1118	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119	}	1204	}
1120		1205
1121	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1122		1207
1123	$self->{title}->draw if $self->{title};
1124
1125	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1126	}	1214	}
1127		1215
1128	#############################################################################	1216	#############################################################################
1129		1217
1130	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1152	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1153		1241
1154	$child->set_parent ($self);	1242	$child->set_parent ($self);
1155	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1156		1244
1157	$self->check_size (1);	1245	$self->realloc;
1158	}	1246	}
1159		1247
1160	# TODO: move to container class maybe? send children a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1161	sub clear {	1249	sub clear {
1162	my ($self) = @_;	1250	my ($self) = @_;
…		…
1167	for (@children) {	1255	for (@children) {
1168	delete $_->{parent};	1256	delete $_->{parent};
1169	$_->hide;	1257	$_->hide;
1170	}	1258	}
1171		1259
1172	$self->check_size (1);	1260	$self->realloc;
1173	$self->update;
1174	}	1261	}
1175		1262
1176	sub get_wh {	1263	sub get_wh {
1177	my ($self) = @_;	1264	my ($self) = @_;
1178		1265
…		…
1274	}	1361	}
1275	}	1362	}
1276		1363
1277	#############################################################################	1364	#############################################################################
1278		1365
1279	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1280
1281	# TODO: wrap into common Box base class
1282		1367
1283	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1284		1369
1285	sub size_request {	1370	sub size_request {
1286	my ($self) = @_;	1371	my ($self) = @_;
1287		1372
1288	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1289		1374	? (
1290	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1291	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292	(List::Util::max map $_->[1], @alloc),	1377	)
1293	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1294	}	1382	}
1295		1383
1296	sub size_allocate {	1384	sub size_allocate {
1297	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1298		1386
1299	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1300
1301	my $children = $self->{children};	1388	my $children = $self->{children};
1302		1389
1303	my @h = map $_->{req_w}, @$children;	1390	my @req;
1304		1391
1305	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1306		1393	@req = ($space / (@$children || 1)) x @$children;
1307	if ($req_h > $h) {
1308	# ah well, not enough space
1309	$_ *= $h / $req_h for @h;
1310	} else {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1311	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312	$exp ||= 1;
1313		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1314	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1315	my $child = $children->[$_];
1316
1317	my $alloc_h = $h[$_];
1318	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319	$h[$_] = $alloc_h;
1320	}	1408	}
1321	}	1409	}
1322		1410
1323	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1324		1412
1325	my $y = 0;	1413	my $pos = 0;
1326	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];	1415	my $alloc = $req[$_];
1329	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330		1417
1331	$y += $h;	1418	$pos += $alloc;
1332	}	1419	}
1333		1420
1334	1	1421	1
1335	}	1422	}
1336		1423
1337	#############################################################################	1424	#############################################################################
1338		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1339	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1340		1442
1341	# TODO: wrap into common Box base class
1342
1343	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1344		1444
1345	sub size_request {	1445	sub new {
1346	my ($self) = @_;	1446	my $class = shift;
1347		1447
1348	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1349		1449	vertical => 1,
1350	(	1450	@_,
1351	(List::Util::max map $_->[0], @alloc),
1352	(List::Util::sum map $_->[1], @alloc),
1353	)	1451	)
1354	}
1355
1356	sub size_allocate {
1357	my ($self, $w, $h) = @_;
1358
1359	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361	my $children = $self->{children};
1362
1363	my @h = map $_->{req_h}, @$children;
1364
1365	my $req_h = List::Util::sum @h;
1366
1367	if ($req_h > $h) {
1368	# ah well, not enough space
1369	$_ *= $h / $req_h for @h;
1370	} else {
1371	my $exp = List::Util::sum map $_->{expand}, @$children;
1372	$exp ||= 1;
1373
1374	for (0 .. $#$children) {
1375	my $child = $children->[$_];
1376
1377	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378	}
1379	}
1380
1381	CFClient::UI::harmonize \@h;
1382
1383	my $y = 0;
1384	for (0 .. $#$children) {
1385	my $child = $children->[$_];
1386	my $h = $h[$_];
1387	$child->configure (0, $y, $w, $h);
1388
1389	$y += $h;
1390	}
1391
1392	1
1393	}	1452	}
1394		1453
1395	#############################################################################	1454	#############################################################################
1396		1455
1397	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1414	ellipsise => 3, # end	1473	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1416	fontsize => 1,	1475	fontsize => 1,
1417	align => -1,	1476	align => -1,
1418	valign => -1,	1477	valign => -1,
1419	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1420	can_events => 0,	1480	can_events => 0,
1421	%arg	1481	%arg
1422	);	1482	);
1423		1483
1424	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1461		1521
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1464		1524
		1525	$self->realloc;
1465	$self->update;	1526	$self->update;
1466	$self->check_size;
1467	}	1527	}
1468		1528
1469	sub set_markup {	1529	sub set_markup {
1470	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1471		1531
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1536
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1479		1539
		1540	$self->realloc;
1480	$self->update;	1541	$self->update;
1481	$self->check_size;
1482	}	1542	}
1483		1543
1484	sub size_request {	1544	sub size_request {
1485	my ($self) = @_;	1545	my ($self) = @_;
1486		1546
…		…
1500		1560
1501	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1503	}	1563	}
1504		1564
1505	(	1565	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1566	}
1510		1567
1511	sub size_allocate {	1568	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1513		1570
		1571	delete $self->{ox};
		1572
1514	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1575	}
1516		1576
1517	sub set_fontsize {	1577	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1519		1579
1520	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1581	delete $self->{texture};
1522		1582
1523	$self->update;	1583	$self->realloc;
1524	$self->check_size;
1525	}	1584	}
1526		1585
1527	sub _draw {	1586	sub _draw {
1528	my ($self) = @_;	1587	my ($self) = @_;
1529		1588
…		…
1535	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1598
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1541		1601
		1602	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1545		1606
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1610	};
1552		1611
1553	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1614
…		…
1609	sub set_text {	1668	sub set_text {
1610	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1611		1670
1612	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1672	$self->_set_text ($text);
1614	$self->update;	1673
1615	$self->check_size;	1674	$self->realloc;
1616	}	1675	}
1617		1676
1618	sub get_text {	1677	sub get_text {
1619	$_[0]{text}	1678	$_[0]{text}
1620	}	1679	}
…		…
1653	} elsif ($uni) {	1712	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1655	}	1714	}
1656		1715
1657	$self->_set_text ($text);	1716	$self->_set_text ($text);
1658	$self->update;	1717
1659	$self->check_size;	1718	$self->realloc;
1660	}	1719	}
1661		1720
1662	sub focus_in {	1721	sub focus_in {
1663	my ($self) = @_;	1722	my ($self) = @_;
1664		1723
…		…
1791		1850
1792	sub new {	1851	sub new {
1793	my $class = shift;	1852	my $class = shift;
1794		1853
1795	$class->SUPER::new (	1854	$class->SUPER::new (
1796	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1797	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1799	can_hover => 1,	1859	can_hover => 1,
1800	align => 0,	1860	align => 0,
1801	valign => 0,	1861	valign => 0,
…		…
1848		1908
1849	sub new {	1909	sub new {
1850	my $class = shift;	1910	my $class = shift;
1851		1911
1852	$class->SUPER::new (	1912	$class->SUPER::new (
1853	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1854	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1919	state => 0,
…		…
1862	}	1923	}
1863		1924
1864	sub size_request {	1925	sub size_request {
1865	my ($self) = @_;	1926	my ($self) = @_;
1866		1927
1867	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1868	}	1929	}
1869		1930
1870	sub button_down {	1931	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1872		1933
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1877	}	1938	}
1878	}	1939	}
1879		1940
1880	sub _draw {	1941	sub _draw {
1881	my ($self) = @_;	1942	my ($self) = @_;
1882		1943
1883	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1884		1945
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1947
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1951
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1953
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1955
…		…
2157	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2164	vertical => 0,	2227	vertical => 0,
2165	can_hover => 1,	2228	can_hover => 1,
2166	inner_pad => 0.02,	2229	inner_pad => 0.02,
2167	@_	2230	@_
2168	);	2231	);
…		…
2171	$self->update;	2234	$self->update;
2172		2235
2173	$self	2236	$self
2174	}	2237	}
2175		2238
		2239	sub changed { }
		2240
2176	sub set_range {	2241	sub set_range {
2177	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2178		2243
2179	($range, $self->{range}) = ($self->{range}, $range);	2244	($range, $self->{range}) = ($self->{range}, $range);
2180		2245
…		…
2206	}	2271	}
2207		2272
2208	sub size_request {	2273	sub size_request {
2209	my ($self) = @_;	2274	my ($self) = @_;
2210		2275
2211	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2277	}
2216		2278
2217	sub button_down {	2279	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2219		2281
…		…
2570		2632
2571	sub new {	2633	sub new {
2572	my $class = shift;	2634	my $class = shift;
2573		2635
2574	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2575	state => 0,	2637	state => 0,
2576	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2577	@_	2639	@_
2578	);	2640	);
2579		2641
2580	if ($self->{state}) {
2581	$self->{state} = 0;
2582	$self->toggle_flopper;
2583	}
2584
2585	$self	2642	$self
2586	}	2643	}
2587		2644
2588	sub toggle_flopper {	2645	sub toggle_flopper {
2589	my ($self) = @_;	2646	my ($self) = @_;
2590		2647
2591	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2592	if ($self->{state} = !$self->{state}) {
2593	$CFClient::UI::ROOT->add ($self->{other});
2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2595	$self->_emit ("open");
2596	} else {
2597	$CFClient::UI::ROOT->remove ($self->{other});
2598	$self->_emit ("close");
2599	}
2600
2601	$self->_emit (changed => $self->{state});
2602	}	2649	}
2603		2650
2604	#############################################################################	2651	#############################################################################
2605		2652
2606	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2619	}	2666	}
2620		2667
2621	sub set_tooltip_from {	2668	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2623		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2624	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2681	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2683	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2685	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2641		2697
2642	sub size_allocate {	2698	sub size_allocate {
2643	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2644		2700
2645	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2646	}	2720	}
2647		2721
2648	sub _draw {	2722	sub _draw {
2649	my ($self) = @_;	2723	my ($self) = @_;
2650		2724
…		…
2667	glVertex $w, $h;	2741	glVertex $w, $h;
2668	glVertex $w, 0;	2742	glVertex $w, 0;
2669	glEnd;	2743	glEnd;
2670		2744
2671	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2672	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2673	}	2748	}
2674		2749
2675	#############################################################################	2750	#############################################################################
2676		2751
…		…
2752	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2753	}	2828	}
2754		2829
2755	#############################################################################	2830	#############################################################################
2756		2831
2757	package CFClient::UI::Inventory;
2758
2759	our @ISA = CFClient::UI::ScrolledWindow::;
2760
2761	sub new {
2762	my $class = shift;
2763
2764	my $self = $class->SUPER::new (
2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766	@_,
2767	);
2768
2769	$self
2770	}
2771
2772	sub set_items {
2773	my ($self, $items) = @_;
2774
2775	$self->{scrolled}->clear;
2776	return unless $items;
2777
2778	my @items = sort {
2779	($a->{type} <=> $b->{type})
2780	or ($a->{name} cmp $b->{name})
2781	} @$items;
2782
2783	$self->{real_items} = \@items;
2784
2785	my $row = 0;
2786	for my $item (@items) {
2787	CFClient::Item::update_widgets $item;
2788
2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793	$row++;
2794	}
2795	}
2796
2797	sub size_request {
2798	my ($self) = @_;
2799	($self->{req_w}, $self->{req_h});
2800	}
2801
2802	#############################################################################
2803
2804	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2805		2833
2806	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2807		2835
2808	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2846	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2847	$GRAB = $self;	2875	$GRAB = $self;
2848	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2849		2877
2850	$self->show;	2878	$self->show;
2851	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852	}	2880	}
2853		2881
2854	sub mouse_motion {	2882	sub mouse_motion {
2855	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2856		2884
…		…
2981	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2982	}	3010	}
2983		3011
2984	#############################################################################	3012	#############################################################################
2985		3013
2986	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2987		3015
2988	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990	use CFClient::OpenGL;
2991		3017
2992	sub new {	3018	sub new {
2993	my $class = shift;	3019	my $class = shift;
2994		3020
2995	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3023	@_,
		3024	);
		3025
		3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
		3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3180
		3181	$self->clear_command_list;
		3182	$self->{recording} = 0;
		3183	$self->{rec_btn}->set_text ("start recording");
		3184
		3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
		3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
		3203
		3204	sub update_binding_widgets {
		3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
		3310	package CFClient::UI::Root;
		3311
		3312	our @ISA = CFClient::UI::Container::;
		3313
		3314	use CFClient::OpenGL;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
2996	visible => 1,	3320	visible => 1,
2997	@_,	3321	@_,
2998	)	3322	);
2999	}
3000		3323
3001	sub configure {	3324	Scalar::Util::weaken ($self->{root} = $self);
3002	my ($self, $x, $y, $w, $h) = @_;
3003		3325
3004	$self->{w} = $w;	3326	$self
3005	$self->{h} = $h;
3006	}
3007
3008	sub check_size {
3009	my ($self) = @_;
3010
3011	$self->size_allocate ($self->{w}, $self->{h})
3012	if $self->{w};
3013	}	3327	}
3014		3328
3015	sub size_request {	3329	sub size_request {
3016	my ($self) = @_;	3330	my ($self) = @_;
3017		3331
3018	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
		3333	}
		3334
		3335	sub _to_pixel {
		3336	my ($coord, $size, $max) = @_;
		3337
		3338	$coord =
		3339	$coord eq "center" ? ($max - $size) * 0.5
		3340	: $coord eq "max" ? $max
		3341	: $coord;
		3342
		3343	$coord = 0 if $coord < 0;
		3344	$coord = $max - $size if $coord > $max - $size;
		3345
		3346	int $coord + 0.5
3019	}	3347	}
3020		3348
3021	sub size_allocate {	3349	sub size_allocate {
3022	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
3023		3351
3024	for my $child ($self->children) {	3352	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3354
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
3029		3357
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3359	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3360
3036	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
3037	}	3362	}
3038	}	3363	}
3039		3364
…		…
3050	}	3375	}
3051		3376
3052	sub update {	3377	sub update {
3053	my ($self) = @_;	3378	my ($self) = @_;
3054		3379
3055	$self->check_size;
3056	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
3057	}	3381	}
3058		3382
3059	sub add {	3383	sub add {
3060	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
3061		3385
3062	for (my @widgets = @children; my $w = pop @widgets; ) {
3063	push @widgets, $w->children;
3064	$w->{root} = $self;
3065	$w->{visible} = $self->{visible} + 1;
3066	}
3067
3068	for my $child (@children) {
3069	$child->{is_toplevel} = 1;	3386	$_->{is_toplevel} = 1
3070		3387	for @children;
3071	# integerise window positions
3072	$child->{x} = int $child->{x};
3073	$child->{y} = int $child->{y};
3074	}
3075		3388
3076	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
3077	}	3390	}
3078		3391
3079	sub remove {	3392	sub remove {
3080	my ($self, @children) = @_;	3393	my ($self, @children) = @_;
3081		3394
3082	$self->SUPER::remove (@children);	3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3083		3399
3084	while (@children) {	3400	while (@children) {
3085	my $w = pop @children;	3401	my $w = pop @children;
3086	push @children, $w->children;	3402	push @children, $w->children;
3087	$w->set_invisible;	3403	$w->set_invisible;
…		…
3106	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3107	$_->()	3423	$_->()
3108	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3109	}	3425	}
3110		3426
3111	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
3112	my @queue = ([], []);	3428	my %queue;
		3429	my @queue;
		3430	my $widget;
3113		3431
3114	for (;;) {	3432	outer:
3115	if ($self->{check_size}) {	3433	while () {
3116	# heuristic: check containers last	3434	if (my $realloc = delete $self->{realloc}) {
3117	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3435	for $widget (values %$realloc) {
3118	for values %{delete $self->{check_size}}	3436	$widget->{visible} or next; # do not resize invisible widgets
		3437
		3438	$queue{$widget+0}++ and next; # duplicates are common
		3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3119	}	3442	}
3120		3443
3121	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3444	while () {
		3445	@queue or last outer;
3122		3446
3123	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3447	$widget = pop @{ $queue[-1] || [] }
3124	? @$widget{qw(user_w user_h)}	3448	and last;
3125	: $widget->size_request;
3126
3127	if (delete $widget->{force_alloc}
3128	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3464	|| delete $widget->{force_realloc}) {
3131	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3132	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3133		3467
3134	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3135		3469
3136	$widget->{parent}->check_size
3137	if $widget->{parent};	3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
3138	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3139	}	3480	}
3140	}	3481	}
3141		3482
3142	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3143	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3144	my ($widget, $w, $h) = @$_;	3485	values %$size_alloc;
		3486
		3487	while () {
		3488	my $widget = pop @queue || last;
		3489
		3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145		3491
3146	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3147	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3148		3494
		3495	$w = int $w + 0.5;
		3496	$h = int $h + 0.5;
		3497
		3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
		3501
3149	$widget->{w} = $w;	3502	$widget->{w} = $w;
3150	$widget->{h} = $h;	3503	$widget->{h} = $h;
		3504
3151	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3152	}	3507	}
3153	}	3508	}
3154		3509
3155	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3156	$_->()	3511	$_->()
3157	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3158	}	3513	}
		3514
3159		3515
3160	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3163		3519
…		…
3165	glLoadIdentity;	3521	glLoadIdentity;
3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3168	glLoadIdentity;	3524	glLoadIdentity;
3169		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3170	$self->_draw;	3533	$self->_draw;
3171	}	3534	}
3172		3535
3173	#############################################################################	3536	#############################################################################
3174		3537

Diff Legend

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