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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC

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

Diff Legend

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