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.258 by root, Tue May 30 02:55:45 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	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
18		43
19	sub check_tooltip {	44	sub check_tooltip {
20	if (!$GRAB) {	45	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	47	if (length $widget->{tooltip}) {
23		48
24	if ($TOOLTIP->{owner} != $widget) {	49	if ($TOOLTIP->{owner} != $widget) {
		50	$TOOLTIP->hide;
		51
25	$TOOLTIP->{owner} = $widget;	52	$TOOLTIP->{owner} = $widget;
26		53
27	my $tip = $widget->{tooltip};	54	my $tip = $widget->{tooltip};
28		55
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	56	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		57
31	$TOOLTIP->set_tooltip_from ($widget);	58	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	59	$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	}	60	}
43		61
44	return;	62	return;
45	}	63	}
46	}	64	}
…		…
152	sub rescale_widgets {	170	sub rescale_widgets {
153	my ($sx, $sy) = @_;	171	my ($sx, $sy) = @_;
154		172
155	for my $widget (values %WIDGET) {	173	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	174	if ($widget->{is_toplevel}) {
		175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		177
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	178	$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};	179	$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};	180	$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};	181	$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};	182	$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};	183	$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};	184
		185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		187
165	}	188	}
166	}	189	}
167		190
168	reconfigure_widgets;	191	reconfigure_widgets;
169	}	192	}
…		…
178		201
179	sub new {	202	sub new {
180	my $class = shift;	203	my $class = shift;
181		204
182	my $self = bless {	205	my $self = bless {
183	x => 0,	206	x => "center",
184	y => 0,	207	y => "center",
185	z => 0,	208	z => 0,
		209	w => undef,
		210	h => undef,
186	can_events => 1,	211	can_events => 1,
187	@_	212	@_
188	}, $class;	213	}, $class;
189		214
		215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		216
190	for (keys %$self) {	217	for (keys %$self) {
191	if (/^connect_(.*)$/) {	218	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	219	$self->connect ($1 => delete $self->{$_});
193	}	220	}
194	}	221	}
195		222
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
		225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
		226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
		227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
		228
		229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		231
		232	$self->show if $layout->{show};
		233	}
197		234
198	$self	235	$self
199	}	236	}
200		237
201	sub destroy {	238	sub destroy {
…		…
205	%$self = ();	242	%$self = ();
206	}	243	}
207		244
208	sub show {	245	sub show {
209	my ($self) = @_;	246	my ($self) = @_;
		247
210	return if $self->{parent};	248	return if $self->{parent};
211		249
212	$CFClient::UI::ROOT->add ($self);	250	$CFClient::UI::ROOT->add ($self);
213	}	251	}
214		252
215	sub show_centered {	253	sub set_visible {
216	my ($self) = @_;	254	my ($self) = @_;
		255
217	return if $self->{parent};	256	return if $self->{visible};
218		257
219	$self->show;	258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
220		260
221	$CFClient::UI::ROOT->on_post_alloc (	261	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	262
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	263	$self->realloc if !exists $self->{req_w};
224	},	264
225	);	265	$_->set_visible for $self->children;
226	}	266	}
227		267
228	sub set_invisible {	268	sub set_invisible {
229	my ($self) = @_;	269	my ($self) = @_;
230		270
231	# broken show/hide model	271	return unless $self->{visible};
232		272
		273	$_->set_invisible for $self->children;
		274
		275	delete $self->{root};
233	delete $self->{visible};	276	delete $self->{visible};
234		277
235	undef $GRAB if $GRAB == $self;	278	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	279	undef $HOVER if $HOVER == $self;
237		280
238	CFClient::UI::check_tooltip	281	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	282	if $TOOLTIP->{owner} == $self;
240		283
241	$self->focus_out;	284	$self->focus_out;
		285
		286	$self->emit (visibility_change => 0);
		287	}
		288
		289	sub set_visibility {
		290	my ($self, $visible) = @_;
		291
		292	return if $self->{visible} == $visible;
		293
		294	$visible ? $self->hide
		295	: $self->show;
		296	}
		297
		298	sub toggle_visibility {
		299	my ($self) = @_;
		300
		301	$self->{visible}
		302	? $self->hide
		303	: $self->show;
242	}	304	}
243		305
244	sub hide {	306	sub hide {
245	my ($self) = @_;	307	my ($self) = @_;
246		308
…		…
248		310
249	$self->{parent}->remove ($self)	311	$self->{parent}->remove ($self)
250	if $self->{parent};	312	if $self->{parent};
251	}	313	}
252		314
253	sub move {	315	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	316	my ($self, $x, $y, $z) = @_;
255		317
256	$self->{x} = int $x;	318	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	319	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	320	$self->{z} = $z if defined $z;
259		321
260	$self->update;	322	$self->update;
261	}	323	}
262		324
263	sub set_size {	325	sub set_size {
264	my ($self, $w, $h) = @_;	326	my ($self, $w, $h) = @_;
265		327
266	$self->{user_w} = $w;	328	$self->{force_w} = $w;
267	$self->{user_h} = $h;	329	$self->{force_h} = $h;
268		330
269	$self->check_size;	331	$self->realloc;
270	}	332	}
271		333
272	sub size_request {	334	sub size_request {
273	require Carp;	335	require Carp;
274	Carp::confess "size_request is abstract";	336	Carp::confess "size_request is abstract";
…		…
276		338
277	sub configure {	339	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	340	my ($self, $x, $y, $w, $h) = @_;
279		341
280	if ($self->{aspect}) {	342	if ($self->{aspect}) {
		343	my ($ow, $oh) = ($w, $h);
		344
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	345	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	346	$h = List::Util::min $h, int $w / $self->{aspect};
283		347
284	# use alignment to adjust x, y	348	# use alignment to adjust x, y
285		349
286	$x += int +($w - $w2) * 0.5;	350	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	351	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	352	}
291		353
292	if ($self->{x} != $x || $self->{y} != $y) {	354	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	355	$self->{x} = $x;
294	$self->{y} = $y;	356	$self->{y} = $y;
295	$self->update;	357	$self->update;
296	}	358	}
297		359
298	if ($self->{w} != $w || $self->{h} != $h) {	360	if ($self->{w} != $w || $self->{h} != $h) {
		361	return unless $self->{visible};
		362
299	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
300	}	364	}
301	}	365	}
302		366
303	sub size_allocate {	367	sub size_allocate {
304	# nothing to be done	368	# nothing to be done
305	}
306
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}	369	}
313		370
314	sub children {	371	sub children {
315	}	372	}
316		373
…		…
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		456
		457	sub find_widget {
		458	my ($self, $x, $y) = @_;
		459
		460	return () unless $self->{can_events};
		461
		462	return $self
		463	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		464	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		465
		466	()
		467	}
		468
		469	sub set_parent {
		470	my ($self, $parent) = @_;
		471
		472	Scalar::Util::weaken ($self->{parent} = $parent);
		473	$self->set_visible if $parent->{visible};
		474	}
		475
		476	sub connect {
		477	my ($self, $signal, $cb) = @_;
		478
		479	push @{ $self->{signal_cb}{$signal} }, $cb;
		480	}
		481
		482	sub _emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		486	}
		487
		488	sub emit {
		489	my ($self, $signal, @args) = @_;
		490
		491	$self->_emit ($signal, @args)
		492	|| $self->$signal (@args);
		493	}
		494
		495	sub visibility_change {
		496	#my ($self, $visible) = @_;
		497	}
		498
		499	sub realloc {
		500	my ($self) = @_;
		501
		502	if ($self->{visible}) {
		503	return if $self->{root}{realloc}{$self};
		504
		505	$self->{root}{realloc}{$self} = $self;
		506	$self->{root}->update;
		507	} else {
		508	delete $self->{req_w};
		509	}
		510	}
		511
		512	sub update {
		513	my ($self) = @_;
		514
		515	$self->{parent}->update
		516	if $self->{parent};
		517	}
		518
		519	sub reconfigure {
		520	my ($self) = @_;
		521
		522	$self->realloc;
		523	$self->update;
		524	}
399		525
400	sub draw {	526	sub draw {
401	my ($self) = @_;	527	my ($self) = @_;
402		528
403	return unless $self->{h} && $self->{w};	529	return unless $self->{h} && $self->{w};
…		…
420	glVertex $x , $y + $self->{h};	546	glVertex $x , $y + $self->{h};
421	glEnd;	547	glEnd;
422	glDisable GL_BLEND;	548	glDisable GL_BLEND;
423	}	549	}
424		550
425	if ($ENV{PCLIENT_DEBUG}) {	551	if ($ENV{CFPLUS_DEBUG}) {
426	glPushMatrix;	552	glPushMatrix;
427	glColor 1, 1, 0, 1;	553	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	555	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	556	glVertex 0 , 0;
…		…
441	my ($self) = @_;	567	my ($self) = @_;
442		568
443	warn "no draw defined for $self\n";	569	warn "no draw defined for $self\n";
444	}	570	}
445		571
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 {	572	sub DESTROY {
504	my ($self) = @_;	573	my ($self) = @_;
505		574
506	delete $WIDGET{$self+0};	575	delete $WIDGET{$self+0};
507	#$self->deactivate;	576	#$self->deactivate;
…		…
563	my ($class, %arg) = @_;	632	my ($class, %arg) = @_;
564	$class->SUPER::new (can_events => 0, %arg);	633	$class->SUPER::new (can_events => 0, %arg);
565	}	634	}
566		635
567	sub size_request {	636	sub size_request {
568	(0, 0)	637	my ($self) = @_;
		638
		639	($self->{w} + 0, $self->{h} + 0)
569	}	640	}
570		641
571	sub draw { }	642	sub draw { }
572		643
573	#############################################################################	644	#############################################################################
…		…
602	$self->{children} = [	673	$self->{children} = [
603	sort { $a->{z} <=> $b->{z} }	674	sort { $a->{z} <=> $b->{z} }
604	@{$self->{children}}, @widgets	675	@{$self->{children}}, @widgets
605	];	676	];
606		677
607	$self->check_size (1);	678	$self->realloc;
608	$self->update;
609	}	679	}
610		680
611	sub children {	681	sub children {
612	@{ $_[0]{children} }	682	@{ $_[0]{children} }
613	}	683	}
…		…
618	delete $child->{parent};	688	delete $child->{parent};
619	$child->hide;	689	$child->hide;
620		690
621	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	691	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622		692
623	$self->check_size;	693	$self->realloc;
624	$self->update;
625	}	694	}
626		695
627	sub clear {	696	sub clear {
628	my ($self) = @_;	697	my ($self) = @_;
629		698
…		…
633	for (@$children) {	702	for (@$children) {
634	delete $_->{parent};	703	delete $_->{parent};
635	$_->hide;	704	$_->hide;
636	}	705	}
637		706
638	$self->check_size;	707	$self->realloc;
639	$self->update;
640	}	708	}
641		709
642	sub find_widget {	710	sub find_widget {
643	my ($self, $x, $y) = @_;	711	my ($self, $x, $y) = @_;
644		712
…		…
697	sub size_request {	765	sub size_request {
698	$_[0]{children}[0]->size_request	766	$_[0]{children}[0]->size_request
699	}	767	}
700		768
701	sub size_allocate {	769	sub size_allocate {
702	my ($self, $w, $h) = @_;	770	my ($self, $w, $h, $changed) = @_;
703		771
704	$self->{children}[0]->configure (0, 0, $w, $h);	772	$self->{children}[0]->configure (0, 0, $w, $h);
705	}	773	}
706		774
707	#############################################################################	775	#############################################################################
…		…
724	$ROOT->on_post_alloc ($self => sub { $self->render_child });	792	$ROOT->on_post_alloc ($self => sub { $self->render_child });
725	$self->SUPER::update;	793	$self->SUPER::update;
726	}	794	}
727		795
728	sub size_allocate {	796	sub size_allocate {
729	my ($self, $w, $h) = @_;	797	my ($self, $w, $h, $changed) = @_;
730		798
731	$self->SUPER::size_allocate ($w, $h);	799	$self->SUPER::size_allocate ($w, $h, $changed);
732	$self->update;	800	$self->update
		801	if $changed;
733	}	802	}
734		803
735	sub _render {	804	sub _render {
736	$_[0]{children}[0]->draw;	805	$_[0]{children}[0]->draw;
737	}	806	}
…		…
781	}	850	}
782		851
783	sub size_request {	852	sub size_request {
784	my ($self) = @_;	853	my ($self) = @_;
785		854
786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
787		856
788	@$self{qw(child_w child_h)}	857	$w = 10 if $self->{scroll_x};
		858	$h = 10 if $self->{scroll_y};
		859
		860	($w, $h)
789	}	861	}
790		862
791	sub size_allocate {	863	sub size_allocate {
792	my ($self, $w, $h) = @_;	864	my ($self, $w, $h, $changed) = @_;
793		865
794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
796		868
797	$self->child->configure (0, 0, $w, $h);	869	$self->child->configure (0, 0, $w, $h);
…		…
853	my $class = shift;	925	my $class = shift;
854		926
855	my $self;	927	my $self;
856		928
857	my $slider = new CFClient::UI::Slider	929	my $slider = new CFClient::UI::Slider
858	vertical => 1,	930	vertical => 1,
859	range => [0, 0, 1, 0.01], # HACK fix	931	range => [0, 0, 1, 0.01], # HACK fix
860	connect_changed => sub {	932	on_changed => sub {
861	$self->{vp}->set_offset (0, $_[1]);	933	$self->{vp}->set_offset (0, $_[1]);
862	},	934	},
863	;	935	;
864		936
865	$self = $class->SUPER::new (	937	$self = $class->SUPER::new (
…		…
873	$self->add ($self->{slider});	945	$self->add ($self->{slider});
874		946
875	$self	947	$self
876	}	948	}
877		949
		950	sub update {
		951	my ($self) = @_;
		952
		953	$self->SUPER::update;
		954
		955	# todo: overwrite size_allocate of child
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		958	}
		959
878	sub size_allocate {	960	sub size_allocate {
879	my ($self, $w, $h) = @_;	961	my ($self, $w, $h, $changed) = @_;
880		962
881	$self->SUPER::size_allocate ($w, $h);	963	$self->SUPER::size_allocate ($w, $h, $changed);
882		964
883	my $child = $self->{vp}->child;	965	my $child = $self->{vp}->child;
884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885	}	967	}
886		968
…		…
933		1015
934	our @ISA = CFClient::UI::Bin::;	1016	our @ISA = CFClient::UI::Bin::;
935		1017
936	use CFClient::OpenGL;	1018	use CFClient::OpenGL;
937		1019
938	my @tex =	1020	my $bg =
		1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1022	mipmap => 1, wrap => 1;
		1023
		1024	my @border =
939	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1025	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);	1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941		1027
942	sub new {	1028	sub new {
943	my $class = shift;	1029	my $class = shift;
944
945	# TODO: user_x, user_y, overwrite moveto?
946		1030
947	my $self = $class->SUPER::new (	1031	my $self = $class->SUPER::new (
948	bg => [1, 1, 1, 1],	1032	bg => [1, 1, 1, 1],
949	border_bg => [1, 1, 1, 1],	1033	border_bg => [1, 1, 1, 1],
950	border => 0.6,	1034	border => 0.6,
951	is_toplevel => 1,
952	can_events => 1,	1035	can_events => 1,
		1036	min_w => 16,
		1037	min_h => 16,
953	@_	1038	@_
954	);	1039	);
955		1040
956	$self->{title} &&= new CFClient::UI::Label	1041	$self->{title} &&= new CFClient::UI::Label
957	align => 0,	1042	align => 0,
…		…
976	$h + $self->border * 2,	1061	$h + $self->border * 2,
977	)	1062	)
978	}	1063	}
979		1064
980	sub size_allocate {	1065	sub size_allocate {
981	my ($self, $w, $h) = @_;	1066	my ($self, $w, $h, $changed) = @_;
		1067
		1068	return unless $changed;
982		1069
983	$h -= List::Util::max 0, $self->border * 2;	1070	$h -= List::Util::max 0, $self->border * 2;
984	$w -= List::Util::max 0, $self->border * 2;	1071	$w -= List::Util::max 0, $self->border * 2;
985		1072
986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
1010	my ($ev, $x, $y) = @_;	1097	my ($ev, $x, $y) = @_;
1011		1098
1012	my $dx = $ev->{x} - $ox;	1099	my $dx = $ev->{x} - $ox;
1013	my $dy = $ev->{y} - $oy;	1100	my $dy = $ev->{y} - $oy;
1014		1101
1015	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1104
		1105	$self->realloc;
1017	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018	$self->check_size;
1019	};	1107	};
1020		1108
1021	} elsif ($lr ^ $td) {	1109	} elsif ($lr ^ $td) {
1022	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023	my ($bx, $by) = ($self->{x}, $self->{y});	1111	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1025	$self->{motion} = sub {	1113	$self->{motion} = sub {
1026	my ($ev, $x, $y) = @_;	1114	my ($ev, $x, $y) = @_;
1027		1115
1028	($x, $y) = ($ev->{x}, $ev->{y});	1116	($x, $y) = ($ev->{x}, $ev->{y});
1029		1117
1030	$self->move ($bx + $x - $ox, $by + $y - $oy);	1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031	$self->update;
1032	};	1119	};
1033	}	1120	}
1034	}	1121	}
1035		1122
1036	sub button_up {	1123	sub button_up {
…		…
1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056		1143
1057	my $border = $self->border;	1144	my $border = $self->border;
1058		1145
1059	glColor @{ $self->{border_bg} };	1146	glColor @{ $self->{border_bg} };
1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064		1151
1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066	my $bg = $tex[0];	1153	glColor @{ $self->{bg} };
1067		1154
1068	# TODO: repeat texture not scale	1155	# TODO: repeat texture not scale
		1156	# solve this better(?)
1069	my $rep_x = $cw / $bg->{w};	1157	$bg->{s} = $cw / $bg->{w};
1070	my $rep_y = $ch / $bg->{h};	1158	$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);	1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078	}	1160	}
1079		1161
1080	glDisable GL_TEXTURE_2D;	1162	glDisable GL_TEXTURE_2D;
1081		1163
…		…
1101	col_expand => [],	1183	col_expand => [],
1102	@_,	1184	@_,
1103	)	1185	)
1104	}	1186	}
1105		1187
		1188	sub children {
		1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1190	}
		1191
1106	sub add {	1192	sub add {
1107	my ($self, $x, $y, $child) = @_;	1193	my ($self, $x, $y, $child) = @_;
1108		1194
1109	$child->set_parent ($self);	1195	$child->set_parent ($self);
1110	$self->{children}[$y][$x] = $child;	1196	$self->{children}[$y][$x] = $child;
1111		1197
1112	$child->check_size;	1198	$self->realloc;
1113	}	1199	}
1114		1200
1115	sub children {
1116	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117	}
1118
1119	# TODO: move to container class maybe? send childs a signal on removal?	1201	# TODO: move to container class maybe? send children a signal on removal?
1120	sub clear {	1202	sub clear {
1121	my ($self) = @_;	1203	my ($self) = @_;
1122		1204
1123	my @children = $self->children;	1205	my @children = $self->children;
1124	delete $self->{children};	1206	delete $self->{children};
…		…
1126	for (@children) {	1208	for (@children) {
1127	delete $_->{parent};	1209	delete $_->{parent};
1128	$_->hide;	1210	$_->hide;
1129	}	1211	}
1130		1212
1131	$self->update;	1213	$self->realloc;
1132	}	1214	}
1133		1215
1134	sub get_wh {	1216	sub get_wh {
1135	my ($self) = @_;	1217	my ($self) = @_;
1136		1218
…		…
1163	(sum @$hs),	1245	(sum @$hs),
1164	)	1246	)
1165	}	1247	}
1166		1248
1167	sub size_allocate {	1249	sub size_allocate {
1168	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h, $changed) = @_;
1169		1251
1170	my ($ws, $hs) = $self->get_wh;	1252	my ($ws, $hs) = $self->get_wh;
1171		1253
1172	my $req_w = sum @$ws;	1254	my $req_w = (sum @$ws) || 1;
1173	my $req_h = sum @$hs;	1255	my $req_h = (sum @$hs) || 1;
1174		1256
1175	# TODO: nicer code && do row_expand	1257	# TODO: nicer code && do row_expand
1176	my @col_expand = @{$self->{col_expand}};	1258	my @col_expand = @{$self->{col_expand}};
1177	@col_expand = (1) x @$ws unless @col_expand;	1259	@col_expand = (1) x @$ws unless @col_expand;
1178	my $col_expand = (sum @col_expand) || 1;	1260	my $col_expand = (sum @col_expand) || 1;
…		…
1232	}	1314	}
1233	}	1315	}
1234		1316
1235	#############################################################################	1317	#############################################################################
1236		1318
		1319	package CFClient::UI::Box;
		1320
		1321	our @ISA = CFClient::UI::Container::;
		1322
		1323	sub size_request {
		1324	my ($self) = @_;
		1325
		1326	$self->{vertical}
		1327	? (
		1328	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1329	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1330	)
		1331	: (
		1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1334	)
		1335	}
		1336
		1337	sub size_allocate {
		1338	my ($self, $w, $h, $changed) = @_;
		1339
		1340	my $space = $self->{vertical} ? $h : $w;
		1341	my $children = $self->{children};
		1342
		1343	my @req;
		1344
		1345	if ($self->{homogeneous}) {
		1346	@req = ($space / (@$children || 1)) x @$children;
		1347	} else {
		1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1349	my $req = List::Util::sum @req;
		1350
		1351	if ($req > $space) {
		1352	# ah well, not enough space
		1353	$_ *= $space / $req for @req;
		1354	} else {
		1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1356
		1357	$space = ($space - $req) / $expand; # remaining space to give away
		1358
		1359	$req[$_] += $space * $children->[$_]{expand}
		1360	for 0 .. $#$children;
		1361	}
		1362	}
		1363
		1364	CFClient::UI::harmonize \@req;
		1365
		1366	my $pos = 0;
		1367	for (0 .. $#$children) {
		1368	my $alloc = $req[$_];
		1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1370
		1371	$pos += $alloc;
		1372	}
		1373
		1374	1
		1375	}
		1376
		1377	#############################################################################
		1378
1237	package CFClient::UI::HBox;	1379	package CFClient::UI::HBox;
1238		1380
1239	# TODO: wrap into common Box base class
1240
1241	our @ISA = CFClient::UI::Container::;	1381	our @ISA = CFClient::UI::Box::;
1242		1382
1243	sub size_request {	1383	sub new {
1244	my ($self) = @_;	1384	my $class = shift;
1245		1385
1246	my @alloc = map [$_->size_request], @{$self->{children}};	1386	$class->SUPER::new (
1247		1387	vertical => 0,
1248	(	1388	@_,
1249	(List::Util::sum map $_->[0], @alloc),
1250	(List::Util::max map $_->[1], @alloc),
1251	)	1389	)
1252	}	1390	}
1253		1391
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	#############################################################################	1392	#############################################################################
1296		1393
1297	package CFClient::UI::VBox;	1394	package CFClient::UI::VBox;
1298		1395
1299	# TODO: wrap into common Box base class
1300
1301	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Box::;
1302		1397
1303	sub size_request {	1398	sub new {
1304	my ($self) = @_;	1399	my $class = shift;
1305		1400
1306	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$class->SUPER::new (
1307		1402	vertical => 1,
1308	(	1403	@_,
1309	(List::Util::max map $_->[0], @alloc),
1310	(List::Util::sum map $_->[1], @alloc),
1311	)	1404	)
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	}	1405	}
1352		1406
1353	#############################################################################	1407	#############################################################################
1354		1408
1355	package CFClient::UI::Label;	1409	package CFClient::UI::Label;
…		…
1372	ellipsise => 3, # end	1426	ellipsise => 3, # end
1373	layout => (new CFClient::Layout),	1427	layout => (new CFClient::Layout),
1374	fontsize => 1,	1428	fontsize => 1,
1375	align => -1,	1429	align => -1,
1376	valign => -1,	1430	valign => -1,
1377	padding => 2,	1431	padding_x => 2,
		1432	padding_y => 2,
1378	can_events => 0,	1433	can_events => 0,
1379	%arg	1434	%arg
1380	);	1435	);
1381		1436
1382	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1418	$self->{text} = "T$text";	1473	$self->{text} = "T$text";
1419		1474
1420	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421	$self->{layout}->set_text ($text);	1476	$self->{layout}->set_text ($text);
1422		1477
		1478	$self->realloc;
1423	$self->update;	1479	$self->update;
1424	$self->check_size;
1425	}	1480	}
1426		1481
1427	sub set_markup {	1482	sub set_markup {
1428	my ($self, $markup) = @_;	1483	my ($self, $markup) = @_;
1429		1484
…		…
1433	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434		1489
1435	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436	$self->{layout}->set_markup ($markup);	1491	$self->{layout}->set_markup ($markup);
1437		1492
		1493	$self->realloc;
1438	$self->update;	1494	$self->update;
1439	$self->check_size;
1440	}	1495	}
1441		1496
1442	sub size_request {	1497	sub size_request {
1443	my ($self) = @_;	1498	my ($self) = @_;
1444		1499
…		…
1458		1513
1459	$w = List::Util::max $w, $w2;	1514	$w = List::Util::max $w, $w2;
1460	$h = List::Util::max $h, $h2;	1515	$h = List::Util::max $h, $h2;
1461	}	1516	}
1462		1517
1463	(	1518	($w, $h)
1464	$w + $self->{padding} * 2,
1465	$h + $self->{padding} * 2,
1466	)
1467	}	1519	}
1468		1520
1469	sub size_allocate {	1521	sub size_allocate {
1470	my ($self, $w, $h) = @_;	1522	my ($self, $w, $h, $changed) = @_;
1471		1523
1472	delete $self->{texture};	1524	delete $self->{texture}
		1525	if $changed;
1473	}	1526	}
1474		1527
1475	sub set_fontsize {	1528	sub set_fontsize {
1476	my ($self, $fontsize) = @_;	1529	my ($self, $fontsize) = @_;
1477		1530
1478	$self->{fontsize} = $fontsize;	1531	$self->{fontsize} = $fontsize;
1479	delete $self->{texture};	1532	delete $self->{texture};
1480		1533
1481	$self->update;	1534	$self->realloc;
1482	$self->check_size;
1483	}	1535	}
1484		1536
1485	sub _draw {	1537	sub _draw {
1486	my ($self) = @_;	1538	my ($self) = @_;
1487		1539
…		…
1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497		1549
1498	my $tex = new_from_layout CFClient::Texture $self->{layout};	1550	my $tex = new_from_layout CFClient::Texture $self->{layout};
1499		1551
1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502	: ($self->{w} - $tex->{w}) * 0.5);	1554	: ($self->{w} - $tex->{w}) * 0.5);
1503		1555
1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506	: ($self->{h} - $tex->{h}) * 0.5);	1558	: ($self->{h} - $tex->{h}) * 0.5);
1507		1559
1508	$tex	1560	$tex
1509	};	1561	};
1510		1562
…		…
1567	sub set_text {	1619	sub set_text {
1568	my ($self, $text) = @_;	1620	my ($self, $text) = @_;
1569		1621
1570	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1571	$self->_set_text ($text);	1623	$self->_set_text ($text);
1572	$self->update;	1624
1573	$self->check_size;	1625	$self->realloc;
1574	}	1626	}
1575		1627
1576	sub get_text {	1628	sub get_text {
1577	$_[0]{text}	1629	$_[0]{text}
1578	}	1630	}
…		…
1611	} elsif ($uni) {	1663	} elsif ($uni) {
1612	substr $text, $self->{cursor}++, 0, chr $uni;	1664	substr $text, $self->{cursor}++, 0, chr $uni;
1613	}	1665	}
1614		1666
1615	$self->_set_text ($text);	1667	$self->_set_text ($text);
1616	$self->update;	1668
1617	$self->check_size;	1669	$self->realloc;
1618	}	1670	}
1619		1671
1620	sub focus_in {	1672	sub focus_in {
1621	my ($self) = @_;	1673	my ($self) = @_;
1622		1674
…		…
1749		1801
1750	sub new {	1802	sub new {
1751	my $class = shift;	1803	my $class = shift;
1752		1804
1753	$class->SUPER::new (	1805	$class->SUPER::new (
1754	padding => 4,	1806	padding_x => 4,
		1807	padding_y => 4,
1755	fg => [1, 1, 1],	1808	fg => [1, 1, 1],
1756	active_fg => [0, 0, 1],	1809	active_fg => [0, 0, 1],
1757	can_hover => 1,	1810	can_hover => 1,
1758	align => 0,	1811	align => 0,
1759	valign => 0,	1812	valign => 0,
…		…
1806		1859
1807	sub new {	1860	sub new {
1808	my $class = shift;	1861	my $class = shift;
1809		1862
1810	$class->SUPER::new (	1863	$class->SUPER::new (
1811	padding => 2,	1864	padding_x => 2,
		1865	padding_y => 2,
1812	fg => [1, 1, 1],	1866	fg => [1, 1, 1],
1813	active_fg => [1, 1, 0],	1867	active_fg => [1, 1, 0],
1814	bg => [0, 0, 0, 0.2],	1868	bg => [0, 0, 0, 0.2],
1815	active_bg => [1, 1, 1, 0.5],	1869	active_bg => [1, 1, 1, 0.5],
1816	state => 0,	1870	state => 0,
…		…
1820	}	1874	}
1821		1875
1822	sub size_request {	1876	sub size_request {
1823	my ($self) = @_;	1877	my ($self) = @_;
1824		1878
1825	($self->{padding} * 2 + 6) x 2	1879	(6) x 2
1826	}	1880	}
1827		1881
1828	sub button_down {	1882	sub button_down {
1829	my ($self, $ev, $x, $y) = @_;	1883	my ($self, $ev, $x, $y) = @_;
1830		1884
1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833	$self->{state} = !$self->{state};	1887	$self->{state} = !$self->{state};
1834	$self->_emit (changed => $self->{state});	1888	$self->_emit (changed => $self->{state});
1835	}	1889	}
1836	}	1890	}
1837		1891
1838	sub _draw {	1892	sub _draw {
1839	my ($self) = @_;	1893	my ($self) = @_;
1840		1894
1841	$self->SUPER::_draw;	1895	$self->SUPER::_draw;
1842		1896
1843	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1897	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844		1898
1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1899	my ($w, $h) = @$self{qw(w h)};
		1900
		1901	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846		1902
1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1903	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848		1904
1849	my $tex = $self->{state} ? $tex[1] : $tex[0];	1905	my $tex = $self->{state} ? $tex[1] : $tex[0];
1850		1906
…		…
2115	fg => [1, 1, 1],	2171	fg => [1, 1, 1],
2116	active_fg => [0, 0, 0],	2172	active_fg => [0, 0, 0],
2117	bg => [0, 0, 0, 0.2],	2173	bg => [0, 0, 0, 0.2],
2118	active_bg => [1, 1, 1, 0.5],	2174	active_bg => [1, 1, 1, 0.5],
2119	range => [0, 0, 100, 10, 0],	2175	range => [0, 0, 100, 10, 0],
2120	req_w => $::WIDTH / 80,	2176	min_w => $::WIDTH / 80,
2121	req_h => $::WIDTH / 80,	2177	min_h => $::WIDTH / 80,
2122	vertical => 0,	2178	vertical => 0,
2123	can_hover => 1,	2179	can_hover => 1,
2124	inner_pad => 0.02,	2180	inner_pad => 0.02,
2125	@_	2181	@_
2126	);	2182	);
…		…
2129	$self->update;	2185	$self->update;
2130		2186
2131	$self	2187	$self
2132	}	2188	}
2133		2189
		2190	sub changed { }
		2191
2134	sub set_range {	2192	sub set_range {
2135	my ($self, $range) = @_;	2193	my ($self, $range) = @_;
2136		2194
2137	$self->{range} = $range;	2195	($range, $self->{range}) = ($self->{range}, $range);
2138		2196
2139	$self->update;	2197	$self->update
		2198	if "@$range" ne "@{$self->{range}}";
2140	}	2199	}
2141		2200
2142	sub set_value {	2201	sub set_value {
2143	my ($self, $value) = @_;	2202	my ($self, $value) = @_;
2144		2203
…		…
2163	}	2222	}
2164		2223
2165	sub size_request {	2224	sub size_request {
2166	my ($self) = @_;	2225	my ($self) = @_;
2167		2226
2168	my $w = $self->{req_w};	2227	($self->{req_w}, $self->{req_h})
2169	my $h = $self->{req_h};
2170
2171	$self->{vertical} ? ($h, $w) : ($w, $h)
2172	}	2228	}
2173		2229
2174	sub button_down {	2230	sub button_down {
2175	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
2176		2232
…		…
2326	$self->{fontsize} = $fontsize;	2382	$self->{fontsize} = $fontsize;
2327	$self->reflow;	2383	$self->reflow;
2328	}	2384	}
2329		2385
2330	sub size_allocate {	2386	sub size_allocate {
2331	my ($self, $w, $h) = @_;	2387	my ($self, $w, $h, $changed) = @_;
2332		2388
2333	$self->SUPER::size_allocate ($w, $h);	2389	$self->SUPER::size_allocate ($w, $h, $changed);
		2390
		2391	return unless $changed;
2334		2392
2335	$self->{layout}->set_font ($self->{font}) if $self->{font};	2393	$self->{layout}->set_font ($self->{font}) if $self->{font};
2336	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337	$self->{layout}->set_width ($self->{children}[0]{w});	2395	$self->{layout}->set_width ($self->{children}[0]{w});
2338		2396
…		…
2527		2585
2528	sub new {	2586	sub new {
2529	my $class = shift;	2587	my $class = shift;
2530		2588
2531	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2532	state => 0,	2590	state => 0,
2533	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2534	@_	2592	@_
2535	);	2593	);
2536		2594
2537	if ($self->{state}) {
2538	$self->{state} = 0;
2539	$self->toggle_flopper;
2540	}
2541
2542	$self	2595	$self
2543	}	2596	}
2544		2597
2545	sub toggle_flopper {	2598	sub toggle_flopper {
2546	my ($self) = @_;	2599	my ($self) = @_;
2547		2600
2548	# TODO: use animation	2601	$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	}	2602	}
2560		2603
2561	#############################################################################	2604	#############################################################################
2562		2605
2563	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2595		2638
2596	($w + 4, $h + 4)	2639	($w + 4, $h + 4)
2597	}	2640	}
2598		2641
2599	sub size_allocate {	2642	sub size_allocate {
2600	my ($self, $w, $h) = @_;	2643	my ($self, $w, $h, $changed) = @_;
2601		2644
		2645	return unless $changed;
		2646
2602	$self->SUPER::size_allocate ($w - 4, $h - 4);	2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2648	}
		2649
		2650	sub visibility_change {
		2651	my ($self, $visible) = @_;
		2652
		2653	return unless $visible;
		2654
		2655	$self->{root}->on_post_alloc ("move_$self" => sub {
		2656	my $widget = $self->{owner}
		2657	or return;
		2658
		2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2660
		2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2662	if $x + $self->{w} > $::WIDTH;
		2663
		2664	$self->move_abs ($x, $y);
		2665	});
2603	}	2666	}
2604		2667
2605	sub _draw {	2668	sub _draw {
2606	my ($self) = @_;	2669	my ($self) = @_;
2607		2670
…		…
2624	glVertex $w, $h;	2687	glVertex $w, $h;
2625	glVertex $w, 0;	2688	glVertex $w, 0;
2626	glEnd;	2689	glEnd;
2627		2690
2628	glTranslate 2 - 0.375, 2 - 0.375;	2691	glTranslate 2 - 0.375, 2 - 0.375;
		2692
2629	$self->SUPER::_draw;	2693	$self->SUPER::_draw;
2630	}	2694	}
2631		2695
2632	#############################################################################	2696	#############################################################################
2633		2697
…		…
2709	$self->SUPER::DESTROY;	2773	$self->SUPER::DESTROY;
2710	}	2774	}
2711		2775
2712	#############################################################################	2776	#############################################################################
2713		2777
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;	2778	package CFClient::UI::Inventory;
2801		2779
2802	our @ISA = CFClient::UI::ScrolledWindow::;	2780	our @ISA = CFClient::UI::ScrolledWindow::;
2803		2781
2804	sub new {	2782	sub new {
…		…
2833	$self->{scrolled}->add (1, $row, $item->{desc_widget});	2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2834	$self->{scrolled}->add (2, $row, $item->{weight_widget});	2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2835		2813
2836	$row++;	2814	$row++;
2837	}	2815	}
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	}	2816	}
2846		2817
2847	#############################################################################	2818	#############################################################################
2848		2819
2849	package CFClient::UI::Menu;	2820	package CFClient::UI::Menu;
…		…
2891	# maybe save $GRAB? must be careful about events...	2862	# maybe save $GRAB? must be careful about events...
2892	$GRAB = $self;	2863	$GRAB = $self;
2893	$self->{button} = $ev->{button};	2864	$self->{button} = $ev->{button};
2894		2865
2895	$self->show;	2866	$self->show;
2896	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897	}	2868	}
2898		2869
2899	sub mouse_motion {	2870	sub mouse_motion {
2900	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2901		2872
…		…
3035	use CFClient::OpenGL;	3006	use CFClient::OpenGL;
3036		3007
3037	sub new {	3008	sub new {
3038	my $class = shift;	3009	my $class = shift;
3039		3010
3040	$class->SUPER::new (	3011	my $self = $class->SUPER::new (
		3012	visible => 1,
3041	@_,	3013	@_,
3042	)	3014	);
		3015
		3016	Scalar::Util::weaken ($self->{root} = $self);
		3017
		3018	$self
3043	}	3019	}
3044		3020
3045	sub configure {	3021	sub configure {
3046	my ($self, $x, $y, $w, $h) = @_;	3022	my ($self, $x, $y, $w, $h) = @_;
3047		3023
3048	$self->{w} = $w;	3024	$self->{w} = $w;
3049	$self->{h} = $h;	3025	$self->{h} = $h;
3050	}	3026	}
3051		3027
3052	sub check_size {	3028	sub reconfigure {
3053	my ($self) = @_;	3029	my ($self) = @_;
3054		3030
		3031	$self->SUPER::reconfigure;
		3032
3055	$self->size_allocate ($self->{w}, $self->{h})	3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3056	if $self->{w};	3034	if $self->{w};
3057	}	3035	}
3058		3036
3059	sub size_request {	3037	sub size_request {
3060	my ($self) = @_;	3038	my ($self) = @_;
3061		3039
3062	($self->{w}, $self->{h})	3040	($self->{w}, $self->{h})
3063	}	3041	}
3064		3042
		3043	sub _to_pixel {
		3044	my ($coord, $size, $max) = @_;
		3045
		3046	$coord =
		3047	$coord eq "center" ? ($max - $size) * 0.5
		3048	: $coord eq "max" ? $max
		3049	: $coord;
		3050
		3051	$coord = 0 if $coord < 0;
		3052	$coord = $max - $size if $coord > $max - $size;
		3053
		3054	int $coord + 0.5
		3055	}
		3056
3065	sub size_allocate {	3057	sub size_allocate {
3066	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h, $changed) = @_;
3067		3059
3068	for my $child ($self->children) {	3060	for my $child ($self->children) {
3069	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070		3062
3071	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3063	$X = $child->{force_x} if exists $child->{force_x};
3072	if exists $child->{req_x};	3064	$Y = $child->{force_y} if exists $child->{force_y};
3073		3065
3074	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3066	$X = _to_pixel $X, $W, $self->{w};
3075	if exists $child->{req_y};	3067	$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		3068
3080	$child->configure ($X, $Y, $W, $H);	3069	$child->configure ($X, $Y, $W, $H);
3081	}	3070	}
3082	}	3071	}
3083		3072
…		…
3094	}	3083	}
3095		3084
3096	sub update {	3085	sub update {
3097	my ($self) = @_;	3086	my ($self) = @_;
3098		3087
3099	$self->check_size;
3100	$::WANT_REFRESH++;	3088	$::WANT_REFRESH++;
3101	}	3089	}
3102		3090
3103	sub add {	3091	sub add {
3104	my ($self, @children) = @_;	3092	my ($self, @children) = @_;
3105		3093
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;	3094	$_->{is_toplevel} = 1
3114		3095	for @children;
3115	# integerise window positions
3116	$child->{x} = int $child->{x};
3117	$child->{y} = int $child->{y};
3118	}
3119		3096
3120	$self->SUPER::add (@children);	3097	$self->SUPER::add (@children);
3121	}	3098	}
3122		3099
3123	sub remove {	3100	sub remove {
3124	my ($self, @children) = @_;	3101	my ($self, @children) = @_;
3125		3102
3126	$self->SUPER::remove (@children);	3103	$self->SUPER::remove (@children);
		3104
		3105	delete $self->{is_toplevel}
		3106	for @children;
3127		3107
3128	while (@children) {	3108	while (@children) {
3129	my $w = pop @children;	3109	my $w = pop @children;
3130	push @children, $w->children;	3110	push @children, $w->children;
3131	$w->set_invisible;	3111	$w->set_invisible;
…		…
3150	while ($self->{refresh_hook}) {	3130	while ($self->{refresh_hook}) {
3151	$_->()	3131	$_->()
3152	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{refresh_hook}};
3153	}	3133	}
3154		3134
3155	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3156	my @queue = ([], []);	3136	my @queue;
3157		3137
3158	for (;;) {	3138	while () {
3159	if ($self->{check_size}) {	3139	if ($self->{realloc}) {
3160	# heuristic: check containers last	3140	#TODO use array-of-depth approach
3161	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3141
3162	for values %{delete $self->{check_size}}	3142	@queue = sort { $a->{visible} <=> $b->{visible} }
		3143	@queue, values %{delete $self->{realloc}};
3163	}	3144	}
3164		3145
3165	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3146	my $widget = pop @queue || last;
3166		3147
3167	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3148	$widget->{visible} or last; # do not resize invisible widgets
3168	? @$widget{qw(user_w user_h)}	3149
3169	: $widget->size_request;	3150	my ($w, $h) = $widget->size_request;
3170		3151
3171	if (delete $widget->{force_alloc}	3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3172	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3173	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3154
3174		3155	$w = $widget->{force_w} if exists $widget->{force_w};
		3156	$h = $widget->{force_h} if exists $widget->{force_h};
		3157
3175	$widget->{req_w} = $w;	3158	$widget->{req_w} = $w;
3176	$widget->{req_h} = $h;	3159	$widget->{req_h} = $h;
3177		3160
3178	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3179		3162
3180	$widget->{parent}->check_size	3163	push @queue, $widget->{parent}
3181	if $widget->{parent};	3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3182	}
3183	}	3165	}
3184	}	3166	}
3185		3167
3186	while ($self->{size_alloc}) {	3168	while (my $size_alloc = delete $self->{size_alloc}) {
3187	for (values %{delete $self->{size_alloc}}) {	3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3188	my ($widget, $w, $h) = @$_;	3170	values %$size_alloc;
		3171
		3172	while () {
		3173	my ($widget, $w, $h) = @{ pop @queue or last };
		3174
		3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;
		3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3189		3177
3190	$w = 0 if $w < 0;	3178	$w = 0 if $w < 0;
3191	$h = 0 if $h < 0;	3179	$h = 0 if $h < 0;
3192		3180
		3181	$w = int $w + 0.5;
		3182	$h = int $h + 0.5;
		3183
		3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3185
3193	$widget->{w} = $w;	3186	$widget->{w} = $w;
3194	$widget->{h} = $h;	3187	$widget->{h} = $h;
		3188
3195	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h, $changed);
3196	}	3190	}
3197	}	3191	}
3198		3192
3199	while ($self->{post_alloc_hook}) {	3193	while ($self->{post_alloc_hook}) {
3200	$_->()	3194	$_->()

Diff Legend

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