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.233 by root, Thu May 25 03:42:40 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 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
		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
		33	$layout
		34	}
		35
		36	sub set_layout {
		37	my ($layout) = @_;
		38	$LAYOUT = $layout;
		39	}
18		40
19	sub check_tooltip {	41	sub check_tooltip {
20	if (!$GRAB) {	42	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	43	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	44	if (length $widget->{tooltip}) {
23		45
24	if ($TOOLTIP->{owner} != $widget) {	46	if ($TOOLTIP->{owner} != $widget) {
		47	$TOOLTIP->hide;
		48
25	$TOOLTIP->{owner} = $widget;	49	$TOOLTIP->{owner} = $widget;
26		50
27	my $tip = $widget->{tooltip};	51	my $tip = $widget->{tooltip};
28		52
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	53	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		54
31	$TOOLTIP->set_tooltip_from ($widget);	55	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	56	$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	}	57	}
43		58
44	return;	59	return;
45	}	60	}
46	}	61	}
…		…
152	sub rescale_widgets {	167	sub rescale_widgets {
153	my ($sx, $sy) = @_;	168	my ($sx, $sy) = @_;
154		169
155	for my $widget (values %WIDGET) {	170	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	171	if ($widget->{is_toplevel}) {
		172	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		173	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		174
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	175	$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};	176	$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};	177	$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};	178	$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};	179	$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};	180	$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};	181
		182	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		183	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		184
165	}	185	}
166	}	186	}
167		187
168	reconfigure_widgets;	188	reconfigure_widgets;
169	}	189	}
…		…
178		198
179	sub new {	199	sub new {
180	my $class = shift;	200	my $class = shift;
181		201
182	my $self = bless {	202	my $self = bless {
183	x => 0,	203	x => "center",
184	y => 0,	204	y => "center",
185	z => 0,	205	z => 0,
		206	w => undef,
		207	h => undef,
186	can_events => 1,	208	can_events => 1,
187	@_	209	@_
188	}, $class;	210	}, $class;
189		211
		212	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		213	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		214	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		215	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		216	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		217
		218	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		219	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		220	}
		221
		222	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		223
190	for (keys %$self) {	224	for (keys %$self) {
191	if (/^connect_(.*)$/) {	225	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	226	$self->connect ($1 => delete $self->{$_});
193	}	227	}
194	}	228	}
195		229
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
197
198	$self	230	$self
199	}	231	}
200		232
201	sub destroy {	233	sub destroy {
202	my ($self) = @_;	234	my ($self) = @_;
…		…
205	%$self = ();	237	%$self = ();
206	}	238	}
207		239
208	sub show {	240	sub show {
209	my ($self) = @_;	241	my ($self) = @_;
		242
210	return if $self->{parent};	243	return if $self->{parent};
211		244
212	$CFClient::UI::ROOT->add ($self);	245	$CFClient::UI::ROOT->add ($self);
213	}	246	}
214		247
215	sub show_centered {	248	sub set_visible {
216	my ($self) = @_;	249	my ($self) = @_;
		250
217	return if $self->{parent};	251	return if $self->{visible};
218		252
219	$self->show;	253	$self->{root} = $self->{parent}{root};
		254	$self->{visible} = $self->{parent}{visible} + 1;
220		255
221	$CFClient::UI::ROOT->on_post_alloc (	256	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	257
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	258	$self->realloc if !exists $self->{req_w};
224	},	259
225	);	260	$_->set_visible for $self->children;
226	}	261	}
227		262
228	sub set_invisible {	263	sub set_invisible {
229	my ($self) = @_;	264	my ($self) = @_;
230		265
231	# broken show/hide model	266	return unless $self->{visible};
232		267
		268	$_->set_invisible for $self->children;
		269
		270	delete $self->{root};
233	delete $self->{visible};	271	delete $self->{visible};
234		272
235	undef $GRAB if $GRAB == $self;	273	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	274	undef $HOVER if $HOVER == $self;
237		275
238	CFClient::UI::check_tooltip	276	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	277	if $TOOLTIP->{owner} == $self;
240		278
241	$self->focus_out;	279	$self->focus_out;
		280
		281	$self->emit (visibility_change => 0);
		282	}
		283
		284	sub set_visibility {
		285	my ($self, $visible) = @_;
		286
		287	return if $self->{visible} == $visible;
		288
		289	$visible ? $self->hide
		290	: $self->show;
		291	}
		292
		293	sub toggle_visibility {
		294	my ($self) = @_;
		295
		296	$self->{visible}
		297	? $self->hide
		298	: $self->show;
242	}	299	}
243		300
244	sub hide {	301	sub hide {
245	my ($self) = @_;	302	my ($self) = @_;
246		303
…		…
248		305
249	$self->{parent}->remove ($self)	306	$self->{parent}->remove ($self)
250	if $self->{parent};	307	if $self->{parent};
251	}	308	}
252		309
253	sub move {	310	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	311	my ($self, $x, $y, $z) = @_;
255		312
256	$self->{x} = int $x;	313	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	314	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	315	$self->{z} = $z if defined $z;
259		316
260	$self->update;	317	$self->update;
261	}	318	}
262		319
263	sub set_size {	320	sub set_size {
264	my ($self, $w, $h) = @_;	321	my ($self, $w, $h) = @_;
265		322
266	$self->{user_w} = $w;	323	$self->{force_w} = $w;
267	$self->{user_h} = $h;	324	$self->{force_h} = $h;
268		325
269	$self->check_size;	326	$self->realloc;
270	}	327	}
271		328
272	sub size_request {	329	sub size_request {
273	require Carp;	330	require Carp;
274	Carp::confess "size_request is abstract";	331	Carp::confess "size_request is abstract";
…		…
276		333
277	sub configure {	334	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	335	my ($self, $x, $y, $w, $h) = @_;
279		336
280	if ($self->{aspect}) {	337	if ($self->{aspect}) {
		338	my ($ow, $oh) = ($w, $h);
		339
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	340	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	341	$h = List::Util::min $h, int $w / $self->{aspect};
283		342
284	# use alignment to adjust x, y	343	# use alignment to adjust x, y
285		344
286	$x += int +($w - $w2) * 0.5;	345	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	346	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	347	}
291		348
292	if ($self->{x} != $x || $self->{y} != $y) {	349	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	350	$self->{x} = $x;
294	$self->{y} = $y;	351	$self->{y} = $y;
295	$self->update;	352	$self->update;
296	}	353	}
297		354
298	if ($self->{w} != $w || $self->{h} != $h) {	355	if ($self->{w} != $w || $self->{h} != $h) {
		356	return unless $self->{visible};
		357
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	358	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300	}	359	}
301	}	360	}
302		361
303	sub size_allocate {	362	sub size_allocate {
304	# nothing to be done	363	# nothing to be done
305	}	364	}
306		365
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	366	sub children {
315	}	367	}
316		368
317	sub set_max_size {	369	sub set_max_size {
318	my ($self, $w, $h) = @_;	370	my ($self, $w, $h) = @_;
…		…
321	delete $self->{max_h}; $self->{max_h} = $h if $h;	373	delete $self->{max_h}; $self->{max_h} = $h if $h;
322	}	374	}
323		375
324	sub set_tooltip {	376	sub set_tooltip {
325	my ($self, $tooltip) = @_;	377	my ($self, $tooltip) = @_;
		378
		379	$tooltip =~ s/^\s+//;
		380	$tooltip =~ s/\s+$//;
		381
		382	return if $self->{tooltip} eq $tooltip;
326		383
327	$self->{tooltip} = $tooltip;	384	$self->{tooltip} = $tooltip;
328		385
329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	386	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330	delete $CFClient::UI::TOOLTIP->{owner};	387	delete $CFClient::UI::TOOLTIP->{owner};
…		…
389	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
390	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
391	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
392	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
393	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	450	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		451
		452	sub find_widget {
		453	my ($self, $x, $y) = @_;
		454
		455	return () unless $self->{can_events};
		456
		457	return $self
		458	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		459	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		460
		461	()
		462	}
		463
		464	sub set_parent {
		465	my ($self, $parent) = @_;
		466
		467	Scalar::Util::weaken ($self->{parent} = $parent);
		468
		469	$self->set_visible if $parent->{visible};
		470	}
		471
		472	sub connect {
		473	my ($self, $signal, $cb) = @_;
		474
		475	push @{ $self->{signal_cb}{$signal} }, $cb;
		476	}
		477
		478	sub _emit {
		479	my ($self, $signal, @args) = @_;
		480
		481	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		482	}
		483
		484	sub emit {
		485	my ($self, $signal, @args) = @_;
		486
		487	$self->_emit ($signal, @args)
		488	|| $self->$signal (@args);
		489	}
		490
		491	sub visibility_change {
		492	#my ($self, $visible) = @_;
		493	}
		494
		495	sub realloc {
		496	my ($self) = @_;
		497
		498	if ($self->{visible}) {
		499	return if $self->{root}{realloc}{$self};
		500
		501	$self->{root}{realloc}{$self} = $self;
		502	$self->{root}->update;
		503	} else {
		504	delete $self->{req_w};
		505	}
		506	}
		507
		508	sub update {
		509	my ($self) = @_;
		510
		511	$self->{parent}->update
		512	if $self->{parent};
		513	}
		514
		515	sub reconfigure {
		516	my ($self) = @_;
		517
		518	$self->realloc;
		519	$self->update;
		520	}
394		521
395	sub draw {	522	sub draw {
396	my ($self) = @_;	523	my ($self) = @_;
397		524
398	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
415	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
416	glEnd;	543	glEnd;
417	glDisable GL_BLEND;	544	glDisable GL_BLEND;
418	}	545	}
419		546
420	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
421	glPushMatrix;	548	glPushMatrix;
422	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
423	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
425	glVertex 0 , 0;	552	glVertex 0 , 0;
426	glVertex $self->{w}, 0;	553	glVertex $self->{w} - 1, 0;
427	glVertex $self->{w}, $self->{h};	554	glVertex $self->{w} - 1, $self->{h} - 1;
428	glVertex 0 , $self->{h};	555	glVertex 0 , $self->{h} - 1;
429	glEnd;	556	glEnd;
430	glPopMatrix;	557	glPopMatrix;
431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	558	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432	}	559	}
433	}	560	}
434		561
435	sub _draw {	562	sub _draw {
436	my ($self) = @_;	563	my ($self) = @_;
437		564
438	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
439	}
440
441	sub find_widget {
442	my ($self, $x, $y) = @_;
443
444	return () unless $self->{can_events};
445
446	return $self
447	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450	()
451	}
452
453	sub set_parent {
454	my ($self, $parent) = @_;
455
456	Scalar::Util::weaken ($self->{parent} = $parent);
457
458	# TODO: req_w _does_change after ->reconfigure
459	$self->check_size
460	unless exists $self->{req_w};
461
462	$self->show;
463	}
464
465	sub check_size {
466	my ($self, $forced) = @_;
467
468	$self->{force_alloc} = 1 if $forced;
469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
470	}
471
472	sub update {
473	my ($self) = @_;
474
475	$self->{parent}->update
476	if $self->{parent};
477	}
478
479	sub connect {
480	my ($self, $signal, $cb) = @_;
481
482	push @{ $self->{signal_cb}{$signal} }, $cb;
483	}
484
485	sub _emit {
486	my ($self, $signal, @args) = @_;
487
488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489	}
490
491	sub emit {
492	my ($self, $signal, @args) = @_;
493
494	$self->_emit ($signal, @args)
495	|| $self->$signal (@args);
496	}	566	}
497		567
498	sub DESTROY {	568	sub DESTROY {
499	my ($self) = @_;	569	my ($self) = @_;
500		570
…		…
558	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
559	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
560	}	630	}
561		631
562	sub size_request {	632	sub size_request {
563	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
564	}	636	}
565		637
566	sub draw { }	638	sub draw { }
567		639
568	#############################################################################	640	#############################################################################
…		…
597	$self->{children} = [	669	$self->{children} = [
598	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
599	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
600	];	672	];
601		673
602	$self->check_size (1);	674	$self->realloc;
603	$self->update;
604	}	675	}
605		676
606	sub children {	677	sub children {
607	@{ $_[0]{children} }	678	@{ $_[0]{children} }
608	}	679	}
…		…
613	delete $child->{parent};	684	delete $child->{parent};
614	$child->hide;	685	$child->hide;
615		686
616	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617		688
618	$self->check_size;	689	$self->realloc;
619	$self->update;
620	}	690	}
621		691
622	sub clear {	692	sub clear {
623	my ($self) = @_;	693	my ($self) = @_;
624		694
…		…
628	for (@$children) {	698	for (@$children) {
629	delete $_->{parent};	699	delete $_->{parent};
630	$_->hide;	700	$_->hide;
631	}	701	}
632		702
633	$self->check_size;	703	$self->realloc;
634	$self->update;
635	}	704	}
636		705
637	sub find_widget {	706	sub find_widget {
638	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
639		708
…		…
692	sub size_request {	761	sub size_request {
693	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
694	}	763	}
695		764
696	sub size_allocate {	765	sub size_allocate {
697	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
698		767
699	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
700	}	769	}
701		770
702	#############################################################################	771	#############################################################################
…		…
719	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
720	$self->SUPER::update;	789	$self->SUPER::update;
721	}	790	}
722		791
723	sub size_allocate {	792	sub size_allocate {
724	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
725		794
726	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
727	$self->update;	796	$self->update
		797	if $changed;
728	}	798	}
729		799
730	sub _render {	800	sub _render {
731	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
732	}	802	}
…		…
763		833
764	package CFClient::UI::ViewPort;	834	package CFClient::UI::ViewPort;
765		835
766	our @ISA = CFClient::UI::Window::;	836	our @ISA = CFClient::UI::Window::;
767		837
		838	sub new {
		839	my $class = shift;
		840
		841	$class->SUPER::new (
		842	scroll_x => 0,
		843	scroll_y => 1,
		844	@_,
		845	)
		846	}
		847
768	sub size_request {	848	sub size_request {
769	my ($self) = @_;	849	my ($self) = @_;
770		850
771	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	851	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
772		852
773	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
774	}	857	}
775		858
776	sub size_allocate {	859	sub size_allocate {
777	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
778		861
779	my ($cw, $ch) = @$self{qw(child_w child_h)};	862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
780	# $w = $self->{w};	863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		864
781	$self->child->configure (0, 0, $cw, $ch);	865	$self->child->configure (0, 0, $w, $h);
782	$self->update;	866	$self->update;
783	}	867	}
784		868
785	sub set_offset {	869	sub set_offset {
786	my ($self, $x, $y) = @_;	870	my ($self, $x, $y) = @_;
…		…
837	my $class = shift;	921	my $class = shift;
838		922
839	my $self;	923	my $self;
840		924
841	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
842	vertical => 1,	926	vertical => 1,
843	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
844	connect_changed => sub {	928	on_changed => sub {
845	$self->{vp}->set_offset (0, $_[1]);	929	$self->{vp}->set_offset (0, $_[1]);
846	},	930	},
847	;	931	;
848		932
849	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
…		…
857	$self->add ($self->{slider});	941	$self->add ($self->{slider});
858		942
859	$self	943	$self
860	}	944	}
861		945
		946	sub update {
		947	my ($self) = @_;
		948
		949	$self->SUPER::update;
		950
		951	# todo: overwrite size_allocate of child
		952	my $child = $self->{vp}->child;
		953	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		954	}
		955
862	sub size_allocate {	956	sub size_allocate {
863	my ($self, $w, $h) = @_;	957	my ($self, $w, $h, $changed) = @_;
864		958
865	$self->SUPER::size_allocate ($w, $h);	959	$self->SUPER::size_allocate ($w, $h, $changed);
866		960
867	my $child = $self->{vp}->child;	961	my $child = $self->{vp}->child;
868	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	962	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869	}	963	}
870		964
…		…
917		1011
918	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
919		1013
920	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
921		1015
922	my @tex =	1016	my $bg =
		1017	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1018	mipmap => 1, wrap => 1;
		1019
		1020	my @border =
923	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925		1023
926	sub new {	1024	sub new {
927	my $class = shift;	1025	my $class = shift;
928
929	# TODO: user_x, user_y, overwrite moveto?
930		1026
931	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
932	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
933	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
934	border => 0.6,	1030	border => 0.6,
…		…
960	$h + $self->border * 2,	1056	$h + $self->border * 2,
961	)	1057	)
962	}	1058	}
963		1059
964	sub size_allocate {	1060	sub size_allocate {
965	my ($self, $w, $h) = @_;	1061	my ($self, $w, $h, $changed) = @_;
		1062
		1063	return unless $changed;
966		1064
967	$h -= List::Util::max 0, $self->border * 2;	1065	$h -= List::Util::max 0, $self->border * 2;
968	$w -= List::Util::max 0, $self->border * 2;	1066	$w -= List::Util::max 0, $self->border * 2;
969		1067
970	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1068	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
994	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
995		1093
996	my $dx = $ev->{x} - $ox;	1094	my $dx = $ev->{x} - $ox;
997	my $dy = $ev->{y} - $oy;	1095	my $dy = $ev->{y} - $oy;
998		1096
999	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1097	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1098	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1099
		1100	$self->realloc;
1001	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1101	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002	$self->check_size;
1003	};	1102	};
1004		1103
1005	} elsif ($lr ^ $td) {	1104	} elsif ($lr ^ $td) {
1006	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1105	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007	my ($bx, $by) = ($self->{x}, $self->{y});	1106	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1009	$self->{motion} = sub {	1108	$self->{motion} = sub {
1010	my ($ev, $x, $y) = @_;	1109	my ($ev, $x, $y) = @_;
1011		1110
1012	($x, $y) = ($ev->{x}, $ev->{y});	1111	($x, $y) = ($ev->{x}, $ev->{y});
1013		1112
1014	$self->move ($bx + $x - $ox, $by + $y - $oy);	1113	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015	$self->update;
1016	};	1114	};
1017	}	1115	}
1018	}	1116	}
1019		1117
1020	sub button_up {	1118	sub button_up {
…		…
1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040		1138
1041	my $border = $self->border;	1139	my $border = $self->border;
1042		1140
1043	glColor @{ $self->{border_bg} };	1141	glColor @{ $self->{border_bg} };
1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1142	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1143	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1144	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1145	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048		1146
1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1147	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050	my $bg = $tex[0];	1148	glColor @{ $self->{bg} };
1051		1149
1052	# TODO: repeat texture not scale	1150	# TODO: repeat texture not scale
		1151	# solve this better(?)
1053	my $rep_x = $cw / $bg->{w};	1152	$bg->{s} = $cw / $bg->{w};
1054	my $rep_y = $ch / $bg->{h};	1153	$bg->{t} = $ch / $bg->{h};
1055
1056	glColor @{ $self->{bg} };
1057
1058	$bg->{s} = $rep_x;
1059	$bg->{t} = $rep_y;
1060	$bg->{wrap_mode} = 1;
1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1154	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062	}	1155	}
1063		1156
1064	glDisable GL_TEXTURE_2D;	1157	glDisable GL_TEXTURE_2D;
1065		1158
…		…
1081	sub new {	1174	sub new {
1082	my $class = shift;	1175	my $class = shift;
1083		1176
1084	$class->SUPER::new (	1177	$class->SUPER::new (
1085	col_expand => [],	1178	col_expand => [],
1086	@_	1179	@_,
1087	)	1180	)
		1181	}
		1182
		1183	sub children {
		1184	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088	}	1185	}
1089		1186
1090	sub add {	1187	sub add {
1091	my ($self, $x, $y, $child) = @_;	1188	my ($self, $x, $y, $child) = @_;
1092		1189
1093	$child->set_parent ($self);	1190	$child->set_parent ($self);
1094	$self->{children}[$y][$x] = $child;	1191	$self->{children}[$y][$x] = $child;
1095		1192
1096	$child->check_size;	1193	$self->realloc;
1097	}	1194	}
1098		1195
1099	sub children {
1100	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101	}
1102
1103	# TODO: move to container class maybe? send childs a signal on removal?	1196	# TODO: move to container class maybe? send children a signal on removal?
1104	sub clear {	1197	sub clear {
1105	my ($self) = @_;	1198	my ($self) = @_;
1106		1199
1107	my @children = $self->children;	1200	my @children = $self->children;
1108	delete $self->{children};	1201	delete $self->{children};
…		…
1110	for (@children) {	1203	for (@children) {
1111	delete $_->{parent};	1204	delete $_->{parent};
1112	$_->hide;	1205	$_->hide;
1113	}	1206	}
1114		1207
1115	$self->update;	1208	$self->realloc;
1116	}	1209	}
1117		1210
1118	sub get_wh {	1211	sub get_wh {
1119	my ($self) = @_;	1212	my ($self) = @_;
1120		1213
…		…
1147	(sum @$hs),	1240	(sum @$hs),
1148	)	1241	)
1149	}	1242	}
1150		1243
1151	sub size_allocate {	1244	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h, $changed) = @_;
1153		1246
1154	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1155		1248
1156	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1157	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1158		1251
1159	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1160	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1161	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1162	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1309	}
1217	}	1310	}
1218		1311
1219	#############################################################################	1312	#############################################################################
1220		1313
		1314	package CFClient::UI::Box;
		1315
		1316	our @ISA = CFClient::UI::Container::;
		1317
		1318	sub size_request {
		1319	my ($self) = @_;
		1320
		1321	$self->{vertical}
		1322	? (
		1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1325	)
		1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
		1330	}
		1331
		1332	sub size_allocate {
		1333	my ($self, $w, $h, $changed) = @_;
		1334
		1335	my $space = $self->{vertical} ? $h : $w;
		1336	my $children = $self->{children};
		1337
		1338	my @req;
		1339
		1340	if ($self->{homogeneous}) {
		1341	@req = ($space / (@$children || 1)) x @$children;
		1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
		1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
		1355	for 0 .. $#$children;
		1356	}
		1357	}
		1358
		1359	CFClient::UI::harmonize \@req;
		1360
		1361	my $pos = 0;
		1362	for (0 .. $#$children) {
		1363	my $alloc = $req[$_];
		1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1365
		1366	$pos += $alloc;
		1367	}
		1368
		1369	1
		1370	}
		1371
		1372	#############################################################################
		1373
1221	package CFClient::UI::HBox;	1374	package CFClient::UI::HBox;
1222		1375
1223	# TODO: wrap into common Box base class
1224
1225	our @ISA = CFClient::UI::Container::;	1376	our @ISA = CFClient::UI::Box::;
1226		1377
1227	sub size_request {	1378	sub new {
1228	my ($self) = @_;	1379	my $class = shift;
1229		1380
1230	my @alloc = map [$_->size_request], @{$self->{children}};	1381	$class->SUPER::new (
1231		1382	vertical => 0,
1232	(	1383	@_,
1233	(List::Util::sum map $_->[0], @alloc),
1234	(List::Util::max map $_->[1], @alloc),
1235	)	1384	)
1236	}	1385	}
1237		1386
1238	sub size_allocate {
1239	my ($self, $w, $h) = @_;
1240
1241	($h, $w) = ($w, $h);
1242
1243	my $children = $self->{children};
1244
1245	my @h = map $_->{req_w}, @$children;
1246
1247	my $req_h = List::Util::sum @h;
1248
1249	if ($req_h > $h) {
1250	# ah well, not enough space
1251	$_ *= $h / $req_h for @h;
1252	} else {
1253	my $exp = List::Util::sum map $_->{expand}, @$children;
1254	$exp ||= 1;
1255
1256	for (0 .. $#$children) {
1257	my $child = $children->[$_];
1258
1259	my $alloc_h = $h[$_];
1260	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261	$h[$_] = $alloc_h;
1262	}
1263	}
1264
1265	CFClient::UI::harmonize \@h;
1266
1267	my $y = 0;
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270	my $h = $h[$_];
1271	$child->configure ($y, 0, $h, $w);
1272
1273	$y += $h;
1274	}
1275
1276	1
1277	}
1278
1279	#############################################################################	1387	#############################################################################
1280		1388
1281	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1282		1390
1283	# TODO: wrap into common Box base class
1284
1285	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1286		1392
1287	sub size_request {	1393	sub new {
1288	my ($self) = @_;	1394	my $class = shift;
1289		1395
1290	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1291		1397	vertical => 1,
1292	(	1398	@_,
1293	(List::Util::max map $_->[0], @alloc),
1294	(List::Util::sum map $_->[1], @alloc),
1295	)	1399	)
1296	}
1297
1298	sub size_allocate {
1299	my ($self, $w, $h) = @_;
1300
1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303	my $children = $self->{children};
1304
1305	my @h = map $_->{req_h}, @$children;
1306
1307	my $req_h = List::Util::sum @h;
1308
1309	if ($req_h > $h) {
1310	# ah well, not enough space
1311	$_ *= $h / $req_h for @h;
1312	} else {
1313	my $exp = List::Util::sum map $_->{expand}, @$children;
1314	$exp ||= 1;
1315
1316	for (0 .. $#$children) {
1317	my $child = $children->[$_];
1318
1319	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320	}
1321	}
1322
1323	CFClient::UI::harmonize \@h;
1324
1325	my $y = 0;
1326	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];
1329	$child->configure (0, $y, $w, $h);
1330
1331	$y += $h;
1332	}
1333
1334	1
1335	}	1400	}
1336		1401
1337	#############################################################################	1402	#############################################################################
1338		1403
1339	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
…		…
1402	$self->{text} = "T$text";	1467	$self->{text} = "T$text";
1403		1468
1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1469	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405	$self->{layout}->set_text ($text);	1470	$self->{layout}->set_text ($text);
1406		1471
		1472	$self->realloc;
1407	$self->update;	1473	$self->update;
1408	$self->check_size;
1409	}	1474	}
1410		1475
1411	sub set_markup {	1476	sub set_markup {
1412	my ($self, $markup) = @_;	1477	my ($self, $markup) = @_;
1413		1478
…		…
1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1482	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418		1483
1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1484	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420	$self->{layout}->set_markup ($markup);	1485	$self->{layout}->set_markup ($markup);
1421		1486
		1487	$self->realloc;
1422	$self->update;	1488	$self->update;
1423	$self->check_size;
1424	}	1489	}
1425		1490
1426	sub size_request {	1491	sub size_request {
1427	my ($self) = @_;	1492	my ($self) = @_;
1428		1493
…		…
1449	$h + $self->{padding} * 2,	1514	$h + $self->{padding} * 2,
1450	)	1515	)
1451	}	1516	}
1452		1517
1453	sub size_allocate {	1518	sub size_allocate {
1454	my ($self, $w, $h) = @_;	1519	my ($self, $w, $h, $changed) = @_;
1455		1520
1456	delete $self->{texture};	1521	delete $self->{texture}
		1522	if $changed;
1457	}	1523	}
1458		1524
1459	sub set_fontsize {	1525	sub set_fontsize {
1460	my ($self, $fontsize) = @_;	1526	my ($self, $fontsize) = @_;
1461		1527
1462	$self->{fontsize} = $fontsize;	1528	$self->{fontsize} = $fontsize;
1463	delete $self->{texture};	1529	delete $self->{texture};
1464		1530
1465	$self->update;	1531	$self->realloc;
1466	$self->check_size;
1467	}	1532	}
1468		1533
1469	sub _draw {	1534	sub _draw {
1470	my ($self) = @_;	1535	my ($self) = @_;
1471		1536
…		…
1551	sub set_text {	1616	sub set_text {
1552	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1553		1618
1554	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1555	$self->_set_text ($text);	1620	$self->_set_text ($text);
1556	$self->update;	1621
1557	$self->check_size;	1622	$self->realloc;
1558	}	1623	}
1559		1624
1560	sub get_text {	1625	sub get_text {
1561	$_[0]{text}	1626	$_[0]{text}
1562	}	1627	}
…		…
1595	} elsif ($uni) {	1660	} elsif ($uni) {
1596	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1597	}	1662	}
1598		1663
1599	$self->_set_text ($text);	1664	$self->_set_text ($text);
1600	$self->update;	1665
1601	$self->check_size;	1666	$self->realloc;
1602	}	1667	}
1603		1668
1604	sub focus_in {	1669	sub focus_in {
1605	my ($self) = @_;	1670	my ($self) = @_;
1606		1671
…		…
2113	$self->update;	2178	$self->update;
2114		2179
2115	$self	2180	$self
2116	}	2181	}
2117		2182
		2183	sub changed { }
		2184
2118	sub set_range {	2185	sub set_range {
2119	my ($self, $range) = @_;	2186	my ($self, $range) = @_;
2120		2187
2121	$self->{range} = $range;	2188	($range, $self->{range}) = ($self->{range}, $range);
2122		2189
2123	$self->update;	2190	$self->update
		2191	if "@$range" ne "@{$self->{range}}";
2124	}	2192	}
2125		2193
2126	sub set_value {	2194	sub set_value {
2127	my ($self, $value) = @_;	2195	my ($self, $value) = @_;
2128		2196
…		…
2310	$self->{fontsize} = $fontsize;	2378	$self->{fontsize} = $fontsize;
2311	$self->reflow;	2379	$self->reflow;
2312	}	2380	}
2313		2381
2314	sub size_allocate {	2382	sub size_allocate {
2315	my ($self, $w, $h) = @_;	2383	my ($self, $w, $h, $changed) = @_;
2316		2384
2317	$self->SUPER::size_allocate ($w, $h);	2385	$self->SUPER::size_allocate ($w, $h, $changed);
		2386
		2387	return unless $changed;
2318		2388
2319	$self->{layout}->set_font ($self->{font}) if $self->{font};	2389	$self->{layout}->set_font ($self->{font}) if $self->{font};
2320	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2390	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321	$self->{layout}->set_width ($self->{children}[0]{w});	2391	$self->{layout}->set_width ($self->{children}[0]{w});
2322		2392
…		…
2511		2581
2512	sub new {	2582	sub new {
2513	my $class = shift;	2583	my $class = shift;
2514		2584
2515	my $self = $class->SUPER::new (	2585	my $self = $class->SUPER::new (
2516	state => 0,	2586	state => 0,
2517	connect_activate => \&toggle_flopper,	2587	on_activate => \&toggle_flopper,
2518	@_	2588	@_
2519	);	2589	);
2520		2590
2521	if ($self->{state}) {
2522	$self->{state} = 0;
2523	$self->toggle_flopper;
2524	}
2525
2526	$self	2591	$self
2527	}	2592	}
2528		2593
2529	sub toggle_flopper {	2594	sub toggle_flopper {
2530	my ($self) = @_;	2595	my ($self) = @_;
2531		2596
2532	# TODO: use animation	2597	$self->{other}->toggle_visibility;
2533	if ($self->{state} = !$self->{state}) {
2534	$CFClient::UI::ROOT->add ($self->{other});
2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2536	$self->_emit ("open");
2537	} else {
2538	$CFClient::UI::ROOT->remove ($self->{other});
2539	$self->_emit ("close");
2540	}
2541
2542	$self->_emit (changed => $self->{state});
2543	}	2598	}
2544		2599
2545	#############################################################################	2600	#############################################################################
2546		2601
2547	package CFClient::UI::Tooltip;	2602	package CFClient::UI::Tooltip;
…		…
2579		2634
2580	($w + 4, $h + 4)	2635	($w + 4, $h + 4)
2581	}	2636	}
2582		2637
2583	sub size_allocate {	2638	sub size_allocate {
2584	my ($self, $w, $h) = @_;	2639	my ($self, $w, $h, $changed) = @_;
2585		2640
		2641	return unless $changed;
		2642
2586	$self->SUPER::size_allocate ($w - 4, $h - 4);	2643	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2644	}
		2645
		2646	sub visibility_change {
		2647	my ($self, $visible) = @_;
		2648
		2649	return unless $visible;
		2650
		2651	$self->{root}->on_post_alloc ("move_$self" => sub {
		2652	my $widget = $self->{owner}
		2653	or return;
		2654
		2655	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2656
		2657	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2658	if $x + $self->{w} > $::WIDTH;
		2659
		2660	$self->move_abs ($x, $y);
		2661	});
2587	}	2662	}
2588		2663
2589	sub _draw {	2664	sub _draw {
2590	my ($self) = @_;	2665	my ($self) = @_;
2591		2666
…		…
2608	glVertex $w, $h;	2683	glVertex $w, $h;
2609	glVertex $w, 0;	2684	glVertex $w, 0;
2610	glEnd;	2685	glEnd;
2611		2686
2612	glTranslate 2 - 0.375, 2 - 0.375;	2687	glTranslate 2 - 0.375, 2 - 0.375;
		2688
2613	$self->SUPER::_draw;	2689	$self->SUPER::_draw;
2614	}	2690	}
2615		2691
2616	#############################################################################	2692	#############################################################################
2617		2693
…		…
2623		2699
2624	sub new {	2700	sub new {
2625	my $class = shift;	2701	my $class = shift;
2626		2702
2627	my $self = $class->SUPER::new (	2703	my $self = $class->SUPER::new (
2628	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2629	@_,	2706	@_,
2630	);	2707	);
2631		2708
2632	if ($self->{anim} && $self->{animspeed}) {	2709	if ($self->{anim} && $self->{animspeed}) {
2633	Scalar::Util::weaken (my $widget = $self);	2710	Scalar::Util::weaken (my $widget = $self);
…		…
2692	$self->SUPER::DESTROY;	2769	$self->SUPER::DESTROY;
2693	}	2770	}
2694		2771
2695	#############################################################################	2772	#############################################################################
2696		2773
2697	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2698		2775
2699	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2700
2701	sub _item_to_desc {
2702	my ($item) = @_;
2703
2704	my $desc =
2705	$item->{nrof} < 2
2706	? $item->{name}
2707	: "$item->{nrof} × $item->{name_pl}";
2708
2709	$item->{flags} & Crossfire::Protocol::F_OPEN
2710	and $desc .= " (open)";
2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
2712	and $desc .= " (applied)";
2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
2714	and $desc .= " (unpaid)";
2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
2716	and $desc .= " (magic)";
2717	$item->{flags} & Crossfire::Protocol::F_CURSED
2718	and $desc .= " (cursed)";
2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
2720	and $desc .= " (damned)";
2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
2722	and $desc .= " *";
2723
2724	$desc
2725	}
2726		2777
2727	sub new {	2778	sub new {
2728	my $class = shift;	2779	my $class = shift;
2729		2780
2730	my %args = @_;
2731
2732	my $item = delete $args{item};
2733
2734	my $desc = _item_to_desc ($item);
2735
2736	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2737	can_hover => 1,
2738	can_events => 1,
2739	tooltip => ((CFClient::UI::Label::escape $desc)
2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741	connect_button_down => sub {
2742	my ($self, $ev, $x, $y) = @_;
2743
2744	# todo: maybe put examine on 1? but should just be a tooltip :(
2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746	my $targ = $::CONN->{player}{tag};
2747
2748	if ($item->{container} == $::CONN->{player}{tag}) {
2749	$targ = $main::OPENCONT;
2750	}
2751
2752	$::CONN->send ("move $targ $item->{tag} 0");
2753	} elsif ($ev->{button} == 1) {
2754	$::CONN->send ("examine $item->{tag}");
2755	} elsif ($ev->{button} == 2) {
2756	$::CONN->send ("apply $item->{tag}");
2757	} elsif ($ev->{button} == 3) {
2758	my @menu_items = (
2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762	(
2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
2764	? (
2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766	)
2767	: (
2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770	)
2771	),
2772	);
2773
2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775	}
2776
2777	1
2778	},
2779	%args
2780	);
2781
2782
2783	$self->add (new CFClient::UI::Face
2784	can_events => 0,
2785	face => $item->{face},
2786	anim => $item->{anim},
2787	animspeed => $item->{animspeed},
2788	);
2789
2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792	$self->{item} = $item;
2793
2794	$self->update_item;
2795
2796	$self
2797	}
2798
2799	sub update_item {
2800	my ($self) = @_;
2801
2802	my $desc = _item_to_desc ($self->{item});
2803
2804	$self->{name_lbl}->set_text ($desc);
2805	}
2806
2807	#############################################################################
2808
2809	package CFClient::UI::Inventory;
2810
2811	our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813	sub new {
2814	my $class = shift;
2815
2816	my $self = $class->SUPER::new (
2817	scrolled => (new CFClient::UI::Table),	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2818	@_,	2783	@_,
2819	);	2784	);
2820		2785
2821	$self	2786	$self
2822	}	2787	}
…		…
2832	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2833	} @$items;	2798	} @$items;
2834		2799
2835	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2836		2801
		2802	my $row = 0;
2837	for my $item (@items) {	2803	for my $item (@items) {
2838	$item->{item} = $item;	2804	CFClient::Item::update_widgets $item;
2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840	$item->update_item ();
2841	}
2842		2805
2843	my $i = 0;	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2844	for (@items) {	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2845	$self->{scrolled}->add (0, $i, $_);	2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2846	my $nrof = $_->{item}->{nrof} || 1;
2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848	}
2849		2809
2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2810	$row++;
2851	}	2811	}
2852
2853	sub size_request {
2854	my ($self) = @_;
2855	($self->{req_w}, $self->{req_h});
2856	}	2812	}
2857		2813
2858	#############################################################################	2814	#############################################################################
2859		2815
2860	package CFClient::UI::Menu;	2816	package CFClient::UI::Menu;
…		…
3046	use CFClient::OpenGL;	3002	use CFClient::OpenGL;
3047		3003
3048	sub new {	3004	sub new {
3049	my $class = shift;	3005	my $class = shift;
3050		3006
3051	$class->SUPER::new (	3007	my $self = $class->SUPER::new (
		3008	visible => 1,
3052	@_,	3009	@_,
3053	)	3010	);
		3011
		3012	Scalar::Util::weaken ($self->{root} = $self);
		3013
		3014	$self
3054	}	3015	}
3055		3016
3056	sub configure {	3017	sub configure {
3057	my ($self, $x, $y, $w, $h) = @_;	3018	my ($self, $x, $y, $w, $h) = @_;
3058		3019
3059	$self->{w} = $w;	3020	$self->{w} = $w;
3060	$self->{h} = $h;	3021	$self->{h} = $h;
3061	}	3022	}
3062		3023
3063	sub check_size {	3024	sub reconfigure {
3064	my ($self) = @_;	3025	my ($self) = @_;
3065		3026
		3027	$self->SUPER::reconfigure;
		3028
3066	$self->size_allocate ($self->{w}, $self->{h})	3029	$self->size_allocate ($self->{w}, $self->{h}, 1)
3067	if $self->{w};	3030	if $self->{w};
3068	}	3031	}
3069		3032
3070	sub size_request {	3033	sub size_request {
3071	my ($self) = @_;	3034	my ($self) = @_;
3072		3035
3073	($self->{w}, $self->{h})	3036	($self->{w}, $self->{h})
3074	}	3037	}
3075		3038
		3039	sub _to_pixel {
		3040	my ($coord, $size, $max) = @_;
		3041
		3042	$coord =
		3043	$coord eq "center" ? ($max - $size) * 0.5
		3044	: $coord eq "max" ? $max
		3045	: $coord;
		3046
		3047	$coord = 0 if $coord < 0;
		3048	$coord = $max - $size if $coord > $max - $size;
		3049
		3050	int $coord + 0.5
		3051	}
		3052
3076	sub size_allocate {	3053	sub size_allocate {
3077	my ($self, $w, $h) = @_;	3054	my ($self, $w, $h, $changed) = @_;
3078		3055
3079	for my $child ($self->children) {	3056	for my $child ($self->children) {
3080	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3057	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3081		3058
3082	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3059	$X = $child->{force_x} if exists $child->{force_x};
3083	if exists $child->{req_x};	3060	$Y = $child->{force_y} if exists $child->{force_y};
3084		3061
3085	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3062	$X = _to_pixel $X, $W, $self->{w};
3086	if exists $child->{req_y};	3063	$Y = _to_pixel $Y, $H, $self->{h};
3087
3088	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3089	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3090		3064
3091	$child->configure ($X, $Y, $W, $H);	3065	$child->configure ($X, $Y, $W, $H);
3092	}	3066	}
3093	}	3067	}
3094		3068
…		…
3105	}	3079	}
3106		3080
3107	sub update {	3081	sub update {
3108	my ($self) = @_;	3082	my ($self) = @_;
3109		3083
3110	$self->check_size;
3111	$::WANT_REFRESH++;	3084	$::WANT_REFRESH++;
3112	}	3085	}
3113		3086
3114	sub add {	3087	sub add {
3115	my ($self, @children) = @_;	3088	my ($self, @children) = @_;
3116		3089
3117	for (my @widgets = @children; my $w = pop @widgets; ) {
3118	push @widgets, $w->children;
3119	$w->{root} = $self;
3120	$w->{visible} = 1;
3121	}
3122
3123	for my $child (@children) {
3124	$child->{is_toplevel} = 1;	3090	$_->{is_toplevel} = 1
3125		3091	for @children;
3126	# integerise window positions
3127	$child->{x} = int $child->{x};
3128	$child->{y} = int $child->{y};
3129	}
3130		3092
3131	$self->SUPER::add (@children);	3093	$self->SUPER::add (@children);
3132	}	3094	}
3133		3095
3134	sub remove {	3096	sub remove {
3135	my ($self, @children) = @_;	3097	my ($self, @children) = @_;
3136		3098
3137	$self->SUPER::remove (@children);	3099	$self->SUPER::remove (@children);
		3100
		3101	delete $self->{is_toplevel}
		3102	for @children;
3138		3103
3139	while (@children) {	3104	while (@children) {
3140	my $w = pop @children;	3105	my $w = pop @children;
3141	push @children, $w->children;	3106	push @children, $w->children;
3142	$w->set_invisible;	3107	$w->set_invisible;
…		…
3161	while ($self->{refresh_hook}) {	3126	while ($self->{refresh_hook}) {
3162	$_->()	3127	$_->()
3163	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
3164	}	3129	}
3165		3130
3166	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
3167	my @queue = ([], []);	3132	my @queue;
3168		3133
3169	for (;;) {	3134	while () {
3170	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3171	# heuristic: check containers last	3136	#TODO use array-of-depth approach
3172	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
3173	for values %{delete $self->{check_size}}	3138	@queue = sort { $a->{visible} <=> $b->{visible} }
		3139	@queue, values %{delete $self->{realloc}};
3174	}	3140	}
3175		3141
3176	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
3177		3143
		3144	$widget->{visible} or last; # do not resize invisible widgets
		3145
3178	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3179	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(force_w force_h)}
3180	: $widget->size_request;	3148	: $widget->size_request;
3181		3149
3182	if (delete $widget->{force_alloc}	3150	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3183	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3151
3184	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3152	$w = $min_size if $w < $min_size;
3185		3153	$h = $min_size if $h < $min_size;
		3154
3186	$widget->{req_w} = $w;	3155	$widget->{req_w} = $w;
3187	$widget->{req_h} = $h;	3156	$widget->{req_h} = $h;
3188		3157
3189	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3158	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3190		3159
3191	$widget->{parent}->check_size	3160	push @queue, $widget->{parent}
3192	if $widget->{parent};	3161	if $widget->{parent};
3193	}
3194	}	3162	}
3195	}	3163	}
3196		3164
3197	while ($self->{size_alloc}) {	3165	while (my $size_alloc = delete $self->{size_alloc}) {
3198	for (values %{delete $self->{size_alloc}}) {	3166	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3199	my ($widget, $w, $h) = @$_;	3167	values %$size_alloc;
		3168
		3169	while () {
		3170	my ($widget, $w, $h) = @{ pop @queue or last };
		3171
		3172	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3173	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3200		3174
3201	$w = 0 if $w < 0;	3175	$w = 0 if $w < 0;
3202	$h = 0 if $h < 0;	3176	$h = 0 if $h < 0;
3203		3177
		3178	$w = int $w + 0.5;
		3179	$h = int $h + 0.5;
		3180
		3181	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3182
3204	$widget->{w} = $w;	3183	$widget->{w} = $w;
3205	$widget->{h} = $h;	3184	$widget->{h} = $h;
		3185
3206	$widget->emit (size_allocate => $w, $h);	3186	$widget->emit (size_allocate => $w, $h, $changed);
3207	}	3187	}
3208	}	3188	}
3209		3189
3210	while ($self->{post_alloc_hook}) {	3190	while ($self->{post_alloc_hook}) {
3211	$_->()	3191	$_->()

Diff Legend

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