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.267 by root, Thu Jun 1 04:10:29 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}
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	local $draw_x = $draw_x + $self->{x};
		535	local $draw_y = $draw_y + $self->{y};
		536
		537	return if $draw_x + $self->{w} < 0;
		538	return if $draw_x >= $draw_w;
		539	return if $draw_y + $self->{h} < 0;
		540	return if $draw_y >= $draw_h;
404		541
405	glPushMatrix;	542	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	543	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	544	$self->_draw;
408	glPopMatrix;	545	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	557	glVertex $x , $y + $self->{h};
421	glEnd;	558	glEnd;
422	glDisable GL_BLEND;	559	glDisable GL_BLEND;
423	}	560	}
424		561
425	if ($ENV{PCLIENT_DEBUG}) {	562	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	563	glPushMatrix;
427	glColor 1, 1, 0, 1;	564	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	566	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	567	glVertex 0 , 0;
…		…
441	my ($self) = @_;	578	my ($self) = @_;
442		579
443	warn "no draw defined for $self\n";	580	warn "no draw defined for $self\n";
444	}	581	}
445		582
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 {	583	sub DESTROY {
507	my ($self) = @_;	584	my ($self) = @_;
508		585
509	delete $WIDGET{$self+0};	586	delete $WIDGET{$self+0};
510	#$self->deactivate;	587	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	643	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	644	$class->SUPER::new (can_events => 0, %arg);
568	}	645	}
569		646
570	sub size_request {	647	sub size_request {
571	(0, 0)	648	my ($self) = @_;
		649
		650	($self->{w} + 0, $self->{h} + 0)
572	}	651	}
573		652
574	sub draw { }	653	sub draw { }
575		654
576	#############################################################################	655	#############################################################################
…		…
605	$self->{children} = [	684	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	685	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	686	@{$self->{children}}, @widgets
608	];	687	];
609		688
610	$self->check_size (1);	689	$self->realloc;
611	$self->update;
612	}	690	}
613		691
614	sub children {	692	sub children {
615	@{ $_[0]{children} }	693	@{ $_[0]{children} }
616	}	694	}
…		…
621	delete $child->{parent};	699	delete $child->{parent};
622	$child->hide;	700	$child->hide;
623		701
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	702	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		703
626	$self->check_size (1);	704	$self->realloc;
627	$self->update;
628	}	705	}
629		706
630	sub clear {	707	sub clear {
631	my ($self) = @_;	708	my ($self) = @_;
632		709
…		…
636	for (@$children) {	713	for (@$children) {
637	delete $_->{parent};	714	delete $_->{parent};
638	$_->hide;	715	$_->hide;
639	}	716	}
640		717
641	$self->check_size;	718	$self->realloc;
642	$self->update;
643	}	719	}
644		720
645	sub find_widget {	721	sub find_widget {
646	my ($self, $x, $y) = @_;	722	my ($self, $x, $y) = @_;
647		723
…		…
734	$self->SUPER::size_allocate ($w, $h);	810	$self->SUPER::size_allocate ($w, $h);
735	$self->update;	811	$self->update;
736	}	812	}
737		813
738	sub _render {	814	sub _render {
		815	my ($self) = @_;
		816
739	$_[0]{children}[0]->draw;	817	$self->{children}[0]->draw;
740	}	818	}
741		819
742	sub render_child {	820	sub render_child {
743	my ($self) = @_;	821	my ($self) = @_;
744		822
745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	823	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746	glClearColor 0, 0, 0, 0;	824	glClearColor 0, 0, 0, 0;
747	glClear GL_COLOR_BUFFER_BIT;	825	glClear GL_COLOR_BUFFER_BIT;
748		826
		827	{
		828	package CFClient::UI::Base;
		829
		830	($draw_x, $draw_y, $draw_w, $draw_h) =
		831	(0, 0, $self->{w}, $self->{h});
		832	}
		833
749	$self->_render;	834	$self->_render;
750	};	835	};
751	}	836	}
752		837
753	sub _draw {	838	sub _draw {
754	my ($self) = @_;	839	my ($self) = @_;
755		840
756	my ($w, $h) = ($self->w, $self->h);	841	my ($w, $h) = @$self{qw(w h)};
757		842
758	my $tex = $self->{texture}	843	my $tex = $self->{texture}
759	or return;	844	or return;
760		845
761	glEnable GL_TEXTURE_2D;	846	glEnable GL_TEXTURE_2D;
…		…
784	}	869	}
785		870
786	sub size_request {	871	sub size_request {
787	my ($self) = @_;	872	my ($self) = @_;
788		873
789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	874	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790		875
791	@$self{qw(child_w child_h)}	876	$w = 10 if $self->{scroll_x};
		877	$h = 10 if $self->{scroll_y};
		878
		879	($w, $h)
792	}	880	}
793		881
794	sub size_allocate {	882	sub size_allocate {
795	my ($self, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
796		884
		885	my $child = $self->child;
		886
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799		889
800	$self->child->configure (0, 0, $w, $h);	890	$self->child->configure (0, 0, $w, $h);
801	$self->update;	891	$self->update;
802	}	892	}
803		893
…		…
839	}	929	}
840		930
841	sub _render {	931	sub _render {
842	my ($self) = @_;	932	my ($self) = @_;
843		933
		934	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		935	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		936
844	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845		938
846	$self->SUPER::_render;	939	$self->SUPER::_render;
847	}	940	}
848		941
…		…
856	my $class = shift;	949	my $class = shift;
857		950
858	my $self;	951	my $self;
859		952
860	my $slider = new CFClient::UI::Slider	953	my $slider = new CFClient::UI::Slider
861	vertical => 1,	954	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	955	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	956	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	957	$self->{vp}->set_offset (0, $_[1]);
865	},	958	},
866	;	959	;
867		960
868	$self = $class->SUPER::new (	961	$self = $class->SUPER::new (
…		…
946		1039
947	our @ISA = CFClient::UI::Bin::;	1040	our @ISA = CFClient::UI::Bin::;
948		1041
949	use CFClient::OpenGL;	1042	use CFClient::OpenGL;
950		1043
951	my @tex =	1044	my $bg =
		1045	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1046	mipmap => 1, wrap => 1;
		1047
		1048	my @border =
952	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1049	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);	1050	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954		1051
955	sub new {	1052	sub new {
956	my $class = shift;	1053	my $class = shift;
957
958	# TODO: user_x, user_y, overwrite moveto?
959		1054
960	my $self = $class->SUPER::new (	1055	my $self = $class->SUPER::new (
961	bg => [1, 1, 1, 1],	1056	bg => [1, 1, 1, 1],
962	border_bg => [1, 1, 1, 1],	1057	border_bg => [1, 1, 1, 1],
963	border => 0.6,	1058	border => 0.6,
964	is_toplevel => 1,
965	can_events => 1,	1059	can_events => 1,
		1060	min_w => 16,
		1061	min_h => 16,
966	@_	1062	@_
967	);	1063	);
968		1064
969	$self->{title} &&= new CFClient::UI::Label	1065	$self->{title} &&= new CFClient::UI::Label
970	align => 0,	1066	align => 0,
…		…
1023	my ($ev, $x, $y) = @_;	1119	my ($ev, $x, $y) = @_;
1024		1120
1025	my $dx = $ev->{x} - $ox;	1121	my $dx = $ev->{x} - $ox;
1026	my $dy = $ev->{y} - $oy;	1122	my $dy = $ev->{y} - $oy;
1027		1123
1028	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1126
		1127	$self->realloc;
1030	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031	$self->check_size;
1032	};	1129	};
1033		1130
1034	} elsif ($lr ^ $td) {	1131	} elsif ($lr ^ $td) {
1035	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036	my ($bx, $by) = ($self->{x}, $self->{y});	1133	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1038	$self->{motion} = sub {	1135	$self->{motion} = sub {
1039	my ($ev, $x, $y) = @_;	1136	my ($ev, $x, $y) = @_;
1040		1137
1041	($x, $y) = ($ev->{x}, $ev->{y});	1138	($x, $y) = ($ev->{x}, $ev->{y});
1042		1139
1043	$self->move ($bx + $x - $ox, $by + $y - $oy);	1140	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044	$self->update;
1045	};	1141	};
1046	}	1142	}
1047	}	1143	}
1048		1144
1049	sub button_up {	1145	sub button_up {
…		…
1068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069		1165
1070	my $border = $self->border;	1166	my $border = $self->border;
1071		1167
1072	glColor @{ $self->{border_bg} };	1168	glColor @{ $self->{border_bg} };
1073	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1074	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077		1173
1078	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079	my $bg = $tex[0];	1175	glColor @{ $self->{bg} };
1080		1176
1081	# TODO: repeat texture not scale	1177	# TODO: repeat texture not scale
		1178	# solve this better(?)
1082	my $rep_x = $cw / $bg->{w};	1179	$bg->{s} = $cw / $bg->{w};
1083	my $rep_y = $ch / $bg->{h};	1180	$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);	1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091	}	1182	}
1092		1183
1093	glDisable GL_TEXTURE_2D;	1184	glDisable GL_TEXTURE_2D;
1094		1185
…		…
1124	my ($self, $x, $y, $child) = @_;	1215	my ($self, $x, $y, $child) = @_;
1125		1216
1126	$child->set_parent ($self);	1217	$child->set_parent ($self);
1127	$self->{children}[$y][$x] = $child;	1218	$self->{children}[$y][$x] = $child;
1128		1219
1129	$self->check_size (1);	1220	$self->realloc;
1130	}	1221	}
1131		1222
1132	# TODO: move to container class maybe? send children a signal on removal?	1223	# TODO: move to container class maybe? send children a signal on removal?
1133	sub clear {	1224	sub clear {
1134	my ($self) = @_;	1225	my ($self) = @_;
…		…
1139	for (@children) {	1230	for (@children) {
1140	delete $_->{parent};	1231	delete $_->{parent};
1141	$_->hide;	1232	$_->hide;
1142	}	1233	}
1143		1234
1144	$self->check_size (1);	1235	$self->realloc;
1145	$self->update;
1146	}	1236	}
1147		1237
1148	sub get_wh {	1238	sub get_wh {
1149	my ($self) = @_;	1239	my ($self) = @_;
1150		1240
…		…
1246	}	1336	}
1247	}	1337	}
1248		1338
1249	#############################################################################	1339	#############################################################################
1250		1340
1251	package CFClient::UI::HBox;	1341	package CFClient::UI::Box;
1252
1253	# TODO: wrap into common Box base class
1254		1342
1255	our @ISA = CFClient::UI::Container::;	1343	our @ISA = CFClient::UI::Container::;
1256		1344
1257	sub size_request {	1345	sub size_request {
1258	my ($self) = @_;	1346	my ($self) = @_;
1259		1347
1260	my @alloc = map [$_->size_request], @{$self->{children}};	1348	$self->{vertical}
1261		1349	? (
1262	(	1350	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1263	(List::Util::sum map $_->[0], @alloc),	1351	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264	(List::Util::max map $_->[1], @alloc),	1352	)
1265	)	1353	: (
		1354	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1356	)
1266	}	1357	}
1267		1358
1268	sub size_allocate {	1359	sub size_allocate {
1269	my ($self, $w, $h) = @_;	1360	my ($self, $w, $h) = @_;
1270		1361
1271	($h, $w) = ($w, $h);	1362	my $space = $self->{vertical} ? $h : $w;
1272
1273	my $children = $self->{children};	1363	my $children = $self->{children};
1274		1364
1275	my @h = map $_->{req_w}, @$children;	1365	my @req;
1276		1366
1277	my $req_h = List::Util::sum @h;	1367	if ($self->{homogeneous}) {
1278		1368	@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 {	1369	} else {
		1370	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1371	my $req = List::Util::sum @req;
		1372
		1373	if ($req > $space) {
		1374	# ah well, not enough space
		1375	$_ *= $space / $req for @req;
		1376	} else {
1283	my $exp = List::Util::sum map $_->{expand}, @$children;	1377	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284	$exp ||= 1;
1285		1378
		1379	$space = ($space - $req) / $expand; # remaining space to give away
		1380
		1381	$req[$_] += $space * $children->[$_]{expand}
1286	for (0 .. $#$children) {	1382	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	}	1383	}
1293	}	1384	}
1294		1385
1295	CFClient::UI::harmonize \@h;	1386	CFClient::UI::harmonize \@req;
1296		1387
1297	my $y = 0;	1388	my $pos = 0;
1298	for (0 .. $#$children) {	1389	for (0 .. $#$children) {
1299	my $child = $children->[$_];
1300	my $h = $h[$_];	1390	my $alloc = $req[$_];
1301	$child->configure ($y, 0, $h, $w);	1391	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302		1392
1303	$y += $h;	1393	$pos += $alloc;
1304	}	1394	}
1305		1395
1306	1	1396	1
1307	}	1397	}
1308		1398
1309	#############################################################################	1399	#############################################################################
1310		1400
		1401	package CFClient::UI::HBox;
		1402
		1403	our @ISA = CFClient::UI::Box::;
		1404
		1405	sub new {
		1406	my $class = shift;
		1407
		1408	$class->SUPER::new (
		1409	vertical => 0,
		1410	@_,
		1411	)
		1412	}
		1413
		1414	#############################################################################
		1415
1311	package CFClient::UI::VBox;	1416	package CFClient::UI::VBox;
1312		1417
1313	# TODO: wrap into common Box base class
1314
1315	our @ISA = CFClient::UI::Container::;	1418	our @ISA = CFClient::UI::Box::;
1316		1419
1317	sub size_request {	1420	sub new {
1318	my ($self) = @_;	1421	my $class = shift;
1319		1422
1320	my @alloc = map [$_->size_request], @{$self->{children}};	1423	$class->SUPER::new (
1321		1424	vertical => 1,
1322	(	1425	@_,
1323	(List::Util::max map $_->[0], @alloc),
1324	(List::Util::sum map $_->[1], @alloc),
1325	)	1426	)
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	}	1427	}
1366		1428
1367	#############################################################################	1429	#############################################################################
1368		1430
1369	package CFClient::UI::Label;	1431	package CFClient::UI::Label;
…		…
1386	ellipsise => 3, # end	1448	ellipsise => 3, # end
1387	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1388	fontsize => 1,	1450	fontsize => 1,
1389	align => -1,	1451	align => -1,
1390	valign => -1,	1452	valign => -1,
1391	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1392	can_events => 0,	1455	can_events => 0,
1393	%arg	1456	%arg
1394	);	1457	);
1395		1458
1396	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1432	$self->{text} = "T$text";	1495	$self->{text} = "T$text";
1433		1496
1434	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435	$self->{layout}->set_text ($text);	1498	$self->{layout}->set_text ($text);
1436		1499
		1500	$self->realloc;
1437	$self->update;	1501	$self->update;
1438	$self->check_size;
1439	}	1502	}
1440		1503
1441	sub set_markup {	1504	sub set_markup {
1442	my ($self, $markup) = @_;	1505	my ($self, $markup) = @_;
1443		1506
…		…
1447	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448		1511
1449	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1512	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450	$self->{layout}->set_markup ($markup);	1513	$self->{layout}->set_markup ($markup);
1451		1514
		1515	$self->realloc;
1452	$self->update;	1516	$self->update;
1453	$self->check_size;
1454	}	1517	}
1455		1518
1456	sub size_request {	1519	sub size_request {
1457	my ($self) = @_;	1520	my ($self) = @_;
1458		1521
…		…
1472		1535
1473	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1474	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1475	}	1538	}
1476		1539
1477	(	1540	($w, $h)
1478	$w + $self->{padding} * 2,
1479	$h + $self->{padding} * 2,
1480	)
1481	}	1541	}
1482		1542
1483	sub size_allocate {	1543	sub size_allocate {
1484	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1485		1545
1486	delete $self->{texture};	1546	delete $self->{texture}
		1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487	}	1548	}
1488		1549
1489	sub set_fontsize {	1550	sub set_fontsize {
1490	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1491		1552
1492	$self->{fontsize} = $fontsize;	1553	$self->{fontsize} = $fontsize;
1493	delete $self->{texture};	1554	delete $self->{texture};
1494		1555
1495	$self->update;	1556	$self->realloc;
1496	$self->check_size;
1497	}	1557	}
1498		1558
1499	sub _draw {	1559	sub _draw {
1500	my ($self) = @_;	1560	my ($self) = @_;
1501		1561
…		…
1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1571
1512	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1513		1573
1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1517		1577
1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1521		1581
1522	$tex	1582	$tex
1523	};	1583	};
1524		1584
…		…
1581	sub set_text {	1641	sub set_text {
1582	my ($self, $text) = @_;	1642	my ($self, $text) = @_;
1583		1643
1584	$self->{cursor} = length $text;	1644	$self->{cursor} = length $text;
1585	$self->_set_text ($text);	1645	$self->_set_text ($text);
1586	$self->update;	1646
1587	$self->check_size;	1647	$self->realloc;
1588	}	1648	}
1589		1649
1590	sub get_text {	1650	sub get_text {
1591	$_[0]{text}	1651	$_[0]{text}
1592	}	1652	}
…		…
1625	} elsif ($uni) {	1685	} elsif ($uni) {
1626	substr $text, $self->{cursor}++, 0, chr $uni;	1686	substr $text, $self->{cursor}++, 0, chr $uni;
1627	}	1687	}
1628		1688
1629	$self->_set_text ($text);	1689	$self->_set_text ($text);
1630	$self->update;	1690
1631	$self->check_size;	1691	$self->realloc;
1632	}	1692	}
1633		1693
1634	sub focus_in {	1694	sub focus_in {
1635	my ($self) = @_;	1695	my ($self) = @_;
1636		1696
…		…
1763		1823
1764	sub new {	1824	sub new {
1765	my $class = shift;	1825	my $class = shift;
1766		1826
1767	$class->SUPER::new (	1827	$class->SUPER::new (
1768	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1769	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1770	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1771	can_hover => 1,	1832	can_hover => 1,
1772	align => 0,	1833	align => 0,
1773	valign => 0,	1834	valign => 0,
…		…
1820		1881
1821	sub new {	1882	sub new {
1822	my $class = shift;	1883	my $class = shift;
1823		1884
1824	$class->SUPER::new (	1885	$class->SUPER::new (
1825	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1826	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1827	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1828	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1829	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1830	state => 0,	1892	state => 0,
…		…
1834	}	1896	}
1835		1897
1836	sub size_request {	1898	sub size_request {
1837	my ($self) = @_;	1899	my ($self) = @_;
1838		1900
1839	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1840	}	1902	}
1841		1903
1842	sub button_down {	1904	sub button_down {
1843	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1844		1906
1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1848	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1849	}	1911	}
1850	}	1912	}
1851		1913
1852	sub _draw {	1914	sub _draw {
1853	my ($self) = @_;	1915	my ($self) = @_;
1854		1916
1855	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1856		1918
1857	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858		1920
1859	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1921	my ($w, $h) = @$self{qw(w h)};
		1922
		1923	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860		1924
1861	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862		1926
1863	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1864		1928
…		…
2129	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2130	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2131	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2132	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2133	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2134	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2135	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2136	vertical => 0,	2200	vertical => 0,
2137	can_hover => 1,	2201	can_hover => 1,
2138	inner_pad => 0.02,	2202	inner_pad => 0.02,
2139	@_	2203	@_
2140	);	2204	);
…		…
2143	$self->update;	2207	$self->update;
2144		2208
2145	$self	2209	$self
2146	}	2210	}
2147		2211
		2212	sub changed { }
		2213
2148	sub set_range {	2214	sub set_range {
2149	my ($self, $range) = @_;	2215	my ($self, $range) = @_;
2150		2216
2151	($range, $self->{range}) = ($self->{range}, $range);	2217	($range, $self->{range}) = ($self->{range}, $range);
2152		2218
…		…
2178	}	2244	}
2179		2245
2180	sub size_request {	2246	sub size_request {
2181	my ($self) = @_;	2247	my ($self) = @_;
2182		2248
2183	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2184	my $h = $self->{req_h};
2185
2186	$self->{vertical} ? ($h, $w) : ($w, $h)
2187	}	2250	}
2188		2251
2189	sub button_down {	2252	sub button_down {
2190	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2191		2254
…		…
2542		2605
2543	sub new {	2606	sub new {
2544	my $class = shift;	2607	my $class = shift;
2545		2608
2546	my $self = $class->SUPER::new (	2609	my $self = $class->SUPER::new (
2547	state => 0,	2610	state => 0,
2548	connect_activate => \&toggle_flopper,	2611	on_activate => \&toggle_flopper,
2549	@_	2612	@_
2550	);	2613	);
2551		2614
2552	if ($self->{state}) {
2553	$self->{state} = 0;
2554	$self->toggle_flopper;
2555	}
2556
2557	$self	2615	$self
2558	}	2616	}
2559		2617
2560	sub toggle_flopper {	2618	sub toggle_flopper {
2561	my ($self) = @_;	2619	my ($self) = @_;
2562		2620
2563	# TODO: use animation	2621	$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	}	2622	}
2575		2623
2576	#############################################################################	2624	#############################################################################
2577		2625
2578	package CFClient::UI::Tooltip;	2626	package CFClient::UI::Tooltip;
…		…
2591	}	2639	}
2592		2640
2593	sub set_tooltip_from {	2641	sub set_tooltip_from {
2594	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2595		2643
		2644	my $tooltip = $widget->{tooltip};
		2645
		2646	if ($ENV{CFPLUS_DEBUG} & 2) {
		2647	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2648	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2649	. "req $widget->{req_w} $widget->{req_h}\n"
		2650	. "visible $widget->{visible}";
		2651	}
		2652
2596	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2597	markup => $widget->{tooltip},	2654	markup => $tooltip,
2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599	fontsize => 0.8,	2656	fontsize => 0.8,
2600	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2601	ellipsise => 0,	2658	ellipsise => 0,
2602	font => ($widget->{tooltip_font} || $::FONT_PROP),	2659	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2613		2670
2614	sub size_allocate {	2671	sub size_allocate {
2615	my ($self, $w, $h) = @_;	2672	my ($self, $w, $h) = @_;
2616		2673
2617	$self->SUPER::size_allocate ($w - 4, $h - 4);	2674	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2675	}
		2676
		2677	sub visibility_change {
		2678	my ($self, $visible) = @_;
		2679
		2680	return unless $visible;
		2681
		2682	$self->{root}->on_post_alloc ("move_$self" => sub {
		2683	my $widget = $self->{owner}
		2684	or return;
		2685
		2686	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2687
		2688	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2689	if $x + $self->{w} > $::WIDTH;
		2690
		2691	$self->move_abs ($x, $y);
		2692	});
2618	}	2693	}
2619		2694
2620	sub _draw {	2695	sub _draw {
2621	my ($self) = @_;	2696	my ($self) = @_;
2622		2697
…		…
2639	glVertex $w, $h;	2714	glVertex $w, $h;
2640	glVertex $w, 0;	2715	glVertex $w, 0;
2641	glEnd;	2716	glEnd;
2642		2717
2643	glTranslate 2 - 0.375, 2 - 0.375;	2718	glTranslate 2 - 0.375, 2 - 0.375;
		2719
2644	$self->SUPER::_draw;	2720	$self->SUPER::_draw;
2645	}	2721	}
2646		2722
2647	#############################################################################	2723	#############################################################################
2648		2724
…		…
2724	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2725	}	2801	}
2726		2802
2727	#############################################################################	2803	#############################################################################
2728		2804
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;	2805	package CFClient::UI::Menu;
2777		2806
2778	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2779		2808
2780	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2818	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2819	$GRAB = $self;	2848	$GRAB = $self;
2820	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2821		2850
2822	$self->show;	2851	$self->show;
2823	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2852	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824	}	2853	}
2825		2854
2826	sub mouse_motion {	2855	sub mouse_motion {
2827	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2828		2857
…		…
2953	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
2954	}	2983	}
2955		2984
2956	#############################################################################	2985	#############################################################################
2957		2986
2958	package CFClient::UI::Root;	2987	package CFClient::UI::Inventory;
2959		2988
2960	our @ISA = CFClient::UI::Container::;	2989	our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962	use CFClient::OpenGL;
2963		2990
2964	sub new {	2991	sub new {
2965	my $class = shift;	2992	my $class = shift;
2966		2993
2967	$class->SUPER::new (	2994	my $self = $class->SUPER::new (
		2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2968	@_,	2996	@_,
2969	)	2997	);
2970	}
2971		2998
2972	sub configure {	2999	$self
		3000	}
		3001
		3002	sub set_items {
		3003	my ($self, $items) = @_;
		3004
		3005	$self->{scrolled}->clear;
		3006	return unless $items;
		3007
		3008	my @items = sort {
		3009	($a->{type} <=> $b->{type})
		3010	or ($a->{name} cmp $b->{name})
		3011	} @$items;
		3012
		3013	$self->{real_items} = \@items;
		3014
		3015	my $row = 0;
		3016	for my $item (@items) {
		3017	CFClient::Item::update_widgets $item;
		3018
		3019	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3020	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3021	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3022
		3023	$row++;
		3024	}
		3025	}
		3026
		3027	#############################################################################
		3028
		3029	package CFClient::UI::BindEditor;
		3030
		3031	our @ISA = CFClient::UI::FancyFrame::;
		3032
		3033	sub new {
		3034	my $class = shift;
		3035
		3036	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3037
		3038	$self->add (my $vb = new CFClient::UI::VBox);
		3039
		3040
		3041	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3042	text => "start recording",
		3043	tooltip => "Start/Stops recording of actions."
		3044	."All subsequent actions after the recording started will be captured."
		3045	."The actions are displayed after the record was stopped."
		3046	."To bind the action you have to click on the 'Bind' button",
		3047	on_activate => sub {
		3048	unless ($self->{recording}) {
		3049	$self->start;
		3050	} else {
		3051	$self->stop;
		3052	}
		3053	});
		3054
		3055	$vb->add (new CFClient::UI::Label text => "Actions:");
		3056	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3057
		3058	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3059	$vb->add (my $hb = new CFClient::UI::HBox);
		3060	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3061	$hb->add (new CFClient::UI::Button
		3062	text => "bind",
		3063	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3064	on_activate => sub {
		3065	$self->ask_for_bind;
		3066	});
		3067
		3068	$vb->add (my $hb = new CFClient::UI::HBox);
		3069	$hb->add (new CFClient::UI::Button
		3070	text => "ok",
		3071	expand => 1,
		3072	tooltip => "This closes the binding editor and saves the binding",
		3073	on_activate => sub {
		3074	$self->hide;
		3075	$self->commit;
		3076	});
		3077
		3078	$hb->add (new CFClient::UI::Button
		3079	text => "cancel",
		3080	expand => 1,
		3081	tooltip => "This closes the binding editor without saving",
		3082	on_activate => sub {
		3083	$self->hide;
		3084	$self->{binding_cancel}->()
		3085	if $self->{binding_cancel};
		3086	});
		3087
		3088	$self->update_binding_widgets;
		3089
		3090	$self
		3091	}
		3092
		3093	sub commit {
		3094	my ($self) = @_;
		3095	my ($mod, $sym, $cmds) = $self->get_binding;
		3096	if ($sym != 0 && @$cmds > 0) {
		3097	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3098	."'. Don't forget 'Save Config'!");
		3099	$self->{binding_change}->($mod, $sym, $cmds)
		3100	if $self->{binding_change};
		3101	} else {
		3102	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3103	$self->{binding_cancel}->()
		3104	if $self->{binding_cancel};
		3105	}
		3106	}
		3107
		3108	sub start {
		3109	my ($self) = @_;
		3110
		3111	$self->{rec_btn}->set_text ("stop recording");
		3112	$self->{recording} = 1;
		3113	$self->clear_command_list;
		3114	$::CONN->start_record if $::CONN;
		3115	}
		3116
		3117	sub stop {
		3118	my ($self) = @_;
		3119
		3120	$self->{rec_btn}->set_text ("start recording");
		3121	$self->{recording} = 0;
		3122
		3123	my $rec;
		3124	$rec = $::CONN->stop_record if $::CONN;
		3125	return unless ref $rec eq 'ARRAY';
		3126	$self->set_command_list ($rec);
		3127	}
		3128
		3129	# if $commit is true, the binding will be set after the user entered a key combo
		3130	sub ask_for_bind {
		3131	my ($self, $commit) = @_;
		3132
		3133	CFClient::Binder::open_binding_dialog (sub {
		3134	my ($mod, $sym) = @_;
		3135	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3136	$self->update_binding_widgets;
		3137	$self->commit if $commit;
		3138	});
		3139	}
		3140
		3141	# $mod and $sym are the modifiers and key symbol
		3142	# $cmds is a array ref of strings (the commands)
		3143	# $cb is the callback that is executed on OK
		3144	# $ccb is the callback that is executed on CANCEL and
		3145	# when the binding was unsuccessful on OK
		3146	sub set_binding {
2973	my ($self, $x, $y, $w, $h) = @_;	3147	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2974		3148
2975	$self->{w} = $w;	3149	$self->clear_command_list;
2976	$self->{h} = $h;	3150	$self->{recording} = 0;
2977	}	3151	$self->{rec_btn}->set_text ("start recording");
2978		3152
2979	sub check_size {	3153	$self->{binding} = [$mod, $sym];
		3154	$self->{commands} = $cmds;
		3155
		3156	$self->{binding_change} = $cb;
		3157	$self->{binding_cancel} = $ccb;
		3158
		3159	$self->update_binding_widgets;
		3160	}
		3161
		3162	# this is a shortcut method that asks for a binding
		3163	# and then just binds it.
		3164	sub do_quick_binding {
2980	my ($self) = @_;	3165	my ($self, $cmds) = @_;
		3166	$self->set_binding (undef, undef, $cmds, sub {
		3167	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3168	});
		3169	$self->ask_for_bind (1);
		3170	}
2981		3171
2982	$self->size_allocate ($self->{w}, $self->{h})	3172	sub update_binding_widgets {
2983	if $self->{w};	3173	my ($self) = @_;
		3174	my ($mod, $sym, $cmds) = $self->get_binding;
		3175	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3176	$self->set_command_list ($cmds);
		3177	}
		3178
		3179	sub get_binding {
		3180	my ($self) = @_;
		3181	return (
		3182	$self->{binding}->[0],
		3183	$self->{binding}->[1],
		3184	[ grep { defined $_ } @{$self->{commands}} ]
		3185	);
		3186	}
		3187
		3188	sub clear_command_list {
		3189	my ($self) = @_;
		3190	$self->{cmdbox}->clear ();
		3191	}
		3192
		3193	sub set_command_list {
		3194	my ($self, $cmds) = @_;
		3195
		3196	$self->{cmdbox}->clear ();
		3197	$self->{commands} = $cmds;
		3198
		3199	my $idx = 0;
		3200
		3201	for (@$cmds) {
		3202	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3203
		3204	my $i = $idx;
		3205	$hb->add (new CFClient::UI::Label text => $_);
		3206	$hb->add (new CFClient::UI::Button
		3207	text => "delete",
		3208	tooltip => "Deletes the action from the record",
		3209	on_activate => sub {
		3210	$self->{cmdbox}->remove ($hb);
		3211	$cmds->[$i] = undef;
		3212	});
		3213
		3214
		3215	$idx++
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::SpellList;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (new CFClient::UI::ScrolledWindow
		3231	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3232
		3233	$self;
		3234	}
		3235
		3236	# XXX: Do sorting? Argl...
		3237	sub add_spell {
		3238	my ($self, $spell) = @_;
		3239	$self->{spells}->{$spell->{name}} = $spell;
		3240
		3241	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3242	face => $spell->{face},
		3243	can_hover => 1,
		3244	can_events => 1,
		3245	tooltip => $spell->{message});
		3246
		3247	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3248	text => $spell->{name},
		3249	can_hover => 1,
		3250	can_events => 1,
		3251	tooltip => $spell->{message},
		3252	expand => 1);
		3253
		3254	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3255	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3256	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3257	expand => 1);
		3258
		3259	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3260	text => "bind to key",
		3261	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3262	}
		3263
		3264	sub rebuild_spell_list {
		3265	my ($self) = @_;
		3266	$self->{tbl_idx} = 0;
		3267	$self->add_spell ($_) for values %{$self->{spells}};
		3268	}
		3269
		3270	sub remove_spell {
		3271	my ($self, $spell) = @_;
		3272	delete $self->{spells}->{$spell->{name}};
		3273	$self->rebuild_spell_list;
		3274	}
		3275
		3276	#############################################################################
		3277
		3278	package CFClient::UI::Root;
		3279
		3280	our @ISA = CFClient::UI::Container::;
		3281
		3282	use CFClient::OpenGL;
		3283
		3284	sub new {
		3285	my $class = shift;
		3286
		3287	my $self = $class->SUPER::new (
		3288	visible => 1,
		3289	@_,
		3290	);
		3291
		3292	Scalar::Util::weaken ($self->{root} = $self);
		3293
		3294	$self
2984	}	3295	}
2985		3296
2986	sub size_request {	3297	sub size_request {
2987	my ($self) = @_;	3298	my ($self) = @_;
2988		3299
2989	($self->{w}, $self->{h})	3300	($self->{w}, $self->{h})
		3301	}
		3302
		3303	sub _to_pixel {
		3304	my ($coord, $size, $max) = @_;
		3305
		3306	$coord =
		3307	$coord eq "center" ? ($max - $size) * 0.5
		3308	: $coord eq "max" ? $max
		3309	: $coord;
		3310
		3311	$coord = 0 if $coord < 0;
		3312	$coord = $max - $size if $coord > $max - $size;
		3313
		3314	int $coord + 0.5
2990	}	3315	}
2991		3316
2992	sub size_allocate {	3317	sub size_allocate {
2993	my ($self, $w, $h) = @_;	3318	my ($self, $w, $h) = @_;
2994		3319
2995	for my $child ($self->children) {	3320	for my $child ($self->children) {
2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3321	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997		3322
2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3323	$X = $child->{force_x} if exists $child->{force_x};
2999	if exists $child->{req_x};	3324	$Y = $child->{force_y} if exists $child->{force_y};
3000		3325
3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3326	$X = _to_pixel $X, $W, $self->{w};
3002	if exists $child->{req_y};	3327	$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		3328
3007	$child->configure ($X, $Y, $W, $H);	3329	$child->configure ($X, $Y, $W, $H);
3008	}	3330	}
3009	}	3331	}
3010		3332
…		…
3021	}	3343	}
3022		3344
3023	sub update {	3345	sub update {
3024	my ($self) = @_;	3346	my ($self) = @_;
3025		3347
3026	$self->check_size;
3027	$::WANT_REFRESH++;	3348	$::WANT_REFRESH++;
3028	}	3349	}
3029		3350
3030	sub add {	3351	sub add {
3031	my ($self, @children) = @_;	3352	my ($self, @children) = @_;
3032		3353
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;	3354	$_->{is_toplevel} = 1
3041		3355	for @children;
3042	# integerise window positions
3043	$child->{x} = int $child->{x};
3044	$child->{y} = int $child->{y};
3045	}
3046		3356
3047	$self->SUPER::add (@children);	3357	$self->SUPER::add (@children);
3048	}	3358	}
3049		3359
3050	sub remove {	3360	sub remove {
3051	my ($self, @children) = @_;	3361	my ($self, @children) = @_;
3052		3362
3053	$self->SUPER::remove (@children);	3363	$self->SUPER::remove (@children);
		3364
		3365	delete $self->{is_toplevel}
		3366	for @children;
3054		3367
3055	while (@children) {	3368	while (@children) {
3056	my $w = pop @children;	3369	my $w = pop @children;
3057	push @children, $w->children;	3370	push @children, $w->children;
3058	$w->set_invisible;	3371	$w->set_invisible;
…		…
3077	while ($self->{refresh_hook}) {	3390	while ($self->{refresh_hook}) {
3078	$_->()	3391	$_->()
3079	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3080	}	3393	}
3081		3394
3082	if ($self->{check_size}) {	3395	if ($self->{realloc}) {
3083	my @queue = ([], []);	3396	my %queue;
		3397	my @queue;
		3398	my $widget;
3084		3399
3085	for (;;) {	3400	outer:
3086	if ($self->{check_size}) {	3401	while () {
3087	# heuristic: check containers last	3402	if (my $realloc = delete $self->{realloc}) {
3088	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3403	for $widget (values %$realloc) {
3089	for values %{delete $self->{check_size}}	3404	$widget->{visible} or next; # do not resize invisible widgets
		3405
		3406	$queue{$widget+0}++ and next; # duplicates are common
		3407
		3408	push @{ $queue[$widget->{visible}] }, $widget;
		3409	}
3090	}	3410	}
3091		3411
3092	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3412	while () {
		3413	@queue or last outer;
3093		3414
3094	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3415	$widget = pop @{ $queue[-1] || [] }
3095	? @$widget{qw(user_w user_h)}	3416	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		3417
		3418	pop @queue;
		3419	}
		3420
		3421	delete $queue{$widget+0};
		3422
		3423	my ($w, $h) = $widget->size_request;
		3424
		3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3427
		3428	$w = $widget->{force_w} if exists $widget->{force_w};
		3429	$h = $widget->{force_h} if exists $widget->{force_h};
		3430
		3431	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3432	|| delete $widget->{force_realloc}) {
3102	$widget->{req_w} = $w;	3433	$widget->{req_w} = $w;
3103	$widget->{req_h} = $h;	3434	$widget->{req_h} = $h;
3104		3435
3105	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3436	$self->{size_alloc}{$widget+0} = $widget;
3106		3437
3107	$widget->{parent}->check_size
3108	if $widget->{parent};	3438	if (my $parent = $widget->{parent}) {
		3439	$self->{realloc}{$parent+0} = $parent
		3440	unless $queue{$parent+0};
		3441
		3442	$parent->{force_size_alloc} = 1;
		3443	$self->{size_alloc}{$parent+0} = $parent;
		3444	}
3109	}	3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
3110	}	3448	}
3111	}	3449	}
3112		3450
3113	while ($self->{size_alloc}) {	3451	while (my $size_alloc = delete $self->{size_alloc}) {
3114	for (values %{delete $self->{size_alloc}}) {	3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
3115	my ($widget, $w, $h) = @$_;	3453	values %$size_alloc;
		3454
		3455	while () {
		3456	my $widget = pop @queue || last;
		3457
		3458	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116		3459
3117	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3118	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3119		3462
		3463	$w = int $w + 0.5;
		3464	$h = int $h + 0.5;
		3465
		3466	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3467	$widget->{old_w} = $widget->{w};
		3468	$widget->{old_h} = $widget->{h};
		3469
3120	$widget->{w} = $w;	3470	$widget->{w} = $w;
3121	$widget->{h} = $h;	3471	$widget->{h} = $h;
		3472
3122	$widget->emit (size_allocate => $w, $h);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3123	}	3475	}
3124	}	3476	}
3125		3477
3126	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3127	$_->()	3479	$_->()
3128	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3129	}	3481	}
		3482
3130		3483
3131	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3134		3487
…		…
3136	glLoadIdentity;	3489	glLoadIdentity;
3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3139	glLoadIdentity;	3492	glLoadIdentity;
3140		3493
		3494	{
		3495	package CFClient::UI::Base;
		3496
		3497	($draw_x, $draw_y, $draw_w, $draw_h) =
		3498	(0, 0, $self->{w}, $self->{h});
		3499	}
		3500
3141	$self->_draw;	3501	$self->_draw;
3142	}	3502	}
3143		3503
3144	#############################################################################	3504	#############################################################################
3145		3505

Diff Legend

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