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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 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	}
306
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}	364	}
313		365
314	sub children {	366	sub children {
315	}	367	}
316		368
…		…
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	446	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	447	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	448	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	449	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398	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	}
399		521
400	sub draw {	522	sub draw {
401	my ($self) = @_;	523	my ($self) = @_;
402		524
403	return unless $self->{h} && $self->{w};	525	return unless $self->{h} && $self->{w};
…		…
420	glVertex $x , $y + $self->{h};	542	glVertex $x , $y + $self->{h};
421	glEnd;	543	glEnd;
422	glDisable GL_BLEND;	544	glDisable GL_BLEND;
423	}	545	}
424		546
425	if ($ENV{PCLIENT_DEBUG}) {	547	if ($ENV{CFPLUS_DEBUG}) {
426	glPushMatrix;	548	glPushMatrix;
427	glColor 1, 1, 0, 1;	549	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	550	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	551	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	552	glVertex 0 , 0;
…		…
441	my ($self) = @_;	563	my ($self) = @_;
442		564
443	warn "no draw defined for $self\n";	565	warn "no draw defined for $self\n";
444	}	566	}
445		567
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 {	568	sub DESTROY {
504	my ($self) = @_;	569	my ($self) = @_;
505		570
506	delete $WIDGET{$self+0};	571	delete $WIDGET{$self+0};
507	#$self->deactivate;	572	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	628	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	629	$class->SUPER::new (can_events => 0, %arg);
565	}	630	}
566		631
567	sub size_request {	632	sub size_request {
568	(0, 0)	633	my ($self) = @_;
		634
		635	($self->{w} + 0, $self->{h} + 0)
569	}	636	}
570		637
571	sub draw { }	638	sub draw { }
572		639
573	#############################################################################	640	#############################################################################
…		…
602	$self->{children} = [	669	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	670	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	671	@{$self->{children}}, @widgets
605	];	672	];
606		673
607	$self->check_size (1);	674	$self->realloc;
608	$self->update;
609	}	675	}
610		676
611	sub children {	677	sub children {
612	@{ $_[0]{children} }	678	@{ $_[0]{children} }
613	}	679	}
…		…
618	delete $child->{parent};	684	delete $child->{parent};
619	$child->hide;	685	$child->hide;
620		686
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	687	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		688
623	$self->check_size;	689	$self->realloc;
624	$self->update;
625	}	690	}
626		691
627	sub clear {	692	sub clear {
628	my ($self) = @_;	693	my ($self) = @_;
629		694
…		…
633	for (@$children) {	698	for (@$children) {
634	delete $_->{parent};	699	delete $_->{parent};
635	$_->hide;	700	$_->hide;
636	}	701	}
637		702
638	$self->check_size;	703	$self->realloc;
639	$self->update;
640	}	704	}
641		705
642	sub find_widget {	706	sub find_widget {
643	my ($self, $x, $y) = @_;	707	my ($self, $x, $y) = @_;
644		708
…		…
697	sub size_request {	761	sub size_request {
698	$_[0]{children}[0]->size_request	762	$_[0]{children}[0]->size_request
699	}	763	}
700		764
701	sub size_allocate {	765	sub size_allocate {
702	my ($self, $w, $h) = @_;	766	my ($self, $w, $h, $changed) = @_;
703		767
704	$self->{children}[0]->configure (0, 0, $w, $h);	768	$self->{children}[0]->configure (0, 0, $w, $h);
705	}	769	}
706		770
707	#############################################################################	771	#############################################################################
…		…
724	$ROOT->on_post_alloc ($self => sub { $self->render_child });	788	$ROOT->on_post_alloc ($self => sub { $self->render_child });
725	$self->SUPER::update;	789	$self->SUPER::update;
726	}	790	}
727		791
728	sub size_allocate {	792	sub size_allocate {
729	my ($self, $w, $h) = @_;	793	my ($self, $w, $h, $changed) = @_;
730		794
731	$self->SUPER::size_allocate ($w, $h);	795	$self->SUPER::size_allocate ($w, $h, $changed);
732	$self->update;	796	$self->update
		797	if $changed;
733	}	798	}
734		799
735	sub _render {	800	sub _render {
736	$_[0]{children}[0]->draw;	801	$_[0]{children}[0]->draw;
737	}	802	}
…		…
781	}	846	}
782		847
783	sub size_request {	848	sub size_request {
784	my ($self) = @_;	849	my ($self) = @_;
785		850
786	@$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)};
787		852
788	@$self{qw(child_w child_h)}	853	$w = 10 if $self->{scroll_x};
		854	$h = 10 if $self->{scroll_y};
		855
		856	($w, $h)
789	}	857	}
790		858
791	sub size_allocate {	859	sub size_allocate {
792	my ($self, $w, $h) = @_;	860	my ($self, $w, $h, $changed) = @_;
793		861
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	862	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	863	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796		864
797	$self->child->configure (0, 0, $w, $h);	865	$self->child->configure (0, 0, $w, $h);
…		…
853	my $class = shift;	921	my $class = shift;
854		922
855	my $self;	923	my $self;
856		924
857	my $slider = new CFClient::UI::Slider	925	my $slider = new CFClient::UI::Slider
858	vertical => 1,	926	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	927	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	928	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	929	$self->{vp}->set_offset (0, $_[1]);
862	},	930	},
863	;	931	;
864		932
865	$self = $class->SUPER::new (	933	$self = $class->SUPER::new (
…		…
873	$self->add ($self->{slider});	941	$self->add ($self->{slider});
874		942
875	$self	943	$self
876	}	944	}
877		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
878	sub size_allocate {	956	sub size_allocate {
879	my ($self, $w, $h) = @_;	957	my ($self, $w, $h, $changed) = @_;
880		958
881	$self->SUPER::size_allocate ($w, $h);	959	$self->SUPER::size_allocate ($w, $h, $changed);
882		960
883	my $child = $self->{vp}->child;	961	my $child = $self->{vp}->child;
884	$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]);
885	}	963	}
886		964
…		…
933		1011
934	our @ISA = CFClient::UI::Bin::;	1012	our @ISA = CFClient::UI::Bin::;
935		1013
936	use CFClient::OpenGL;	1014	use CFClient::OpenGL;
937		1015
938	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 =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1021	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);	1022	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1023
942	sub new {	1024	sub new {
943	my $class = shift;	1025	my $class = shift;
944
945	# TODO: user_x, user_y, overwrite moveto?
946		1026
947	my $self = $class->SUPER::new (	1027	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1028	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1029	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1030	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1031	can_events => 1,
953	@_	1032	@_
954	);	1033	);
955		1034
956	$self->{title} &&= new CFClient::UI::Label	1035	$self->{title} &&= new CFClient::UI::Label
…		…
976	$h + $self->border * 2,	1055	$h + $self->border * 2,
977	)	1056	)
978	}	1057	}
979		1058
980	sub size_allocate {	1059	sub size_allocate {
981	my ($self, $w, $h) = @_;	1060	my ($self, $w, $h, $changed) = @_;
		1061
		1062	return unless $changed;
982		1063
983	$h -= List::Util::max 0, $self->border * 2;	1064	$h -= List::Util::max 0, $self->border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1065	$w -= List::Util::max 0, $self->border * 2;
985		1066
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1067	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
1010	my ($ev, $x, $y) = @_;	1091	my ($ev, $x, $y) = @_;
1011		1092
1012	my $dx = $ev->{x} - $ox;	1093	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1094	my $dy = $ev->{y} - $oy;
1014		1095
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1096	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1097	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1098
		1099	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1100	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1101	};
1020		1102
1021	} elsif ($lr ^ $td) {	1103	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1104	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1105	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1107	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1108	my ($ev, $x, $y) = @_;
1027		1109
1028	($x, $y) = ($ev->{x}, $ev->{y});	1110	($x, $y) = ($ev->{x}, $ev->{y});
1029		1111
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1112	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1113	};
1033	}	1114	}
1034	}	1115	}
1035		1116
1036	sub button_up {	1117	sub button_up {
…		…
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1137
1057	my $border = $self->border;	1138	my $border = $self->border;
1058		1139
1059	glColor @{ $self->{border_bg} };	1140	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1141	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1142	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1143	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1144	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1145
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1146	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1147	glColor @{ $self->{bg} };
1067		1148
1068	# TODO: repeat texture not scale	1149	# TODO: repeat texture not scale
		1150	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1151	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1152	$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);	1153	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1154	}
1079		1155
1080	glDisable GL_TEXTURE_2D;	1156	glDisable GL_TEXTURE_2D;
1081		1157
…		…
1101	col_expand => [],	1177	col_expand => [],
1102	@_,	1178	@_,
1103	)	1179	)
1104	}	1180	}
1105		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1184	}
		1185
1106	sub add {	1186	sub add {
1107	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1108		1188
1109	$child->set_parent ($self);	1189	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1111		1191
1112	$child->check_size;	1192	$self->realloc;
1113	}	1193	}
1114		1194
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1196	sub clear {
1121	my ($self) = @_;	1197	my ($self) = @_;
1122		1198
1123	my @children = $self->children;	1199	my @children = $self->children;
1124	delete $self->{children};	1200	delete $self->{children};
…		…
1126	for (@children) {	1202	for (@children) {
1127	delete $_->{parent};	1203	delete $_->{parent};
1128	$_->hide;	1204	$_->hide;
1129	}	1205	}
1130		1206
1131	$self->update;	1207	$self->realloc;
1132	}	1208	}
1133		1209
1134	sub get_wh {	1210	sub get_wh {
1135	my ($self) = @_;	1211	my ($self) = @_;
1136		1212
…		…
1163	(sum @$hs),	1239	(sum @$hs),
1164	)	1240	)
1165	}	1241	}
1166		1242
1167	sub size_allocate {	1243	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1244	my ($self, $w, $h, $changed) = @_;
1169		1245
1170	my ($ws, $hs) = $self->get_wh;	1246	my ($ws, $hs) = $self->get_wh;
1171		1247
1172	my $req_w = sum @$ws;	1248	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1249	my $req_h = (sum @$hs) || 1;
1174		1250
1175	# TODO: nicer code && do row_expand	1251	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1252	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1253	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1254	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1308	}
1233	}	1309	}
1234		1310
1235	#############################################################################	1311	#############################################################################
1236		1312
		1313	package CFClient::UI::Box;
		1314
		1315	our @ISA = CFClient::UI::Container::;
		1316
		1317	sub size_request {
		1318	my ($self) = @_;
		1319
		1320	$self->{vertical}
		1321	? (
		1322	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	: (
		1326	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1327	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1328	)
		1329	}
		1330
		1331	sub size_allocate {
		1332	my ($self, $w, $h, $changed) = @_;
		1333
		1334	my $space = $self->{vertical} ? $h : $w;
		1335	my $children = $self->{children};
		1336
		1337	my @req;
		1338
		1339	if ($self->{homogeneous}) {
		1340	@req = ($space / (@$children || 1)) x @$children;
		1341	} else {
		1342	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1343	my $req = List::Util::sum @req;
		1344
		1345	if ($req > $space) {
		1346	# ah well, not enough space
		1347	$_ *= $space / $req for @req;
		1348	} else {
		1349	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1350
		1351	$space = ($space - $req) / $expand; # remaining space to give away
		1352
		1353	$req[$_] += $space * $children->[$_]{expand}
		1354	for 0 .. $#$children;
		1355	}
		1356	}
		1357
		1358	CFClient::UI::harmonize \@req;
		1359
		1360	my $pos = 0;
		1361	for (0 .. $#$children) {
		1362	my $alloc = $req[$_];
		1363	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1364
		1365	$pos += $alloc;
		1366	}
		1367
		1368	1
		1369	}
		1370
		1371	#############################################################################
		1372
1237	package CFClient::UI::HBox;	1373	package CFClient::UI::HBox;
1238		1374
1239	# TODO: wrap into common Box base class
1240
1241	our @ISA = CFClient::UI::Container::;	1375	our @ISA = CFClient::UI::Box::;
1242		1376
1243	sub size_request {	1377	sub new {
1244	my ($self) = @_;	1378	my $class = shift;
1245		1379
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1380	$class->SUPER::new (
1247		1381	vertical => 0,
1248	(	1382	@_,
1249	(List::Util::sum map $_->[0], @alloc),
1250	(List::Util::max map $_->[1], @alloc),
1251	)	1383	)
1252	}	1384	}
1253		1385
1254	sub size_allocate {
1255	my ($self, $w, $h) = @_;
1256
1257	($h, $w) = ($w, $h);
1258
1259	my $children = $self->{children};
1260
1261	my @h = map $_->{req_w}, @$children;
1262
1263	my $req_h = List::Util::sum @h;
1264
1265	if ($req_h > $h) {
1266	# ah well, not enough space
1267	$_ *= $h / $req_h for @h;
1268	} else {
1269	my $exp = List::Util::sum map $_->{expand}, @$children;
1270	$exp ||= 1;
1271
1272	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	}
1279	}
1280
1281	CFClient::UI::harmonize \@h;
1282
1283	my $y = 0;
1284	for (0 .. $#$children) {
1285	my $child = $children->[$_];
1286	my $h = $h[$_];
1287	$child->configure ($y, 0, $h, $w);
1288
1289	$y += $h;
1290	}
1291
1292	1
1293	}
1294
1295	#############################################################################	1386	#############################################################################
1296		1387
1297	package CFClient::UI::VBox;	1388	package CFClient::UI::VBox;
1298		1389
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1390	our @ISA = CFClient::UI::Box::;
1302		1391
1303	sub size_request {	1392	sub new {
1304	my ($self) = @_;	1393	my $class = shift;
1305		1394
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1395	$class->SUPER::new (
1307		1396	vertical => 1,
1308	(	1397	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1398	)
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	}	1399	}
1352		1400
1353	#############################################################################	1401	#############################################################################
1354		1402
1355	package CFClient::UI::Label;	1403	package CFClient::UI::Label;
…		…
1418	$self->{text} = "T$text";	1466	$self->{text} = "T$text";
1419		1467
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1468	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1469	$self->{layout}->set_text ($text);
1422		1470
		1471	$self->realloc;
1423	$self->update;	1472	$self->update;
1424	$self->check_size;
1425	}	1473	}
1426		1474
1427	sub set_markup {	1475	sub set_markup {
1428	my ($self, $markup) = @_;	1476	my ($self, $markup) = @_;
1429		1477
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1481	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1482
1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1483	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436	$self->{layout}->set_markup ($markup);	1484	$self->{layout}->set_markup ($markup);
1437		1485
		1486	$self->realloc;
1438	$self->update;	1487	$self->update;
1439	$self->check_size;
1440	}	1488	}
1441		1489
1442	sub size_request {	1490	sub size_request {
1443	my ($self) = @_;	1491	my ($self) = @_;
1444		1492
…		…
1465	$h + $self->{padding} * 2,	1513	$h + $self->{padding} * 2,
1466	)	1514	)
1467	}	1515	}
1468		1516
1469	sub size_allocate {	1517	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1518	my ($self, $w, $h, $changed) = @_;
1471		1519
1472	delete $self->{texture};	1520	delete $self->{texture}
		1521	if $changed;
1473	}	1522	}
1474		1523
1475	sub set_fontsize {	1524	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1525	my ($self, $fontsize) = @_;
1477		1526
1478	$self->{fontsize} = $fontsize;	1527	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1528	delete $self->{texture};
1480		1529
1481	$self->update;	1530	$self->realloc;
1482	$self->check_size;
1483	}	1531	}
1484		1532
1485	sub _draw {	1533	sub _draw {
1486	my ($self) = @_;	1534	my ($self) = @_;
1487		1535
…		…
1567	sub set_text {	1615	sub set_text {
1568	my ($self, $text) = @_;	1616	my ($self, $text) = @_;
1569		1617
1570	$self->{cursor} = length $text;	1618	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1619	$self->_set_text ($text);
1572	$self->update;	1620
1573	$self->check_size;	1621	$self->realloc;
1574	}	1622	}
1575		1623
1576	sub get_text {	1624	sub get_text {
1577	$_[0]{text}	1625	$_[0]{text}
1578	}	1626	}
…		…
1611	} elsif ($uni) {	1659	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1660	substr $text, $self->{cursor}++, 0, chr $uni;
1613	}	1661	}
1614		1662
1615	$self->_set_text ($text);	1663	$self->_set_text ($text);
1616	$self->update;	1664
1617	$self->check_size;	1665	$self->realloc;
1618	}	1666	}
1619		1667
1620	sub focus_in {	1668	sub focus_in {
1621	my ($self) = @_;	1669	my ($self) = @_;
1622		1670
…		…
2115	fg => [1, 1, 1],	2163	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2164	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2165	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2166	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2167	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2168	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2169	min_h => $::WIDTH / 80,
2122	vertical => 0,	2170	vertical => 0,
2123	can_hover => 1,	2171	can_hover => 1,
2124	inner_pad => 0.02,	2172	inner_pad => 0.02,
2125	@_	2173	@_
2126	);	2174	);
…		…
2129	$self->update;	2177	$self->update;
2130		2178
2131	$self	2179	$self
2132	}	2180	}
2133		2181
		2182	sub changed { }
		2183
2134	sub set_range {	2184	sub set_range {
2135	my ($self, $range) = @_;	2185	my ($self, $range) = @_;
2136		2186
2137	$self->{range} = $range;	2187	($range, $self->{range}) = ($self->{range}, $range);
2138		2188
2139	$self->update;	2189	$self->update
		2190	if "@$range" ne "@{$self->{range}}";
2140	}	2191	}
2141		2192
2142	sub set_value {	2193	sub set_value {
2143	my ($self, $value) = @_;	2194	my ($self, $value) = @_;
2144		2195
…		…
2163	}	2214	}
2164		2215
2165	sub size_request {	2216	sub size_request {
2166	my ($self) = @_;	2217	my ($self) = @_;
2167		2218
2168	my $w = $self->{req_w};	2219	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2220	}
2173		2221
2174	sub button_down {	2222	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2223	my ($self, $ev, $x, $y) = @_;
2176		2224
…		…
2326	$self->{fontsize} = $fontsize;	2374	$self->{fontsize} = $fontsize;
2327	$self->reflow;	2375	$self->reflow;
2328	}	2376	}
2329		2377
2330	sub size_allocate {	2378	sub size_allocate {
2331	my ($self, $w, $h) = @_;	2379	my ($self, $w, $h, $changed) = @_;
2332		2380
2333	$self->SUPER::size_allocate ($w, $h);	2381	$self->SUPER::size_allocate ($w, $h, $changed);
		2382
		2383	return unless $changed;
2334		2384
2335	$self->{layout}->set_font ($self->{font}) if $self->{font};	2385	$self->{layout}->set_font ($self->{font}) if $self->{font};
2336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2386	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2338		2388
…		…
2527		2577
2528	sub new {	2578	sub new {
2529	my $class = shift;	2579	my $class = shift;
2530		2580
2531	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2532	state => 0,	2582	state => 0,
2533	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2534	@_	2584	@_
2535	);	2585	);
2536		2586
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2587	$self
2543	}	2588	}
2544		2589
2545	sub toggle_flopper {	2590	sub toggle_flopper {
2546	my ($self) = @_;	2591	my ($self) = @_;
2547		2592
2548	# TODO: use animation	2593	$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	}	2594	}
2560		2595
2561	#############################################################################	2596	#############################################################################
2562		2597
2563	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2595		2630
2596	($w + 4, $h + 4)	2631	($w + 4, $h + 4)
2597	}	2632	}
2598		2633
2599	sub size_allocate {	2634	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2635	my ($self, $w, $h, $changed) = @_;
2601		2636
		2637	return unless $changed;
		2638
2602	$self->SUPER::size_allocate ($w - 4, $h - 4);	2639	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2640	}
		2641
		2642	sub visibility_change {
		2643	my ($self, $visible) = @_;
		2644
		2645	return unless $visible;
		2646
		2647	$self->{root}->on_post_alloc ("move_$self" => sub {
		2648	my $widget = $self->{owner}
		2649	or return;
		2650
		2651	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2652
		2653	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2654	if $x + $self->{w} > $::WIDTH;
		2655
		2656	$self->move_abs ($x, $y);
		2657	});
2603	}	2658	}
2604		2659
2605	sub _draw {	2660	sub _draw {
2606	my ($self) = @_;	2661	my ($self) = @_;
2607		2662
…		…
2624	glVertex $w, $h;	2679	glVertex $w, $h;
2625	glVertex $w, 0;	2680	glVertex $w, 0;
2626	glEnd;	2681	glEnd;
2627		2682
2628	glTranslate 2 - 0.375, 2 - 0.375;	2683	glTranslate 2 - 0.375, 2 - 0.375;
		2684
2629	$self->SUPER::_draw;	2685	$self->SUPER::_draw;
2630	}	2686	}
2631		2687
2632	#############################################################################	2688	#############################################################################
2633		2689
…		…
2709	$self->SUPER::DESTROY;	2765	$self->SUPER::DESTROY;
2710	}	2766	}
2711		2767
2712	#############################################################################	2768	#############################################################################
2713		2769
2714	package CFClient::UI::InventoryItem;
2715
2716	our @ISA = CFClient::UI::HBox::;
2717
2718	sub new {
2719	my $class = shift;
2720
2721	my %args = @_;
2722
2723	my $item = delete $args{item};
2724
2725	my $desc = CFClient::Item::desc_string $item;
2726
2727	my $self = $class->SUPER::new (
2728	can_hover => 1,
2729	can_events => 1,
2730	tooltip => ((CFClient::UI::Label::escape $desc)
2731	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732	connect_button_down => sub {
2733	my ($self, $ev, $x, $y) = @_;
2734
2735	# todo: maybe put examine on 1? but should just be a tooltip :(
2736	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737	my $targ = $::CONN->{player}{tag};
2738
2739	if ($item->{container} == $::CONN->{player}{tag}) {
2740	$targ = $main::OPENCONT;
2741	}
2742
2743	$::CONN->send ("move $targ $item->{tag} 0");
2744	} elsif ($ev->{button} == 1) {
2745	$::CONN->send ("examine $item->{tag}");
2746	} elsif ($ev->{button} == 2) {
2747	$::CONN->send ("apply $item->{tag}");
2748	} elsif ($ev->{button} == 3) {
2749	my @menu_items = (
2750	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753	(
2754	$item->{flags} & Crossfire::Protocol::F_LOCKED
2755	? (
2756	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757	)
2758	: (
2759	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761	)
2762	),
2763	);
2764
2765	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766	}
2767
2768	1
2769	},
2770	%args
2771	);
2772
2773
2774	$self->add (new CFClient::UI::Face
2775	can_events => 0,
2776	face => $item->{face},
2777	anim => $item->{anim},
2778	animspeed => $item->{animspeed},
2779	);
2780
2781	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783	$self->{item} = $item;
2784
2785	$self->update_item;
2786
2787	$self
2788	}
2789
2790	sub update_item {
2791	my ($self) = @_;
2792
2793	my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795	$self->{name_lbl}->set_text ($desc);
2796	}
2797
2798	#############################################################################
2799
2800	package CFClient::UI::Inventory;	2770	package CFClient::UI::Inventory;
2801		2771
2802	our @ISA = CFClient::UI::ScrolledWindow::;	2772	our @ISA = CFClient::UI::ScrolledWindow::;
2803		2773
2804	sub new {	2774	sub new {
…		…
2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});	2803	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});	2804	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2835		2805
2836	$row++;	2806	$row++;
2837	}	2807	}
2838
2839	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840	}
2841
2842	sub size_request {
2843	my ($self) = @_;
2844	($self->{req_w}, $self->{req_h});
2845	}	2808	}
2846		2809
2847	#############################################################################	2810	#############################################################################
2848		2811
2849	package CFClient::UI::Menu;	2812	package CFClient::UI::Menu;
…		…
3035	use CFClient::OpenGL;	2998	use CFClient::OpenGL;
3036		2999
3037	sub new {	3000	sub new {
3038	my $class = shift;	3001	my $class = shift;
3039		3002
3040	$class->SUPER::new (	3003	my $self = $class->SUPER::new (
		3004	visible => 1,
3041	@_,	3005	@_,
3042	)	3006	);
		3007
		3008	Scalar::Util::weaken ($self->{root} = $self);
		3009
		3010	$self
3043	}	3011	}
3044		3012
3045	sub configure {	3013	sub configure {
3046	my ($self, $x, $y, $w, $h) = @_;	3014	my ($self, $x, $y, $w, $h) = @_;
3047		3015
3048	$self->{w} = $w;	3016	$self->{w} = $w;
3049	$self->{h} = $h;	3017	$self->{h} = $h;
3050	}	3018	}
3051		3019
3052	sub check_size {	3020	sub reconfigure {
3053	my ($self) = @_;	3021	my ($self) = @_;
3054		3022
		3023	$self->SUPER::reconfigure;
		3024
3055	$self->size_allocate ($self->{w}, $self->{h})	3025	$self->size_allocate ($self->{w}, $self->{h}, 1)
3056	if $self->{w};	3026	if $self->{w};
3057	}	3027	}
3058		3028
3059	sub size_request {	3029	sub size_request {
3060	my ($self) = @_;	3030	my ($self) = @_;
3061		3031
3062	($self->{w}, $self->{h})	3032	($self->{w}, $self->{h})
3063	}	3033	}
3064		3034
		3035	sub _to_pixel {
		3036	my ($coord, $size, $max) = @_;
		3037
		3038	$coord =
		3039	$coord eq "center" ? ($max - $size) * 0.5
		3040	: $coord eq "max" ? $max
		3041	: $coord;
		3042
		3043	$coord = 0 if $coord < 0;
		3044	$coord = $max - $size if $coord > $max - $size;
		3045
		3046	int $coord + 0.5
		3047	}
		3048
3065	sub size_allocate {	3049	sub size_allocate {
3066	my ($self, $w, $h) = @_;	3050	my ($self, $w, $h, $changed) = @_;
3067		3051
3068	for my $child ($self->children) {	3052	for my $child ($self->children) {
3069	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3053	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070		3054
3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3055	$X = $child->{force_x} if exists $child->{force_x};
3072	if exists $child->{req_x};	3056	$Y = $child->{force_y} if exists $child->{force_y};
3073		3057
3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3058	$X = _to_pixel $X, $W, $self->{w};
3075	if exists $child->{req_y};	3059	$Y = _to_pixel $Y, $H, $self->{h};
3076
3077	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079		3060
3080	$child->configure ($X, $Y, $W, $H);	3061	$child->configure ($X, $Y, $W, $H);
3081	}	3062	}
3082	}	3063	}
3083		3064
…		…
3094	}	3075	}
3095		3076
3096	sub update {	3077	sub update {
3097	my ($self) = @_;	3078	my ($self) = @_;
3098		3079
3099	$self->check_size;
3100	$::WANT_REFRESH++;	3080	$::WANT_REFRESH++;
3101	}	3081	}
3102		3082
3103	sub add {	3083	sub add {
3104	my ($self, @children) = @_;	3084	my ($self, @children) = @_;
3105		3085
3106	for (my @widgets = @children; my $w = pop @widgets; ) {
3107	push @widgets, $w->children;
3108	$w->{root} = $self;
3109	$w->{visible} = 1;
3110	}
3111
3112	for my $child (@children) {
3113	$child->{is_toplevel} = 1;	3086	$_->{is_toplevel} = 1
3114		3087	for @children;
3115	# integerise window positions
3116	$child->{x} = int $child->{x};
3117	$child->{y} = int $child->{y};
3118	}
3119		3088
3120	$self->SUPER::add (@children);	3089	$self->SUPER::add (@children);
3121	}	3090	}
3122		3091
3123	sub remove {	3092	sub remove {
3124	my ($self, @children) = @_;	3093	my ($self, @children) = @_;
3125		3094
3126	$self->SUPER::remove (@children);	3095	$self->SUPER::remove (@children);
		3096
		3097	delete $self->{is_toplevel}
		3098	for @children;
3127		3099
3128	while (@children) {	3100	while (@children) {
3129	my $w = pop @children;	3101	my $w = pop @children;
3130	push @children, $w->children;	3102	push @children, $w->children;
3131	$w->set_invisible;	3103	$w->set_invisible;
…		…
3150	while ($self->{refresh_hook}) {	3122	while ($self->{refresh_hook}) {
3151	$_->()	3123	$_->()
3152	for values %{delete $self->{refresh_hook}};	3124	for values %{delete $self->{refresh_hook}};
3153	}	3125	}
3154		3126
3155	if ($self->{check_size}) {	3127	if ($self->{realloc}) {
3156	my @queue = ([], []);	3128	my @queue;
3157		3129
3158	for (;;) {	3130	while () {
3159	if ($self->{check_size}) {	3131	if ($self->{realloc}) {
3160	# heuristic: check containers last	3132	#TODO use array-of-depth approach
3161	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3133
3162	for values %{delete $self->{check_size}}	3134	@queue = sort { $a->{visible} <=> $b->{visible} }
		3135	@queue, values %{delete $self->{realloc}};
3163	}	3136	}
3164		3137
3165	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3138	my $widget = pop @queue || last;
3166		3139
3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3140	$widget->{visible} or last; # do not resize invisible widgets
3168	? @$widget{qw(user_w user_h)}	3141
3169	: $widget->size_request;	3142	my ($w, $h) = $widget->size_request;
3170		3143
3171	if (delete $widget->{force_alloc}	3144	my $min_size = $widget->{is_toplevel} ? 16 : 0;
3172	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3145
3173	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3146	$w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
3174		3147	$h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
		3148
		3149	$w = $widget->{force_w} if exists $widget->{force_w};
		3150	$h = $widget->{force_h} if exists $widget->{force_h};
		3151
3175	$widget->{req_w} = $w;	3152	$widget->{req_w} = $w;
3176	$widget->{req_h} = $h;	3153	$widget->{req_h} = $h;
3177		3154
3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3155	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3179		3156
3180	$widget->{parent}->check_size	3157	push @queue, $widget->{parent}
3181	if $widget->{parent};	3158	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3182	}
3183	}	3159	}
3184	}	3160	}
3185		3161
3186	while ($self->{size_alloc}) {	3162	while (my $size_alloc = delete $self->{size_alloc}) {
3187	for (values %{delete $self->{size_alloc}}) {	3163	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3188	my ($widget, $w, $h) = @$_;	3164	values %$size_alloc;
		3165
		3166	while () {
		3167	my ($widget, $w, $h) = @{ pop @queue or last };
		3168
		3169	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3170	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3189		3171
3190	$w = 0 if $w < 0;	3172	$w = 0 if $w < 0;
3191	$h = 0 if $h < 0;	3173	$h = 0 if $h < 0;
3192		3174
		3175	$w = int $w + 0.5;
		3176	$h = int $h + 0.5;
		3177
		3178	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3179
3193	$widget->{w} = $w;	3180	$widget->{w} = $w;
3194	$widget->{h} = $h;	3181	$widget->{h} = $h;
		3182
3195	$widget->emit (size_allocate => $w, $h);	3183	$widget->emit (size_allocate => $w, $h, $changed);
3196	}	3184	}
3197	}	3185	}
3198		3186
3199	while ($self->{post_alloc_hook}) {	3187	while ($self->{post_alloc_hook}) {
3200	$_->()	3188	$_->()

Diff Legend

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