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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

…		…
9	use CFClient;	9	use CFClient;
10	use CFClient::Texture;	10	use CFClient::Texture;
11		11
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		13
		14	our $LAYOUT;
14	our $ROOT;	15	our $ROOT;
15	our $TOOLTIP;	16	our $TOOLTIP;
16	our $BUTTON_STATE;	17	our $BUTTON_STATE;
17		18
18	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
19		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
20	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
21	if (!$GRAB) {	47	if (!$GRAB) {
22	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
24
25	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
26	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
27		54
28	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
29		56
30	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
31		58
32	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
33	$TOOLTIP->show;	60	$TOOLTIP->show;
34
35	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	if $x + $TOOLTIP->{w} > $::WIDTH;
39
40	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;
42	$TOOLTIP->update;
43	}	61	}
44		62
45	return;	63	return;
46	}	64	}
47	}	65	}
…		…
153	sub rescale_widgets {	171	sub rescale_widgets {
154	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
155		173
156	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
157	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
158	$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.]+$/;
159	$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};
160	$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};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$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};
164	$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};
165	$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
166	}	189	}
167	}	190	}
168		191
169	reconfigure_widgets;	192	reconfigure_widgets;
170	}	193	}
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	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	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub show_centered {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
218	return if $self->{parent};	257	return if $self->{visible};
219		258
220	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
221		261
222	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
223	"centered $self" => sub {	263
224	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
225	},	265
226	);	266	$_->set_visible for $self->children;
227	}	267	}
228		268
229	sub set_invisible {	269	sub set_invisible {
230	my ($self) = @_;	270	my ($self) = @_;
231		271
232	# broken show/hide model	272	return unless $self->{visible};
233		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
234	delete $self->{visible};	277	delete $self->{visible};
235		278
236	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
237	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
238		281
239	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
240	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
241		284
242	$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;
243	}	305	}
244		306
245	sub hide {	307	sub hide {
246	my ($self) = @_;	308	my ($self) = @_;
247		309
…		…
249		311
250	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
251	if $self->{parent};	313	if $self->{parent};
252	}	314	}
253		315
254	sub move {	316	sub move_abs {
255	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
256		318
257	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
258	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
259	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
260		322
261	$self->update;	323	$self->update;
262	}	324	}
263		325
264	sub set_size {	326	sub set_size {
265	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
266		328
267	$self->{user_w} = $w;	329	$self->{force_w} = $w;
268	$self->{user_h} = $h;	330	$self->{force_h} = $h;
269		331
270	$self->check_size;	332	$self->realloc;
271	}	333	}
272		334
273	sub size_request {	335	sub size_request {
274	require Carp;	336	require Carp;
275	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
277		339
278	sub configure {	340	sub configure {
279	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
280		342
281	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
282	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
283	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
284		348
285	# use alignment to adjust x, y	349	# use alignment to adjust x, y
286		350
287	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
288	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
289
290	($w, $h) = ($w2, $h2);
291	}	353	}
292		354
293	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
294	$self->{x} = $x;	356	$self->{x} = $x;
295	$self->{y} = $y;	357	$self->{y} = $y;
296	$self->update;	358	$self->update;
297	}	359	}
298		360
299	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300	$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;
301	}	368	}
302	}	369	}
303		370
304	sub size_allocate {	371	sub size_allocate {
305	# nothing to be done	372	# nothing to be done
306	}
307
308	sub reconfigure {
309	my ($self) = @_;
310
311	$self->check_size (1);
312	$self->update;
313	}	373	}
314		374
315	sub children {	375	sub children {
316	}	376	}
317		377
…		…
390	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
391		451
392	$self->focus_in;	452	$self->focus_in;
393	}	453	}
394		454
395	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
396	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
397	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
398	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
399	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
400		528
401	sub draw {	529	sub draw {
402	my ($self) = @_;	530	my ($self) = @_;
403		531
404	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);
405		543
406	glPushMatrix;	544	glPushMatrix;
407	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
408	$self->_draw;	546	$self->_draw;
409	glPopMatrix;	547	glPopMatrix;
…		…
421	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
422	glEnd;	560	glEnd;
423	glDisable GL_BLEND;	561	glDisable GL_BLEND;
424	}	562	}
425		563
426	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
427	glPushMatrix;	565	glPushMatrix;
428	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
429	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
430	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
431	glVertex 0 , 0;	569	glVertex 0 , 0;
…		…
442	my ($self) = @_;	580	my ($self) = @_;
443		581
444	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
445	}	583	}
446		584
447	sub find_widget {
448	my ($self, $x, $y) = @_;
449
450	return () unless $self->{can_events};
451
452	return $self
453	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456	()
457	}
458
459	sub set_parent {
460	my ($self, $parent) = @_;
461
462	Scalar::Util::weaken ($self->{parent} = $parent);
463
464	$self->{root} = $parent->{root};
465	$self->{visible} = $parent->{visible};
466
467	# TODO: req_w _does_change after ->reconfigure
468	$self->check_size
469	unless exists $self->{req_w};
470
471	$self->show;
472	}
473
474	sub check_size {
475	my ($self, $forced) = @_;
476
477	$self->{force_alloc} = 1 if $forced;
478	$CFClient::UI::ROOT->{check_size}{$self} = $self;
479	}
480
481	sub update {
482	my ($self) = @_;
483
484	$self->{parent}->update
485	if $self->{parent};
486	}
487
488	sub connect {
489	my ($self, $signal, $cb) = @_;
490
491	push @{ $self->{signal_cb}{$signal} }, $cb;
492	}
493
494	sub _emit {
495	my ($self, $signal, @args) = @_;
496
497	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498	}
499
500	sub emit {
501	my ($self, $signal, @args) = @_;
502
503	$self->_emit ($signal, @args)
504	|| $self->$signal (@args);
505	}
506
507	sub DESTROY {	585	sub DESTROY {
508	my ($self) = @_;	586	my ($self) = @_;
509		587
510	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
511	#$self->deactivate;	589	#$self->deactivate;
…		…
567	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
568	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
569	}	647	}
570		648
571	sub size_request {	649	sub size_request {
572	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
573	}	653	}
574		654
575	sub draw { }	655	sub draw { }
576		656
577	#############################################################################	657	#############################################################################
…		…
606	$self->{children} = [	686	$self->{children} = [
607	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
608	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
609	];	689	];
610		690
611	$self->check_size (1);	691	$self->realloc;
612	$self->update;
613	}	692	}
614		693
615	sub children {	694	sub children {
616	@{ $_[0]{children} }	695	@{ $_[0]{children} }
617	}	696	}
…		…
622	delete $child->{parent};	701	delete $child->{parent};
623	$child->hide;	702	$child->hide;
624		703
625	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626		705
627	$self->check_size (1);	706	$self->realloc;
628	$self->update;
629	}	707	}
630		708
631	sub clear {	709	sub clear {
632	my ($self) = @_;	710	my ($self) = @_;
633		711
…		…
637	for (@$children) {	715	for (@$children) {
638	delete $_->{parent};	716	delete $_->{parent};
639	$_->hide;	717	$_->hide;
640	}	718	}
641		719
642	$self->check_size;	720	$self->realloc;
643	$self->update;
644	}	721	}
645		722
646	sub find_widget {	723	sub find_widget {
647	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
648		725
…		…
735	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
736	$self->update;	813	$self->update;
737	}	814	}
738		815
739	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
740	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
741	}	820	}
742		821
743	sub render_child {	822	sub render_child {
744	my ($self) = @_;	823	my ($self) = @_;
745		824
746	$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 {
747	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
748	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
749		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
750	$self->_render;	836	$self->_render;
751	};	837	};
752	}	838	}
753		839
754	sub _draw {	840	sub _draw {
755	my ($self) = @_;	841	my ($self) = @_;
756		842
757	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
758		844
759	my $tex = $self->{texture}	845	my $tex = $self->{texture}
760	or return;	846	or return;
761		847
762	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
785	}	871	}
786		872
787	sub size_request {	873	sub size_request {
788	my ($self) = @_;	874	my ($self) = @_;
789		875
790	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791		877
792	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
793	}	882	}
794		883
795	sub size_allocate {	884	sub size_allocate {
796	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
797		886
		887	my $child = $self->child;
		888
798	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800		891
801	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
802	$self->update;	893	$self->update;
803	}	894	}
804		895
…		…
840	}	931	}
841		932
842	sub _render {	933	sub _render {
843	my ($self) = @_;	934	my ($self) = @_;
844		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
845	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846		940
847	$self->SUPER::_render;	941	$self->SUPER::_render;
848	}	942	}
849		943
…		…
857	my $class = shift;	951	my $class = shift;
858		952
859	my $self;	953	my $self;
860		954
861	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
862	vertical => 1,	956	vertical => 1,
863	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
864	connect_changed => sub {	958	on_changed => sub {
865	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
866	},	960	},
867	;	961	;
868		962
869	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
947		1041
948	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
949		1043
950	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
951		1045
952	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 =
953	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954	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);
955		1053
956	sub new {	1054	sub new {
957	my $class = shift;	1055	my ($class, %arg) = @_;
958		1056
959	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
960		1058
961	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
962	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
963	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
964	border => 0.6,	1062	border => 0.6,
965	is_toplevel => 1,
966	can_events => 1,	1063	can_events => 1,
967	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
968	);	1067	);
969		1068
970	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
971	align => 0,	1070	align => 0,
972	valign => 1,	1071	valign => 1,
973	text => $self->{title},	1072	text => $title,
974	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
975		1075
976	$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};
977	}	1084	}
978		1085
979	sub border {	1086	sub border {
980	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
981	}	1088	}
982		1089
983	sub size_request {	1090	sub size_request {
984	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
985		1095
986	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
987		1097
988	(	1098	(
989	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
992	}	1102	}
993		1103
994	sub size_allocate {	1104	sub size_allocate {
995	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
996		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
997	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
998	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
999		1117
1000	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001	if $self->{title};
1002
1003	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
1004	}	1119	}
1005		1120
1006	sub button_down {	1121	sub button_down {
1007	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
1008		1123
…		…
1024	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
1025		1140
1026	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
1027	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
1028		1143
1029	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
1031	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032	$self->check_size;
1033	};	1149	};
1034		1150
1035	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1036	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1039	$self->{motion} = sub {	1155	$self->{motion} = sub {
1040	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1041		1157
1042	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1043		1159
1044	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045	$self->update;
1046	};	1161	};
1047	}	1162	}
1048	}	1163	}
1049		1164
1050	sub button_up {	1165	sub button_up {
…		…
1060	}	1175	}
1061		1176
1062	sub _draw {	1177	sub _draw {
1063	my ($self) = @_;	1178	my ($self) = @_;
1064		1179
		1180	my $child = $self->{children}[0];
		1181
1065	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1066	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1067		1184
1068	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1069	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070		1187
1071	my $border = $self->border;	1188	my $border = $self->border;
1072		1189
1073	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1074	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1075	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078		1195
1079	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1081		1198
1082	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1083	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1084	my $rep_y = $ch / $bg->{h};	1202	$bg->{t} = $ch / $bg->{h};
1085
1086	glColor @{ $self->{bg} };
1087
1088	$bg->{s} = $rep_x;
1089	$bg->{t} = $rep_y;
1090	$bg->{wrap_mode} = 1;
1091	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092	}	1204	}
1093		1205
1094	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1095		1207
1096	$self->{title}->draw if $self->{title};
1097
1098	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1099	}	1214	}
1100		1215
1101	#############################################################################	1216	#############################################################################
1102		1217
1103	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1125	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1126		1241
1127	$child->set_parent ($self);	1242	$child->set_parent ($self);
1128	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1129		1244
1130	$self->check_size (1);	1245	$self->realloc;
1131	}	1246	}
1132		1247
1133	# 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?
1134	sub clear {	1249	sub clear {
1135	my ($self) = @_;	1250	my ($self) = @_;
…		…
1140	for (@children) {	1255	for (@children) {
1141	delete $_->{parent};	1256	delete $_->{parent};
1142	$_->hide;	1257	$_->hide;
1143	}	1258	}
1144		1259
1145	$self->check_size (1);	1260	$self->realloc;
1146	$self->update;
1147	}	1261	}
1148		1262
1149	sub get_wh {	1263	sub get_wh {
1150	my ($self) = @_;	1264	my ($self) = @_;
1151		1265
…		…
1247	}	1361	}
1248	}	1362	}
1249		1363
1250	#############################################################################	1364	#############################################################################
1251		1365
1252	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1253
1254	# TODO: wrap into common Box base class
1255		1367
1256	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1257		1369
1258	sub size_request {	1370	sub size_request {
1259	my ($self) = @_;	1371	my ($self) = @_;
1260		1372
1261	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1262		1374	? (
1263	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1264	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265	(List::Util::max map $_->[1], @alloc),	1377	)
1266	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1267	}	1382	}
1268		1383
1269	sub size_allocate {	1384	sub size_allocate {
1270	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1271		1386
1272	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1273
1274	my $children = $self->{children};	1388	my $children = $self->{children};
1275		1389
1276	my @h = map $_->{req_w}, @$children;	1390	my @req;
1277		1391
1278	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1279		1393	@req = ($space / (@$children || 1)) x @$children;
1280	if ($req_h > $h) {
1281	# ah well, not enough space
1282	$_ *= $h / $req_h for @h;
1283	} 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 {
1284	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285	$exp ||= 1;
1286		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1287	for (0 .. $#$children) {	1407	for 0 .. $#$children;
1288	my $child = $children->[$_];
1289
1290	my $alloc_h = $h[$_];
1291	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292	$h[$_] = $alloc_h;
1293	}	1408	}
1294	}	1409	}
1295		1410
1296	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1297		1412
1298	my $y = 0;	1413	my $pos = 0;
1299	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1300	my $child = $children->[$_];
1301	my $h = $h[$_];	1415	my $alloc = $req[$_];
1302	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303		1417
1304	$y += $h;	1418	$pos += $alloc;
1305	}	1419	}
1306		1420
1307	1	1421	1
1308	}	1422	}
1309		1423
1310	#############################################################################	1424	#############################################################################
1311		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
1312	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1313		1442
1314	# TODO: wrap into common Box base class
1315
1316	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1317		1444
1318	sub size_request {	1445	sub new {
1319	my ($self) = @_;	1446	my $class = shift;
1320		1447
1321	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1322		1449	vertical => 1,
1323	(	1450	@_,
1324	(List::Util::max map $_->[0], @alloc),
1325	(List::Util::sum map $_->[1], @alloc),
1326	)	1451	)
1327	}
1328
1329	sub size_allocate {
1330	my ($self, $w, $h) = @_;
1331
1332	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334	my $children = $self->{children};
1335
1336	my @h = map $_->{req_h}, @$children;
1337
1338	my $req_h = List::Util::sum @h;
1339
1340	if ($req_h > $h) {
1341	# ah well, not enough space
1342	$_ *= $h / $req_h for @h;
1343	} else {
1344	my $exp = List::Util::sum map $_->{expand}, @$children;
1345	$exp ||= 1;
1346
1347	for (0 .. $#$children) {
1348	my $child = $children->[$_];
1349
1350	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351	}
1352	}
1353
1354	CFClient::UI::harmonize \@h;
1355
1356	my $y = 0;
1357	for (0 .. $#$children) {
1358	my $child = $children->[$_];
1359	my $h = $h[$_];
1360	$child->configure (0, $y, $w, $h);
1361
1362	$y += $h;
1363	}
1364
1365	1
1366	}	1452	}
1367		1453
1368	#############################################################################	1454	#############################################################################
1369		1455
1370	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1387	ellipsise => 3, # end	1473	ellipsise => 3, # end
1388	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1389	fontsize => 1,	1475	fontsize => 1,
1390	align => -1,	1476	align => -1,
1391	valign => -1,	1477	valign => -1,
1392	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1393	can_events => 0,	1480	can_events => 0,
1394	%arg	1481	%arg
1395	);	1482	);
1396		1483
1397	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1433	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1434		1521
1435	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1437		1524
		1525	$self->realloc;
1438	$self->update;	1526	$self->update;
1439	$self->check_size;
1440	}	1527	}
1441		1528
1442	sub set_markup {	1529	sub set_markup {
1443	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1444		1531
…		…
1448	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449		1536
1450	$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;
1451	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1452		1539
		1540	$self->realloc;
1453	$self->update;	1541	$self->update;
1454	$self->check_size;
1455	}	1542	}
1456		1543
1457	sub size_request {	1544	sub size_request {
1458	my ($self) = @_;	1545	my ($self) = @_;
1459		1546
…		…
1473		1560
1474	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1475	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1476	}	1563	}
1477		1564
1478	(	1565	($w, $h)
1479	$w + $self->{padding} * 2,
1480	$h + $self->{padding} * 2,
1481	)
1482	}	1566	}
1483		1567
1484	sub size_allocate {	1568	sub size_allocate {
1485	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1486		1570
		1571	delete $self->{ox};
		1572
1487	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488	}	1575	}
1489		1576
1490	sub set_fontsize {	1577	sub set_fontsize {
1491	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1492		1579
1493	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1494	delete $self->{texture};	1581	delete $self->{texture};
1495		1582
1496	$self->update;	1583	$self->realloc;
1497	$self->check_size;
1498	}	1584	}
1499		1585
1500	sub _draw {	1586	sub _draw {
1501	my ($self) = @_;	1587	my ($self) = @_;
1502		1588
…		…
1508	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1509	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1510	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512		1598
1513	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1514		1601
		1602	unless (exists $self->{ox}) {
1515	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1518		1606
1519	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1522
1523	$tex
1524	};	1610	};
1525		1611
1526	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528		1614
…		…
1582	sub set_text {	1668	sub set_text {
1583	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1584		1670
1585	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1586	$self->_set_text ($text);	1672	$self->_set_text ($text);
1587	$self->update;	1673
1588	$self->check_size;	1674	$self->realloc;
1589	}	1675	}
1590		1676
1591	sub get_text {	1677	sub get_text {
1592	$_[0]{text}	1678	$_[0]{text}
1593	}	1679	}
…		…
1626	} elsif ($uni) {	1712	} elsif ($uni) {
1627	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1628	}	1714	}
1629		1715
1630	$self->_set_text ($text);	1716	$self->_set_text ($text);
1631	$self->update;	1717
1632	$self->check_size;	1718	$self->realloc;
1633	}	1719	}
1634		1720
1635	sub focus_in {	1721	sub focus_in {
1636	my ($self) = @_;	1722	my ($self) = @_;
1637		1723
…		…
1764		1850
1765	sub new {	1851	sub new {
1766	my $class = shift;	1852	my $class = shift;
1767		1853
1768	$class->SUPER::new (	1854	$class->SUPER::new (
1769	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1770	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1771	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1772	can_hover => 1,	1859	can_hover => 1,
1773	align => 0,	1860	align => 0,
1774	valign => 0,	1861	valign => 0,
…		…
1821		1908
1822	sub new {	1909	sub new {
1823	my $class = shift;	1910	my $class = shift;
1824		1911
1825	$class->SUPER::new (	1912	$class->SUPER::new (
1826	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1827	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1828	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1829	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1830	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1831	state => 0,	1919	state => 0,
…		…
1835	}	1923	}
1836		1924
1837	sub size_request {	1925	sub size_request {
1838	my ($self) = @_;	1926	my ($self) = @_;
1839		1927
1840	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1841	}	1929	}
1842		1930
1843	sub button_down {	1931	sub button_down {
1844	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1845		1933
1846	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1849	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1850	}	1938	}
1851	}	1939	}
1852		1940
1853	sub _draw {	1941	sub _draw {
1854	my ($self) = @_;	1942	my ($self) = @_;
1855		1943
1856	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1857		1945
1858	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859		1947
1860	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;
1861		1951
1862	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863		1953
1864	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1865		1955
…		…
2130	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2131	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2132	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2133	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2134	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2135	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2136	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2137	vertical => 0,	2227	vertical => 0,
2138	can_hover => 1,	2228	can_hover => 1,
2139	inner_pad => 0.02,	2229	inner_pad => 0.02,
2140	@_	2230	@_
2141	);	2231	);
…		…
2144	$self->update;	2234	$self->update;
2145		2235
2146	$self	2236	$self
2147	}	2237	}
2148		2238
		2239	sub changed { }
		2240
2149	sub set_range {	2241	sub set_range {
2150	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2151		2243
2152	($range, $self->{range}) = ($self->{range}, $range);	2244	($range, $self->{range}) = ($self->{range}, $range);
2153		2245
…		…
2179	}	2271	}
2180		2272
2181	sub size_request {	2273	sub size_request {
2182	my ($self) = @_;	2274	my ($self) = @_;
2183		2275
2184	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2185	my $h = $self->{req_h};
2186
2187	$self->{vertical} ? ($h, $w) : ($w, $h)
2188	}	2277	}
2189		2278
2190	sub button_down {	2279	sub button_down {
2191	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2192		2281
…		…
2543		2632
2544	sub new {	2633	sub new {
2545	my $class = shift;	2634	my $class = shift;
2546		2635
2547	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2548	state => 0,	2637	state => 0,
2549	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2550	@_	2639	@_
2551	);	2640	);
2552		2641
2553	if ($self->{state}) {
2554	$self->{state} = 0;
2555	$self->toggle_flopper;
2556	}
2557
2558	$self	2642	$self
2559	}	2643	}
2560		2644
2561	sub toggle_flopper {	2645	sub toggle_flopper {
2562	my ($self) = @_;	2646	my ($self) = @_;
2563		2647
2564	# TODO: use animation	2648	$self->{other}->toggle_visibility;
2565	if ($self->{state} = !$self->{state}) {
2566	$CFClient::UI::ROOT->add ($self->{other});
2567	$self->{other}->move ($self->coord2global (0, $self->{h}));
2568	$self->_emit ("open");
2569	} else {
2570	$CFClient::UI::ROOT->remove ($self->{other});
2571	$self->_emit ("close");
2572	}
2573
2574	$self->_emit (changed => $self->{state});
2575	}	2649	}
2576		2650
2577	#############################################################################	2651	#############################################################################
2578		2652
2579	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2592	}	2666	}
2593		2667
2594	sub set_tooltip_from {	2668	sub set_tooltip_from {
2595	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2596		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
2597	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2598	markup => $widget->{tooltip},	2681	markup => $tooltip,
2599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600	fontsize => 0.8,	2683	fontsize => 0.8,
2601	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2602	ellipsise => 0,	2685	ellipsise => 0,
2603	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2614		2697
2615	sub size_allocate {	2698	sub size_allocate {
2616	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2617		2700
2618	$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	});
2619	}	2720	}
2620		2721
2621	sub _draw {	2722	sub _draw {
2622	my ($self) = @_;	2723	my ($self) = @_;
2623		2724
…		…
2640	glVertex $w, $h;	2741	glVertex $w, $h;
2641	glVertex $w, 0;	2742	glVertex $w, 0;
2642	glEnd;	2743	glEnd;
2643		2744
2644	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2645	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2646	}	2748	}
2647		2749
2648	#############################################################################	2750	#############################################################################
2649		2751
…		…
2725	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2726	}	2828	}
2727		2829
2728	#############################################################################	2830	#############################################################################
2729		2831
2730	package CFClient::UI::Inventory;
2731
2732	our @ISA = CFClient::UI::ScrolledWindow::;
2733
2734	sub new {
2735	my $class = shift;
2736
2737	my $self = $class->SUPER::new (
2738	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739	@_,
2740	);
2741
2742	$self
2743	}
2744
2745	sub set_items {
2746	my ($self, $items) = @_;
2747
2748	$self->{scrolled}->clear;
2749	return unless $items;
2750
2751	my @items = sort {
2752	($a->{type} <=> $b->{type})
2753	or ($a->{name} cmp $b->{name})
2754	} @$items;
2755
2756	$self->{real_items} = \@items;
2757
2758	my $row = 0;
2759	for my $item (@items) {
2760	CFClient::Item::update_widgets $item;
2761
2762	$self->{scrolled}->add (0, $row, $item->{face_widget});
2763	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2764	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766	$row++;
2767	}
2768	}
2769
2770	sub size_request {
2771	my ($self) = @_;
2772	($self->{req_w}, $self->{req_h});
2773	}
2774
2775	#############################################################################
2776
2777	package CFClient::UI::Menu;	2832	package CFClient::UI::Menu;
2778		2833
2779	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2780		2835
2781	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2819	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2820	$GRAB = $self;	2875	$GRAB = $self;
2821	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2822		2877
2823	$self->show;	2878	$self->show;
2824	$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);
2825	}	2880	}
2826		2881
2827	sub mouse_motion {	2882	sub mouse_motion {
2828	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2829		2884
…		…
2954	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
2955	}	3010	}
2956		3011
2957	#############################################################################	3012	#############################################################################
2958		3013
2959	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
2960		3015
2961	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963	use CFClient::OpenGL;
2964		3017
2965	sub new {	3018	sub new {
2966	my $class = shift;	3019	my $class = shift;
2967		3020
2968	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2969	@_,	3023	@_,
2970	)	3024	);
2971	}
2972		3025
2973	sub configure {	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 {
2974	my ($self, $x, $y, $w, $h) = @_;	3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2975		3180
2976	$self->{w} = $w;	3181	$self->clear_command_list;
2977	$self->{h} = $h;	3182	$self->{recording} = 0;
2978	}	3183	$self->{rec_btn}->set_text ("start recording");
2979		3184
2980	sub check_size {	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 {
2981	my ($self) = @_;	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	}
2982		3203
2983	$self->size_allocate ($self->{w}, $self->{h})	3204	sub update_binding_widgets {
2984	if $self->{w};	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 (
		3320	visible => 1,
		3321	@_,
		3322	);
		3323
		3324	Scalar::Util::weaken ($self->{root} = $self);
		3325
		3326	$self
2985	}	3327	}
2986		3328
2987	sub size_request {	3329	sub size_request {
2988	my ($self) = @_;	3330	my ($self) = @_;
2989		3331
2990	($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
2991	}	3347	}
2992		3348
2993	sub size_allocate {	3349	sub size_allocate {
2994	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
2995		3351
2996	for my $child ($self->children) {	3352	for my $child ($self->children) {
2997	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)};
2998		3354
2999	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
3000	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
3001		3357
3002	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
3003	if exists $child->{req_y};	3359	$Y = _to_pixel $Y, $H, $self->{h};
3004
3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007		3360
3008	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
3009	}	3362	}
3010	}	3363	}
3011		3364
…		…
3022	}	3375	}
3023		3376
3024	sub update {	3377	sub update {
3025	my ($self) = @_;	3378	my ($self) = @_;
3026		3379
3027	$self->check_size;
3028	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
3029	}	3381	}
3030		3382
3031	sub add {	3383	sub add {
3032	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
3033		3385
3034	for (my @widgets = @children; my $w = pop @widgets; ) {
3035	push @widgets, $w->children;
3036	$w->{root} = $self;
3037	$w->{visible} = 1;
3038	}
3039
3040	for my $child (@children) {
3041	$child->{is_toplevel} = 1;	3386	$_->{is_toplevel} = 1
3042		3387	for @children;
3043	# integerise window positions
3044	$child->{x} = int $child->{x};
3045	$child->{y} = int $child->{y};
3046	}
3047		3388
3048	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
3049	}	3390	}
3050		3391
3051	sub remove {	3392	sub remove {
3052	my ($self, @children) = @_;	3393	my ($self, @children) = @_;
3053		3394
3054	$self->SUPER::remove (@children);	3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3055		3399
3056	while (@children) {	3400	while (@children) {
3057	my $w = pop @children;	3401	my $w = pop @children;
3058	push @children, $w->children;	3402	push @children, $w->children;
3059	$w->set_invisible;	3403	$w->set_invisible;
…		…
3078	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3079	$_->()	3423	$_->()
3080	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3081	}	3425	}
3082		3426
3083	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
3084	my @queue = ([], []);	3428	my %queue;
		3429	my @queue;
		3430	my $widget;
3085		3431
3086	for (;;) {	3432	outer:
3087	if ($self->{check_size}) {	3433	while () {
3088	# heuristic: check containers last	3434	if (my $realloc = delete $self->{realloc}) {
3089	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3435	for $widget (values %$realloc) {
3090	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	}
3091	}	3442	}
3092		3443
3093	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3444	while () {
		3445	@queue or last outer;
3094		3446
3095	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3447	$widget = pop @{ $queue[-1] || [] }
3096	? @$widget{qw(user_w user_h)}	3448	and last;
3097	: $widget->size_request;
3098
3099	if (delete $widget->{force_alloc}
3100	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102		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}) {
3103	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3104	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3105		3467
3106	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3107		3469
3108	$widget->{parent}->check_size
3109	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	}
3110	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3111	}	3480	}
3112	}	3481	}
3113		3482
3114	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3115	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3116	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)};
3117		3491
3118	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3119	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3120		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
3121	$widget->{w} = $w;	3502	$widget->{w} = $w;
3122	$widget->{h} = $h;	3503	$widget->{h} = $h;
		3504
3123	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3124	}	3507	}
3125	}	3508	}
3126		3509
3127	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3128	$_->()	3511	$_->()
3129	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3130	}	3513	}
		3514
3131		3515
3132	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3135		3519
…		…
3137	glLoadIdentity;	3521	glLoadIdentity;
3138	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3140	glLoadIdentity;	3524	glLoadIdentity;
3141		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
3142	$self->_draw;	3533	$self->_draw;
3143	}	3534	}
3144		3535
3145	#############################################################################	3536	#############################################################################
3146		3537

Diff Legend

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