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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 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	# TODO: req_w _does_change after ->reconfigure
464	$self->check_size
465	unless exists $self->{req_w};
466
467	$self->show;
468	}
469
470	sub check_size {
471	my ($self, $forced) = @_;
472
473	$self->{force_alloc} = 1 if $forced;
474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
475	}
476
477	sub update {
478	my ($self) = @_;
479
480	$self->{parent}->update
481	if $self->{parent};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub DESTROY {	585	sub DESTROY {
504	my ($self) = @_;	586	my ($self) = @_;
505		587
506	delete $WIDGET{$self+0};	588	delete $WIDGET{$self+0};
507	#$self->deactivate;	589	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
565	}	647	}
566		648
567	sub size_request {	649	sub size_request {
568	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
569	}	653	}
570		654
571	sub draw { }	655	sub draw { }
572		656
573	#############################################################################	657	#############################################################################
…		…
602	$self->{children} = [	686	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
605	];	689	];
606		690
607	$self->check_size (1);	691	$self->realloc;
608	$self->update;
609	}	692	}
610		693
611	sub children {	694	sub children {
612	@{ $_[0]{children} }	695	@{ $_[0]{children} }
613	}	696	}
…		…
618	delete $child->{parent};	701	delete $child->{parent};
619	$child->hide;	702	$child->hide;
620		703
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		705
623	$self->check_size;	706	$self->realloc;
624	$self->update;
625	}	707	}
626		708
627	sub clear {	709	sub clear {
628	my ($self) = @_;	710	my ($self) = @_;
629		711
…		…
633	for (@$children) {	715	for (@$children) {
634	delete $_->{parent};	716	delete $_->{parent};
635	$_->hide;	717	$_->hide;
636	}	718	}
637		719
638	$self->check_size;	720	$self->realloc;
639	$self->update;
640	}	721	}
641		722
642	sub find_widget {	723	sub find_widget {
643	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
644		725
…		…
731	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	813	$self->update;
733	}	814	}
734		815
735	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
736	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
737	}	820	}
738		821
739	sub render_child {	822	sub render_child {
740	my ($self) = @_;	823	my ($self) = @_;
741		824
742	$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 {
743	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
745		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
746	$self->_render;	836	$self->_render;
747	};	837	};
748	}	838	}
749		839
750	sub _draw {	840	sub _draw {
751	my ($self) = @_;	841	my ($self) = @_;
752		842
753	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
754		844
755	my $tex = $self->{texture}	845	my $tex = $self->{texture}
756	or return;	846	or return;
757		847
758	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
781	}	871	}
782		872
783	sub size_request {	873	sub size_request {
784	my ($self) = @_;	874	my ($self) = @_;
785		875
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		877
788	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
789	}	882	}
790		883
791	sub size_allocate {	884	sub size_allocate {
792	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
793		886
		887	my $child = $self->child;
		888
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		891
797	$self->child->configure (0, 0, $w, $h);	892	$self->child->configure (0, 0, $w, $h);
798	$self->update;	893	$self->update;
799	}	894	}
800		895
…		…
836	}	931	}
837		932
838	sub _render {	933	sub _render {
839	my ($self) = @_;	934	my ($self) = @_;
840		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
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		940
843	$self->SUPER::_render;	941	$self->SUPER::_render;
844	}	942	}
845		943
…		…
853	my $class = shift;	951	my $class = shift;
854		952
855	my $self;	953	my $self;
856		954
857	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
858	vertical => 1,	956	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	958	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
862	},	960	},
863	;	961	;
864		962
865	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
871	$self->{vp}->add ($self->{scrolled});	969	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	970	$self->add ($self->{vp});
873	$self->add ($self->{slider});	971	$self->add ($self->{slider});
874		972
875	$self	973	$self
		974	}
		975
		976	sub update {
		977	my ($self) = @_;
		978
		979	$self->SUPER::update;
		980
		981	# todo: overwrite size_allocate of child
		982	my $child = $self->{vp}->child;
		983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	984	}
877		985
878	sub size_allocate {	986	sub size_allocate {
879	my ($self, $w, $h) = @_;	987	my ($self, $w, $h) = @_;
880		988
…		…
933		1041
934	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
935		1043
936	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
937		1045
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940	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);
941		1053
942	sub new {	1054	sub new {
943	my $class = shift;	1055	my $class = shift;
944
945	# TODO: user_x, user_y, overwrite moveto?
946		1056
947	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1060	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
953	@_	1064	@_
954	);	1065	);
955		1066
956	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
957	align => 0,	1068	align => 0,
…		…
1010	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
1011		1122
1012	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
1014		1125
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1128
		1129	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1131	};
1020		1132
1021	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1137	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1027		1139
1028	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1029		1141
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1143	};
1033	}	1144	}
1034	}	1145	}
1035		1146
1036	sub button_up {	1147	sub button_up {
…		…
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1167
1057	my $border = $self->border;	1168	my $border = $self->border;
1058		1169
1059	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1175
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1067		1178
1068	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1071
1072	glColor @{ $self->{bg} };
1073
1074	$bg->{s} = $rep_x;
1075	$bg->{t} = $rep_y;
1076	$bg->{wrap_mode} = 1;
1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1184	}
1079		1185
1080	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1081		1187
…		…
1101	col_expand => [],	1207	col_expand => [],
1102	@_,	1208	@_,
1103	)	1209	)
1104	}	1210	}
1105		1211
		1212	sub children {
		1213	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1214	}
		1215
1106	sub add {	1216	sub add {
1107	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1108		1218
1109	$child->set_parent ($self);	1219	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1111		1221
1112	$child->check_size;	1222	$self->realloc;
1113	}	1223	}
1114		1224
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1226	sub clear {
1121	my ($self) = @_;	1227	my ($self) = @_;
1122		1228
1123	my @children = $self->children;	1229	my @children = $self->children;
1124	delete $self->{children};	1230	delete $self->{children};
…		…
1126	for (@children) {	1232	for (@children) {
1127	delete $_->{parent};	1233	delete $_->{parent};
1128	$_->hide;	1234	$_->hide;
1129	}	1235	}
1130		1236
1131	$self->update;	1237	$self->realloc;
1132	}	1238	}
1133		1239
1134	sub get_wh {	1240	sub get_wh {
1135	my ($self) = @_;	1241	my ($self) = @_;
1136		1242
…		…
1167	sub size_allocate {	1273	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1274	my ($self, $w, $h) = @_;
1169		1275
1170	my ($ws, $hs) = $self->get_wh;	1276	my ($ws, $hs) = $self->get_wh;
1171		1277
1172	my $req_w = sum @$ws;	1278	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1279	my $req_h = (sum @$hs) || 1;
1174		1280
1175	# TODO: nicer code && do row_expand	1281	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1282	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1283	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1284	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1338	}
1233	}	1339	}
1234		1340
1235	#############################################################################	1341	#############################################################################
1236		1342
1237	package CFClient::UI::HBox;	1343	package CFClient::UI::Box;
1238
1239	# TODO: wrap into common Box base class
1240		1344
1241	our @ISA = CFClient::UI::Container::;	1345	our @ISA = CFClient::UI::Container::;
1242		1346
1243	sub size_request {	1347	sub size_request {
1244	my ($self) = @_;	1348	my ($self) = @_;
1245		1349
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1350	$self->{vertical}
1247		1351	? (
1248	(	1352	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1249	(List::Util::sum map $_->[0], @alloc),	1353	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250	(List::Util::max map $_->[1], @alloc),	1354	)
1251	)	1355	: (
		1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1358	)
1252	}	1359	}
1253		1360
1254	sub size_allocate {	1361	sub size_allocate {
1255	my ($self, $w, $h) = @_;	1362	my ($self, $w, $h) = @_;
1256		1363
1257	($h, $w) = ($w, $h);	1364	my $space = $self->{vertical} ? $h : $w;
1258
1259	my $children = $self->{children};	1365	my $children = $self->{children};
1260		1366
1261	my @h = map $_->{req_w}, @$children;	1367	my @req;
1262		1368
1263	my $req_h = List::Util::sum @h;	1369	if ($self->{homogeneous}) {
1264		1370	@req = ($space / (@$children || 1)) x @$children;
1265	if ($req_h > $h) {
1266	# ah well, not enough space
1267	$_ *= $h / $req_h for @h;
1268	} else {	1371	} else {
		1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1373	my $req = List::Util::sum @req;
		1374
		1375	if ($req > $space) {
		1376	# ah well, not enough space
		1377	$_ *= $space / $req for @req;
		1378	} else {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;	1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270	$exp ||= 1;
1271		1380
		1381	$space = ($space - $req) / $expand; # remaining space to give away
		1382
		1383	$req[$_] += $space * $children->[$_]{expand}
1272	for (0 .. $#$children) {	1384	for 0 .. $#$children;
1273	my $child = $children->[$_];
1274
1275	my $alloc_h = $h[$_];
1276	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277	$h[$_] = $alloc_h;
1278	}	1385	}
1279	}	1386	}
1280		1387
1281	CFClient::UI::harmonize \@h;	1388	CFClient::UI::harmonize \@req;
1282		1389
1283	my $y = 0;	1390	my $pos = 0;
1284	for (0 .. $#$children) {	1391	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];	1392	my $alloc = $req[$_];
1287	$child->configure ($y, 0, $h, $w);	1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288		1394
1289	$y += $h;	1395	$pos += $alloc;
1290	}	1396	}
1291		1397
1292	1	1398	1
1293	}	1399	}
1294		1400
1295	#############################################################################	1401	#############################################################################
1296		1402
		1403	package CFClient::UI::HBox;
		1404
		1405	our @ISA = CFClient::UI::Box::;
		1406
		1407	sub new {
		1408	my $class = shift;
		1409
		1410	$class->SUPER::new (
		1411	vertical => 0,
		1412	@_,
		1413	)
		1414	}
		1415
		1416	#############################################################################
		1417
1297	package CFClient::UI::VBox;	1418	package CFClient::UI::VBox;
1298		1419
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1420	our @ISA = CFClient::UI::Box::;
1302		1421
1303	sub size_request {	1422	sub new {
1304	my ($self) = @_;	1423	my $class = shift;
1305		1424
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1425	$class->SUPER::new (
1307		1426	vertical => 1,
1308	(	1427	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1428	)
1312	}
1313
1314	sub size_allocate {
1315	my ($self, $w, $h) = @_;
1316
1317	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319	my $children = $self->{children};
1320
1321	my @h = map $_->{req_h}, @$children;
1322
1323	my $req_h = List::Util::sum @h;
1324
1325	if ($req_h > $h) {
1326	# ah well, not enough space
1327	$_ *= $h / $req_h for @h;
1328	} else {
1329	my $exp = List::Util::sum map $_->{expand}, @$children;
1330	$exp ||= 1;
1331
1332	for (0 .. $#$children) {
1333	my $child = $children->[$_];
1334
1335	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336	}
1337	}
1338
1339	CFClient::UI::harmonize \@h;
1340
1341	my $y = 0;
1342	for (0 .. $#$children) {
1343	my $child = $children->[$_];
1344	my $h = $h[$_];
1345	$child->configure (0, $y, $w, $h);
1346
1347	$y += $h;
1348	}
1349
1350	1
1351	}	1429	}
1352		1430
1353	#############################################################################	1431	#############################################################################
1354		1432
1355	package CFClient::UI::Label;	1433	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1450	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1374	fontsize => 1,	1452	fontsize => 1,
1375	align => -1,	1453	align => -1,
1376	valign => -1,	1454	valign => -1,
1377	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1378	can_events => 0,	1457	can_events => 0,
1379	%arg	1458	%arg
1380	);	1459	);
1381		1460
1382	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1419		1498
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1422		1501
		1502	$self->realloc;
1423	$self->update;	1503	$self->update;
1424	$self->check_size;
1425	}	1504	}
1426		1505
1427	sub set_markup {	1506	sub set_markup {
1428	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1429		1508
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1513
1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1437		1516
		1517	$self->realloc;
1438	$self->update;	1518	$self->update;
1439	$self->check_size;
1440	}	1519	}
1441		1520
1442	sub size_request {	1521	sub size_request {
1443	my ($self) = @_;	1522	my ($self) = @_;
1444		1523
…		…
1458		1537
1459	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1461	}	1540	}
1462		1541
1463	(	1542	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1543	}
1468		1544
1469	sub size_allocate {	1545	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1471		1547
1472	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473	}	1550	}
1474		1551
1475	sub set_fontsize {	1552	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1477		1554
1478	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1556	delete $self->{texture};
1480		1557
1481	$self->update;	1558	$self->realloc;
1482	$self->check_size;
1483	}	1559	}
1484		1560
1485	sub _draw {	1561	sub _draw {
1486	my ($self) = @_;	1562	my ($self) = @_;
1487		1563
…		…
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1573
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1499		1575
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1503		1579
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1507		1583
1508	$tex	1584	$tex
1509	};	1585	};
1510		1586
…		…
1567	sub set_text {	1643	sub set_text {
1568	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1569		1645
1570	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1647	$self->_set_text ($text);
1572	$self->update;	1648
1573	$self->check_size;	1649	$self->realloc;
1574	}	1650	}
1575		1651
1576	sub get_text {	1652	sub get_text {
1577	$_[0]{text}	1653	$_[0]{text}
1578	}	1654	}
…		…
1611	} elsif ($uni) {	1687	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1613	}	1689	}
1614		1690
1615	$self->_set_text ($text);	1691	$self->_set_text ($text);
1616	$self->update;	1692
1617	$self->check_size;	1693	$self->realloc;
1618	}	1694	}
1619		1695
1620	sub focus_in {	1696	sub focus_in {
1621	my ($self) = @_;	1697	my ($self) = @_;
1622		1698
…		…
1749		1825
1750	sub new {	1826	sub new {
1751	my $class = shift;	1827	my $class = shift;
1752		1828
1753	$class->SUPER::new (	1829	$class->SUPER::new (
1754	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1755	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1757	can_hover => 1,	1834	can_hover => 1,
1758	align => 0,	1835	align => 0,
1759	valign => 0,	1836	valign => 0,
…		…
1806		1883
1807	sub new {	1884	sub new {
1808	my $class = shift;	1885	my $class = shift;
1809		1886
1810	$class->SUPER::new (	1887	$class->SUPER::new (
1811	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1812	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1894	state => 0,
…		…
1820	}	1898	}
1821		1899
1822	sub size_request {	1900	sub size_request {
1823	my ($self) = @_;	1901	my ($self) = @_;
1824		1902
1825	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1826	}	1904	}
1827		1905
1828	sub button_down {	1906	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1830		1908
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1835	}	1913	}
1836	}	1914	}
1837		1915
1838	sub _draw {	1916	sub _draw {
1839	my ($self) = @_;	1917	my ($self) = @_;
1840		1918
1841	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1842		1920
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1922
1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846		1926
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1928
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1930
…		…
2115	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2122	vertical => 0,	2202	vertical => 0,
2123	can_hover => 1,	2203	can_hover => 1,
2124	inner_pad => 0.02,	2204	inner_pad => 0.02,
2125	@_	2205	@_
2126	);	2206	);
…		…
2129	$self->update;	2209	$self->update;
2130		2210
2131	$self	2211	$self
2132	}	2212	}
2133		2213
		2214	sub changed { }
		2215
2134	sub set_range {	2216	sub set_range {
2135	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2136		2218
2137	$self->{range} = $range;	2219	($range, $self->{range}) = ($self->{range}, $range);
2138		2220
2139	$self->update;	2221	$self->update
		2222	if "@$range" ne "@{$self->{range}}";
2140	}	2223	}
2141		2224
2142	sub set_value {	2225	sub set_value {
2143	my ($self, $value) = @_;	2226	my ($self, $value) = @_;
2144		2227
…		…
2163	}	2246	}
2164		2247
2165	sub size_request {	2248	sub size_request {
2166	my ($self) = @_;	2249	my ($self) = @_;
2167		2250
2168	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2252	}
2173		2253
2174	sub button_down {	2254	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2176		2256
…		…
2527		2607
2528	sub new {	2608	sub new {
2529	my $class = shift;	2609	my $class = shift;
2530		2610
2531	my $self = $class->SUPER::new (	2611	my $self = $class->SUPER::new (
2532	state => 0,	2612	state => 0,
2533	connect_activate => \&toggle_flopper,	2613	on_activate => \&toggle_flopper,
2534	@_	2614	@_
2535	);	2615	);
2536		2616
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2617	$self
2543	}	2618	}
2544		2619
2545	sub toggle_flopper {	2620	sub toggle_flopper {
2546	my ($self) = @_;	2621	my ($self) = @_;
2547		2622
2548	# TODO: use animation	2623	$self->{other}->toggle_visibility;
2549	if ($self->{state} = !$self->{state}) {
2550	$CFClient::UI::ROOT->add ($self->{other});
2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2552	$self->_emit ("open");
2553	} else {
2554	$CFClient::UI::ROOT->remove ($self->{other});
2555	$self->_emit ("close");
2556	}
2557
2558	$self->_emit (changed => $self->{state});
2559	}	2624	}
2560		2625
2561	#############################################################################	2626	#############################################################################
2562		2627
2563	package CFClient::UI::Tooltip;	2628	package CFClient::UI::Tooltip;
…		…
2576	}	2641	}
2577		2642
2578	sub set_tooltip_from {	2643	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2580		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2581	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2582	markup => $widget->{tooltip},	2656	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	2658	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2586	ellipsise => 0,	2660	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2598		2672
2599	sub size_allocate {	2673	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2601		2675
2602	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2603	}	2695	}
2604		2696
2605	sub _draw {	2697	sub _draw {
2606	my ($self) = @_;	2698	my ($self) = @_;
2607		2699
…		…
2624	glVertex $w, $h;	2716	glVertex $w, $h;
2625	glVertex $w, 0;	2717	glVertex $w, 0;
2626	glEnd;	2718	glEnd;
2627		2719
2628	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2629	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2630	}	2723	}
2631		2724
2632	#############################################################################	2725	#############################################################################
2633		2726
…		…
2709	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2710	}	2803	}
2711		2804
2712	#############################################################################	2805	#############################################################################
2713		2806
2714	package CFClient::UI::Inventory;
2715
2716	our @ISA = CFClient::UI::ScrolledWindow::;
2717
2718	sub new {
2719	my $class = shift;
2720
2721	my $self = $class->SUPER::new (
2722	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723	@_,
2724	);
2725
2726	$self
2727	}
2728
2729	sub set_items {
2730	my ($self, $items) = @_;
2731
2732	$self->{scrolled}->clear;
2733	return unless $items;
2734
2735	my @items = sort {
2736	($a->{type} <=> $b->{type})
2737	or ($a->{name} cmp $b->{name})
2738	} @$items;
2739
2740	$self->{real_items} = \@items;
2741
2742	my $row = 0;
2743	for my $item (@items) {
2744	CFClient::Item::update_widgets $item;
2745
2746	$self->{scrolled}->add (0, $row, $item->{face_widget});
2747	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2748	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750	$row++;
2751	}
2752
2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754	}
2755
2756	sub size_request {
2757	my ($self) = @_;
2758	($self->{req_w}, $self->{req_h});
2759	}
2760
2761	#############################################################################
2762
2763	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2764		2808
2765	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2766		2810
2767	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2805	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2806	$GRAB = $self;	2850	$GRAB = $self;
2807	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2808		2852
2809	$self->show;	2853	$self->show;
2810	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2811	}	2855	}
2812		2856
2813	sub mouse_motion {	2857	sub mouse_motion {
2814	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2815		2859
…		…
2940	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
2941	}	2985	}
2942		2986
2943	#############################################################################	2987	#############################################################################
2944		2988
2945	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
2946		2990
2947	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
2948
2949	use CFClient::OpenGL;
2950		2992
2951	sub new {	2993	sub new {
2952	my $class = shift;	2994	my $class = shift;
2953		2995
2954	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2955	@_,	2998	@_,
2956	)	2999	);
2957	}
2958		3000
2959	sub configure {	3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
2960	my ($self, $x, $y, $w, $h) = @_;	3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2961		3150
2962	$self->{w} = $w;	3151	$self->clear_command_list;
2963	$self->{h} = $h;	3152	$self->{recording} = 0;
2964	}	3153	$self->{rec_btn}->set_text ("start recording");
2965		3154
2966	sub check_size {	3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
2967	my ($self) = @_;	3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
2968		3173
2969	$self->size_allocate ($self->{w}, $self->{h})	3174	sub update_binding_widgets {
2970	if $self->{w};	3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
		3290	visible => 1,
		3291	@_,
		3292	);
		3293
		3294	Scalar::Util::weaken ($self->{root} = $self);
		3295
		3296	$self
2971	}	3297	}
2972		3298
2973	sub size_request {	3299	sub size_request {
2974	my ($self) = @_;	3300	my ($self) = @_;
2975		3301
2976	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
2977	}	3317	}
2978		3318
2979	sub size_allocate {	3319	sub size_allocate {
2980	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
2981		3321
2982	for my $child ($self->children) {	3322	for my $child ($self->children) {
2983	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2984		3324
2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
2986	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
2987		3327
2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
2989	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
2990
2991	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993		3330
2994	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
2995	}	3332	}
2996	}	3333	}
2997		3334
…		…
3008	}	3345	}
3009		3346
3010	sub update {	3347	sub update {
3011	my ($self) = @_;	3348	my ($self) = @_;
3012		3349
3013	$self->check_size;
3014	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3015	}	3351	}
3016		3352
3017	sub add {	3353	sub add {
3018	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3019		3355
3020	for (my @widgets = @children; my $w = pop @widgets; ) {
3021	push @widgets, $w->children;
3022	$w->{root} = $self;
3023	$w->{visible} = 1;
3024	}
3025
3026	for my $child (@children) {
3027	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3028		3357	for @children;
3029	# integerise window positions
3030	$child->{x} = int $child->{x};
3031	$child->{y} = int $child->{y};
3032	}
3033		3358
3034	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3035	}	3360	}
3036		3361
3037	sub remove {	3362	sub remove {
3038	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3039		3364
3040	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3041		3369
3042	while (@children) {	3370	while (@children) {
3043	my $w = pop @children;	3371	my $w = pop @children;
3044	push @children, $w->children;	3372	push @children, $w->children;
3045	$w->set_invisible;	3373	$w->set_invisible;
…		…
3064	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3065	$_->()	3393	$_->()
3066	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3067	}	3395	}
3068		3396
3069	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
3070	my @queue = ([], []);	3398	my %queue;
		3399	my @queue;
		3400	my $widget;
3071		3401
3072	for (;;) {	3402	outer:
3073	if ($self->{check_size}) {	3403	while () {
3074	# heuristic: check containers last	3404	if (my $realloc = delete $self->{realloc}) {
3075	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3405	for $widget (values %$realloc) {
3076	for values %{delete $self->{check_size}}	3406	$widget->{visible} or next; # do not resize invisible widgets
		3407
		3408	$queue{$widget+0}++ and next; # duplicates are common
		3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3077	}	3412	}
3078		3413
3079	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3414	while () {
		3415	@queue or last outer;
3080		3416
3081	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3417	$widget = pop @{ $queue[-1] || [] }
3082	? @$widget{qw(user_w user_h)}	3418	and last;
3083	: $widget->size_request;
3084
3085	if (delete $widget->{force_alloc}
3086	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3089	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3090	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3091		3437
3092	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3093		3439
3094	$widget->{parent}->check_size
3095	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3096	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3097	}	3450	}
3098	}	3451	}
3099		3452
3100	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3101	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3102	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3103		3461
3104	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3105	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3106		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3107	$widget->{w} = $w;	3472	$widget->{w} = $w;
3108	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3109	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3110	}	3477	}
3111	}	3478	}
3112		3479
3113	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3114	$_->()	3481	$_->()
3115	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3116	}	3483	}
		3484
3117		3485
3118	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3121		3489
…		…
3123	glLoadIdentity;	3491	glLoadIdentity;
3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3126	glLoadIdentity;	3494	glLoadIdentity;
3127		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3128	$self->_draw;	3503	$self->_draw;
3129	}	3504	}
3130		3505
3131	#############################################################################	3506	#############################################################################
3132		3507

Diff Legend

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