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.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	# 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 {	583	sub DESTROY {
504	my ($self) = @_;	584	my ($self) = @_;
505		585
506	delete $WIDGET{$self+0};	586	delete $WIDGET{$self+0};
507	#$self->deactivate;	587	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	643	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	644	$class->SUPER::new (can_events => 0, %arg);
565	}	645	}
566		646
567	sub size_request {	647	sub size_request {
568	(0, 0)	648	my ($self) = @_;
		649
		650	($self->{w} + 0, $self->{h} + 0)
569	}	651	}
570		652
571	sub draw { }	653	sub draw { }
572		654
573	#############################################################################	655	#############################################################################
…		…
602	$self->{children} = [	684	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	685	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	686	@{$self->{children}}, @widgets
605	];	687	];
606		688
607	$self->check_size (1);	689	$self->realloc;
608	$self->update;
609	}	690	}
610		691
611	sub children {	692	sub children {
612	@{ $_[0]{children} }	693	@{ $_[0]{children} }
613	}	694	}
…		…
618	delete $child->{parent};	699	delete $child->{parent};
619	$child->hide;	700	$child->hide;
620		701
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	702	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		703
623	$self->check_size;	704	$self->realloc;
624	$self->update;
625	}	705	}
626		706
627	sub clear {	707	sub clear {
628	my ($self) = @_;	708	my ($self) = @_;
629		709
…		…
633	for (@$children) {	713	for (@$children) {
634	delete $_->{parent};	714	delete $_->{parent};
635	$_->hide;	715	$_->hide;
636	}	716	}
637		717
638	$self->check_size;	718	$self->realloc;
639	$self->update;
640	}	719	}
641		720
642	sub find_widget {	721	sub find_widget {
643	my ($self, $x, $y) = @_;	722	my ($self, $x, $y) = @_;
644		723
…		…
731	$self->SUPER::size_allocate ($w, $h);	810	$self->SUPER::size_allocate ($w, $h);
732	$self->update;	811	$self->update;
733	}	812	}
734		813
735	sub _render {	814	sub _render {
		815	my ($self) = @_;
		816
736	$_[0]{children}[0]->draw;	817	$self->{children}[0]->draw;
737	}	818	}
738		819
739	sub render_child {	820	sub render_child {
740	my ($self) = @_;	821	my ($self) = @_;
741		822
742	$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 {
743	glClearColor 0, 0, 0, 0;	824	glClearColor 0, 0, 0, 0;
744	glClear GL_COLOR_BUFFER_BIT;	825	glClear GL_COLOR_BUFFER_BIT;
745		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
746	$self->_render;	834	$self->_render;
747	};	835	};
748	}	836	}
749		837
750	sub _draw {	838	sub _draw {
751	my ($self) = @_;	839	my ($self) = @_;
752		840
753	my ($w, $h) = ($self->w, $self->h);	841	my ($w, $h) = @$self{qw(w h)};
754		842
755	my $tex = $self->{texture}	843	my $tex = $self->{texture}
756	or return;	844	or return;
757		845
758	glEnable GL_TEXTURE_2D;	846	glEnable GL_TEXTURE_2D;
…		…
781	}	869	}
782		870
783	sub size_request {	871	sub size_request {
784	my ($self) = @_;	872	my ($self) = @_;
785		873
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	874	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787		875
788	@$self{qw(child_w child_h)}	876	$w = 10 if $self->{scroll_x};
		877	$h = 10 if $self->{scroll_y};
		878
		879	($w, $h)
789	}	880	}
790		881
791	sub size_allocate {	882	sub size_allocate {
792	my ($self, $w, $h) = @_;	883	my ($self, $w, $h) = @_;
793		884
		885	my $child = $self->child;
		886
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796		889
797	$self->child->configure (0, 0, $w, $h);	890	$self->child->configure (0, 0, $w, $h);
798	$self->update;	891	$self->update;
799	}	892	}
800		893
…		…
836	}	929	}
837		930
838	sub _render {	931	sub _render {
839	my ($self) = @_;	932	my ($self) = @_;
840		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
841	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842		938
843	$self->SUPER::_render;	939	$self->SUPER::_render;
844	}	940	}
845		941
…		…
853	my $class = shift;	949	my $class = shift;
854		950
855	my $self;	951	my $self;
856		952
857	my $slider = new CFClient::UI::Slider	953	my $slider = new CFClient::UI::Slider
858	vertical => 1,	954	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	955	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	956	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	957	$self->{vp}->set_offset (0, $_[1]);
862	},	958	},
863	;	959	;
864		960
865	$self = $class->SUPER::new (	961	$self = $class->SUPER::new (
…		…
871	$self->{vp}->add ($self->{scrolled});	967	$self->{vp}->add ($self->{scrolled});
872	$self->add ($self->{vp});	968	$self->add ($self->{vp});
873	$self->add ($self->{slider});	969	$self->add ($self->{slider});
874		970
875	$self	971	$self
		972	}
		973
		974	sub update {
		975	my ($self) = @_;
		976
		977	$self->SUPER::update;
		978
		979	# todo: overwrite size_allocate of child
		980	my $child = $self->{vp}->child;
		981	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876	}	982	}
877		983
878	sub size_allocate {	984	sub size_allocate {
879	my ($self, $w, $h) = @_;	985	my ($self, $w, $h) = @_;
880		986
…		…
933		1039
934	our @ISA = CFClient::UI::Bin::;	1040	our @ISA = CFClient::UI::Bin::;
935		1041
936	use CFClient::OpenGL;	1042	use CFClient::OpenGL;
937		1043
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1049	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);	1050	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1051
942	sub new {	1052	sub new {
943	my $class = shift;	1053	my $class = shift;
944
945	# TODO: user_x, user_y, overwrite moveto?
946		1054
947	my $self = $class->SUPER::new (	1055	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1056	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1057	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1058	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1059	can_events => 1,
		1060	min_w => 16,
		1061	min_h => 16,
953	@_	1062	@_
954	);	1063	);
955		1064
956	$self->{title} &&= new CFClient::UI::Label	1065	$self->{title} &&= new CFClient::UI::Label
957	align => 0,	1066	align => 0,
…		…
1010	my ($ev, $x, $y) = @_;	1119	my ($ev, $x, $y) = @_;
1011		1120
1012	my $dx = $ev->{x} - $ox;	1121	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1122	my $dy = $ev->{y} - $oy;
1014		1123
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1126
		1127	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1129	};
1020		1130
1021	} elsif ($lr ^ $td) {	1131	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1133	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1135	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1136	my ($ev, $x, $y) = @_;
1027		1137
1028	($x, $y) = ($ev->{x}, $ev->{y});	1138	($x, $y) = ($ev->{x}, $ev->{y});
1029		1139
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1140	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1141	};
1033	}	1142	}
1034	}	1143	}
1035		1144
1036	sub button_up {	1145	sub button_up {
…		…
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1165
1057	my $border = $self->border;	1166	my $border = $self->border;
1058		1167
1059	glColor @{ $self->{border_bg} };	1168	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1173
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1175	glColor @{ $self->{bg} };
1067		1176
1068	# TODO: repeat texture not scale	1177	# TODO: repeat texture not scale
		1178	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1179	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1180	$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);	1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1182	}
1079		1183
1080	glDisable GL_TEXTURE_2D;	1184	glDisable GL_TEXTURE_2D;
1081		1185
…		…
1101	col_expand => [],	1205	col_expand => [],
1102	@_,	1206	@_,
1103	)	1207	)
1104	}	1208	}
1105		1209
		1210	sub children {
		1211	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1212	}
		1213
1106	sub add {	1214	sub add {
1107	my ($self, $x, $y, $child) = @_;	1215	my ($self, $x, $y, $child) = @_;
1108		1216
1109	$child->set_parent ($self);	1217	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1218	$self->{children}[$y][$x] = $child;
1111		1219
1112	$child->check_size;	1220	$self->realloc;
1113	}	1221	}
1114		1222
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs a signal on removal?	1223	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1224	sub clear {
1121	my ($self) = @_;	1225	my ($self) = @_;
1122		1226
1123	my @children = $self->children;	1227	my @children = $self->children;
1124	delete $self->{children};	1228	delete $self->{children};
…		…
1126	for (@children) {	1230	for (@children) {
1127	delete $_->{parent};	1231	delete $_->{parent};
1128	$_->hide;	1232	$_->hide;
1129	}	1233	}
1130		1234
1131	$self->update;	1235	$self->realloc;
1132	}	1236	}
1133		1237
1134	sub get_wh {	1238	sub get_wh {
1135	my ($self) = @_;	1239	my ($self) = @_;
1136		1240
…		…
1167	sub size_allocate {	1271	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1272	my ($self, $w, $h) = @_;
1169		1273
1170	my ($ws, $hs) = $self->get_wh;	1274	my ($ws, $hs) = $self->get_wh;
1171		1275
1172	my $req_w = sum @$ws;	1276	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1277	my $req_h = (sum @$hs) || 1;
1174		1278
1175	# TODO: nicer code && do row_expand	1279	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1280	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1281	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1282	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1336	}
1233	}	1337	}
1234		1338
1235	#############################################################################	1339	#############################################################################
1236		1340
1237	package CFClient::UI::HBox;	1341	package CFClient::UI::Box;
1238
1239	# TODO: wrap into common Box base class
1240		1342
1241	our @ISA = CFClient::UI::Container::;	1343	our @ISA = CFClient::UI::Container::;
1242		1344
1243	sub size_request {	1345	sub size_request {
1244	my ($self) = @_;	1346	my ($self) = @_;
1245		1347
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1348	$self->{vertical}
1247		1349	? (
1248	(	1350	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1249	(List::Util::sum map $_->[0], @alloc),	1351	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250	(List::Util::max map $_->[1], @alloc),	1352	)
1251	)	1353	: (
		1354	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1356	)
1252	}	1357	}
1253		1358
1254	sub size_allocate {	1359	sub size_allocate {
1255	my ($self, $w, $h) = @_;	1360	my ($self, $w, $h) = @_;
1256		1361
1257	($h, $w) = ($w, $h);	1362	my $space = $self->{vertical} ? $h : $w;
1258
1259	my $children = $self->{children};	1363	my $children = $self->{children};
1260		1364
1261	my @h = map $_->{req_w}, @$children;	1365	my @req;
1262		1366
1263	my $req_h = List::Util::sum @h;	1367	if ($self->{homogeneous}) {
1264		1368	@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 {	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 {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;	1377	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270	$exp ||= 1;
1271		1378
		1379	$space = ($space - $req) / $expand; # remaining space to give away
		1380
		1381	$req[$_] += $space * $children->[$_]{expand}
1272	for (0 .. $#$children) {	1382	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	}	1383	}
1279	}	1384	}
1280		1385
1281	CFClient::UI::harmonize \@h;	1386	CFClient::UI::harmonize \@req;
1282		1387
1283	my $y = 0;	1388	my $pos = 0;
1284	for (0 .. $#$children) {	1389	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];	1390	my $alloc = $req[$_];
1287	$child->configure ($y, 0, $h, $w);	1391	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288		1392
1289	$y += $h;	1393	$pos += $alloc;
1290	}	1394	}
1291		1395
1292	1	1396	1
1293	}	1397	}
1294		1398
1295	#############################################################################	1399	#############################################################################
1296		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
1297	package CFClient::UI::VBox;	1416	package CFClient::UI::VBox;
1298		1417
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1418	our @ISA = CFClient::UI::Box::;
1302		1419
1303	sub size_request {	1420	sub new {
1304	my ($self) = @_;	1421	my $class = shift;
1305		1422
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1423	$class->SUPER::new (
1307		1424	vertical => 1,
1308	(	1425	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1426	)
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	}	1427	}
1352		1428
1353	#############################################################################	1429	#############################################################################
1354		1430
1355	package CFClient::UI::Label;	1431	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1448	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1449	layout => (new CFClient::Layout),
1374	fontsize => 1,	1450	fontsize => 1,
1375	align => -1,	1451	align => -1,
1376	valign => -1,	1452	valign => -1,
1377	padding => 2,	1453	padding_x => 2,
		1454	padding_y => 2,
1378	can_events => 0,	1455	can_events => 0,
1379	%arg	1456	%arg
1380	);	1457	);
1381		1458
1382	if (exists $self->{template}) {	1459	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1495	$self->{text} = "T$text";
1419		1496
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1498	$self->{layout}->set_text ($text);
1422		1499
		1500	$self->realloc;
1423	$self->update;	1501	$self->update;
1424	$self->check_size;
1425	}	1502	}
1426		1503
1427	sub set_markup {	1504	sub set_markup {
1428	my ($self, $markup) = @_;	1505	my ($self, $markup) = @_;
1429		1506
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1511
1435	$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;
1436	$self->{layout}->set_markup ($markup);	1513	$self->{layout}->set_markup ($markup);
1437		1514
		1515	$self->realloc;
1438	$self->update;	1516	$self->update;
1439	$self->check_size;
1440	}	1517	}
1441		1518
1442	sub size_request {	1519	sub size_request {
1443	my ($self) = @_;	1520	my ($self) = @_;
1444		1521
…		…
1458		1535
1459	$w = List::Util::max $w, $w2;	1536	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1537	$h = List::Util::max $h, $h2;
1461	}	1538	}
1462		1539
1463	(	1540	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1541	}
1468		1542
1469	sub size_allocate {	1543	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1471		1545
1472	delete $self->{texture};	1546	delete $self->{texture}
		1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473	}	1548	}
1474		1549
1475	sub set_fontsize {	1550	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1551	my ($self, $fontsize) = @_;
1477		1552
1478	$self->{fontsize} = $fontsize;	1553	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1554	delete $self->{texture};
1480		1555
1481	$self->update;	1556	$self->realloc;
1482	$self->check_size;
1483	}	1557	}
1484		1558
1485	sub _draw {	1559	sub _draw {
1486	my ($self) = @_;	1560	my ($self) = @_;
1487		1561
…		…
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1571
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1572	my $tex = new_from_layout CFClient::Texture $self->{layout};
1499		1573
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1576	: ($self->{w} - $tex->{w}) * 0.5);
1503		1577
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1580	: ($self->{h} - $tex->{h}) * 0.5);
1507		1581
1508	$tex	1582	$tex
1509	};	1583	};
1510		1584
…		…
1567	sub set_text {	1641	sub set_text {
1568	my ($self, $text) = @_;	1642	my ($self, $text) = @_;
1569		1643
1570	$self->{cursor} = length $text;	1644	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1645	$self->_set_text ($text);
1572	$self->update;	1646
1573	$self->check_size;	1647	$self->realloc;
1574	}	1648	}
1575		1649
1576	sub get_text {	1650	sub get_text {
1577	$_[0]{text}	1651	$_[0]{text}
1578	}	1652	}
…		…
1611	} elsif ($uni) {	1685	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1686	substr $text, $self->{cursor}++, 0, chr $uni;
1613	}	1687	}
1614		1688
1615	$self->_set_text ($text);	1689	$self->_set_text ($text);
1616	$self->update;	1690
1617	$self->check_size;	1691	$self->realloc;
1618	}	1692	}
1619		1693
1620	sub focus_in {	1694	sub focus_in {
1621	my ($self) = @_;	1695	my ($self) = @_;
1622		1696
…		…
1749		1823
1750	sub new {	1824	sub new {
1751	my $class = shift;	1825	my $class = shift;
1752		1826
1753	$class->SUPER::new (	1827	$class->SUPER::new (
1754	padding => 4,	1828	padding_x => 4,
		1829	padding_y => 4,
1755	fg => [1, 1, 1],	1830	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1831	active_fg => [0, 0, 1],
1757	can_hover => 1,	1832	can_hover => 1,
1758	align => 0,	1833	align => 0,
1759	valign => 0,	1834	valign => 0,
…		…
1806		1881
1807	sub new {	1882	sub new {
1808	my $class = shift;	1883	my $class = shift;
1809		1884
1810	$class->SUPER::new (	1885	$class->SUPER::new (
1811	padding => 2,	1886	padding_x => 2,
		1887	padding_y => 2,
1812	fg => [1, 1, 1],	1888	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1889	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1890	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1891	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1892	state => 0,
…		…
1820	}	1896	}
1821		1897
1822	sub size_request {	1898	sub size_request {
1823	my ($self) = @_;	1899	my ($self) = @_;
1824		1900
1825	($self->{padding} * 2 + 6) x 2	1901	(6) x 2
1826	}	1902	}
1827		1903
1828	sub button_down {	1904	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1830		1906
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1909	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1910	$self->_emit (changed => $self->{state});
1835	}	1911	}
1836	}	1912	}
1837		1913
1838	sub _draw {	1914	sub _draw {
1839	my ($self) = @_;	1915	my ($self) = @_;
1840		1916
1841	$self->SUPER::_draw;	1917	$self->SUPER::_draw;
1842		1918
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1919	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1920
1845	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;
1846		1924
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1925	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1926
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1927	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1928
…		…
2115	fg => [1, 1, 1],	2193	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2194	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2195	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2196	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2197	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2198	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2199	min_h => $::WIDTH / 80,
2122	vertical => 0,	2200	vertical => 0,
2123	can_hover => 1,	2201	can_hover => 1,
2124	inner_pad => 0.02,	2202	inner_pad => 0.02,
2125	@_	2203	@_
2126	);	2204	);
…		…
2129	$self->update;	2207	$self->update;
2130		2208
2131	$self	2209	$self
2132	}	2210	}
2133		2211
		2212	sub changed { }
		2213
2134	sub set_range {	2214	sub set_range {
2135	my ($self, $range) = @_;	2215	my ($self, $range) = @_;
2136		2216
2137	$self->{range} = $range;	2217	($range, $self->{range}) = ($self->{range}, $range);
2138		2218
2139	$self->update;	2219	$self->update
		2220	if "@$range" ne "@{$self->{range}}";
2140	}	2221	}
2141		2222
2142	sub set_value {	2223	sub set_value {
2143	my ($self, $value) = @_;	2224	my ($self, $value) = @_;
2144		2225
…		…
2163	}	2244	}
2164		2245
2165	sub size_request {	2246	sub size_request {
2166	my ($self) = @_;	2247	my ($self) = @_;
2167		2248
2168	my $w = $self->{req_w};	2249	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2250	}
2173		2251
2174	sub button_down {	2252	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2253	my ($self, $ev, $x, $y) = @_;
2176		2254
…		…
2527		2605
2528	sub new {	2606	sub new {
2529	my $class = shift;	2607	my $class = shift;
2530		2608
2531	my $self = $class->SUPER::new (	2609	my $self = $class->SUPER::new (
2532	state => 0,	2610	state => 0,
2533	connect_activate => \&toggle_flopper,	2611	on_activate => \&toggle_flopper,
2534	@_	2612	@_
2535	);	2613	);
2536		2614
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2615	$self
2543	}	2616	}
2544		2617
2545	sub toggle_flopper {	2618	sub toggle_flopper {
2546	my ($self) = @_;	2619	my ($self) = @_;
2547		2620
2548	# TODO: use animation	2621	$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	}	2622	}
2560		2623
2561	#############################################################################	2624	#############################################################################
2562		2625
2563	package CFClient::UI::Tooltip;	2626	package CFClient::UI::Tooltip;
…		…
2576	}	2639	}
2577		2640
2578	sub set_tooltip_from {	2641	sub set_tooltip_from {
2579	my ($self, $widget) = @_;	2642	my ($self, $widget) = @_;
2580		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
2581	$self->add (new CFClient::UI::Label	2653	$self->add (new CFClient::UI::Label
2582	markup => $widget->{tooltip},	2654	markup => $tooltip,
2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584	fontsize => 0.8,	2656	fontsize => 0.8,
2585	fg => [0, 0, 0, 1],	2657	fg => [0, 0, 0, 1],
2586	ellipsise => 0,	2658	ellipsise => 0,
2587	font => ($widget->{tooltip_font} || $::FONT_PROP),	2659	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2598		2670
2599	sub size_allocate {	2671	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2672	my ($self, $w, $h) = @_;
2601		2673
2602	$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	});
2603	}	2693	}
2604		2694
2605	sub _draw {	2695	sub _draw {
2606	my ($self) = @_;	2696	my ($self) = @_;
2607		2697
…		…
2624	glVertex $w, $h;	2714	glVertex $w, $h;
2625	glVertex $w, 0;	2715	glVertex $w, 0;
2626	glEnd;	2716	glEnd;
2627		2717
2628	glTranslate 2 - 0.375, 2 - 0.375;	2718	glTranslate 2 - 0.375, 2 - 0.375;
		2719
2629	$self->SUPER::_draw;	2720	$self->SUPER::_draw;
2630	}	2721	}
2631		2722
2632	#############################################################################	2723	#############################################################################
2633		2724
…		…
2709	$self->SUPER::DESTROY;	2800	$self->SUPER::DESTROY;
2710	}	2801	}
2711		2802
2712	#############################################################################	2803	#############################################################################
2713		2804
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;	2805	package CFClient::UI::Menu;
2764		2806
2765	our @ISA = CFClient::UI::FancyFrame::;	2807	our @ISA = CFClient::UI::FancyFrame::;
2766		2808
2767	use CFClient::OpenGL;	2809	use CFClient::OpenGL;
…		…
2805	# maybe save $GRAB? must be careful about events...	2847	# maybe save $GRAB? must be careful about events...
2806	$GRAB = $self;	2848	$GRAB = $self;
2807	$self->{button} = $ev->{button};	2849	$self->{button} = $ev->{button};
2808		2850
2809	$self->show;	2851	$self->show;
2810	$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);
2811	}	2853	}
2812		2854
2813	sub mouse_motion {	2855	sub mouse_motion {
2814	my ($self, $ev, $x, $y) = @_;	2856	my ($self, $ev, $x, $y) = @_;
2815		2857
…		…
2940	$self->SUPER::reconfigure;	2982	$self->SUPER::reconfigure;
2941	}	2983	}
2942		2984
2943	#############################################################################	2985	#############################################################################
2944		2986
2945	package CFClient::UI::Root;	2987	package CFClient::UI::Inventory;
2946		2988
2947	our @ISA = CFClient::UI::Container::;	2989	our @ISA = CFClient::UI::ScrolledWindow::;
2948
2949	use CFClient::OpenGL;
2950		2990
2951	sub new {	2991	sub new {
2952	my $class = shift;	2992	my $class = shift;
2953		2993
2954	$class->SUPER::new (	2994	my $self = $class->SUPER::new (
		2995	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2955	@_,	2996	@_,
2956	)	2997	);
2957	}
2958		2998
2959	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 {
2960	my ($self, $x, $y, $w, $h) = @_;	3147	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
2961		3148
2962	$self->{w} = $w;	3149	$self->clear_command_list;
2963	$self->{h} = $h;	3150	$self->{recording} = 0;
2964	}	3151	$self->{rec_btn}->set_text ("start recording");
2965		3152
2966	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 {
2967	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	}
2968		3171
2969	$self->size_allocate ($self->{w}, $self->{h})	3172	sub update_binding_widgets {
2970	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
2971	}	3295	}
2972		3296
2973	sub size_request {	3297	sub size_request {
2974	my ($self) = @_;	3298	my ($self) = @_;
2975		3299
2976	($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
2977	}	3315	}
2978		3316
2979	sub size_allocate {	3317	sub size_allocate {
2980	my ($self, $w, $h) = @_;	3318	my ($self, $w, $h) = @_;
2981		3319
2982	for my $child ($self->children) {	3320	for my $child ($self->children) {
2983	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)};
2984		3322
2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3323	$X = $child->{force_x} if exists $child->{force_x};
2986	if exists $child->{req_x};	3324	$Y = $child->{force_y} if exists $child->{force_y};
2987		3325
2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3326	$X = _to_pixel $X, $W, $self->{w};
2989	if exists $child->{req_y};	3327	$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		3328
2994	$child->configure ($X, $Y, $W, $H);	3329	$child->configure ($X, $Y, $W, $H);
2995	}	3330	}
2996	}	3331	}
2997		3332
…		…
3008	}	3343	}
3009		3344
3010	sub update {	3345	sub update {
3011	my ($self) = @_;	3346	my ($self) = @_;
3012		3347
3013	$self->check_size;
3014	$::WANT_REFRESH++;	3348	$::WANT_REFRESH++;
3015	}	3349	}
3016		3350
3017	sub add {	3351	sub add {
3018	my ($self, @children) = @_;	3352	my ($self, @children) = @_;
3019		3353
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;	3354	$_->{is_toplevel} = 1
3028		3355	for @children;
3029	# integerise window positions
3030	$child->{x} = int $child->{x};
3031	$child->{y} = int $child->{y};
3032	}
3033		3356
3034	$self->SUPER::add (@children);	3357	$self->SUPER::add (@children);
3035	}	3358	}
3036		3359
3037	sub remove {	3360	sub remove {
3038	my ($self, @children) = @_;	3361	my ($self, @children) = @_;
3039		3362
3040	$self->SUPER::remove (@children);	3363	$self->SUPER::remove (@children);
		3364
		3365	delete $self->{is_toplevel}
		3366	for @children;
3041		3367
3042	while (@children) {	3368	while (@children) {
3043	my $w = pop @children;	3369	my $w = pop @children;
3044	push @children, $w->children;	3370	push @children, $w->children;
3045	$w->set_invisible;	3371	$w->set_invisible;
…		…
3064	while ($self->{refresh_hook}) {	3390	while ($self->{refresh_hook}) {
3065	$_->()	3391	$_->()
3066	for values %{delete $self->{refresh_hook}};	3392	for values %{delete $self->{refresh_hook}};
3067	}	3393	}
3068		3394
3069	if ($self->{check_size}) {	3395	if ($self->{realloc}) {
3070	my @queue = ([], []);	3396	my %queue;
		3397	my @queue;
		3398	my $widget;
3071		3399
3072	for (;;) {	3400	outer:
3073	if ($self->{check_size}) {	3401	while () {
3074	# heuristic: check containers last	3402	if (my $realloc = delete $self->{realloc}) {
3075	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3403	for $widget (values %$realloc) {
3076	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	}
3077	}	3410	}
3078		3411
3079	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3412	while () {
		3413	@queue or last outer;
3080		3414
3081	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3415	$widget = pop @{ $queue[-1] || [] }
3082	? @$widget{qw(user_w user_h)}	3416	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		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}) {
3089	$widget->{req_w} = $w;	3433	$widget->{req_w} = $w;
3090	$widget->{req_h} = $h;	3434	$widget->{req_h} = $h;
3091		3435
3092	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3436	$self->{size_alloc}{$widget+0} = $widget;
3093		3437
3094	$widget->{parent}->check_size
3095	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	}
3096	}	3445	}
		3446
		3447	delete $self->{realloc}{$widget+0};
3097	}	3448	}
3098	}	3449	}
3099		3450
3100	while ($self->{size_alloc}) {	3451	while (my $size_alloc = delete $self->{size_alloc}) {
3101	for (values %{delete $self->{size_alloc}}) {	3452	my @queue = sort { $b->{visible} <=> $a->{visible} }
3102	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)};
3103		3459
3104	$w = 0 if $w < 0;	3460	$w = 0 if $w < 0;
3105	$h = 0 if $h < 0;	3461	$h = 0 if $h < 0;
3106		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
3107	$widget->{w} = $w;	3470	$widget->{w} = $w;
3108	$widget->{h} = $h;	3471	$widget->{h} = $h;
		3472
3109	$widget->emit (size_allocate => $w, $h);	3473	$widget->emit (size_allocate => $w, $h);
		3474	}
3110	}	3475	}
3111	}	3476	}
3112		3477
3113	while ($self->{post_alloc_hook}) {	3478	while ($self->{post_alloc_hook}) {
3114	$_->()	3479	$_->()
3115	for values %{delete $self->{post_alloc_hook}};	3480	for values %{delete $self->{post_alloc_hook}};
3116	}	3481	}
		3482
3117		3483
3118	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120	glClear GL_COLOR_BUFFER_BIT;	3486	glClear GL_COLOR_BUFFER_BIT;
3121		3487
…		…
3123	glLoadIdentity;	3489	glLoadIdentity;
3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125	glMatrixMode GL_MODELVIEW;	3491	glMatrixMode GL_MODELVIEW;
3126	glLoadIdentity;	3492	glLoadIdentity;
3127		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
3128	$self->_draw;	3501	$self->_draw;
3129	}	3502	}
3130		3503
3131	#############################################################################	3504	#############################################################################
3132		3505

Diff Legend

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