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.237 by root, Thu May 25 21:36:45 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	$self->{root} = $parent->{root};
464	$self->{visible} = $parent->{visible};
465
466	# TODO: req_w _does_change after ->reconfigure
467	$self->check_size
468	unless exists $self->{req_w};
469
470	$self->show;
471	}
472
473	sub check_size {
474	my ($self, $forced) = @_;
475
476	$self->{force_alloc} = 1 if $forced;
477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
478	}
479
480	sub update {
481	my ($self) = @_;
482
483	$self->{parent}->update
484	if $self->{parent};
485	}
486
487	sub connect {
488	my ($self, $signal, $cb) = @_;
489
490	push @{ $self->{signal_cb}{$signal} }, $cb;
491	}
492
493	sub _emit {
494	my ($self, $signal, @args) = @_;
495
496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497	}
498
499	sub emit {
500	my ($self, $signal, @args) = @_;
501
502	$self->_emit ($signal, @args)
503	|| $self->$signal (@args);
504	}
505
506	sub DESTROY {	572	sub DESTROY {
507	my ($self) = @_;	573	my ($self) = @_;
508		574
509	delete $WIDGET{$self+0};	575	delete $WIDGET{$self+0};
510	#$self->deactivate;	576	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	632	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	633	$class->SUPER::new (can_events => 0, %arg);
568	}	634	}
569		635
570	sub size_request {	636	sub size_request {
571	(0, 0)	637	my ($self) = @_;
		638
		639	($self->{w} + 0, $self->{h} + 0)
572	}	640	}
573		641
574	sub draw { }	642	sub draw { }
575		643
576	#############################################################################	644	#############################################################################
…		…
605	$self->{children} = [	673	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	674	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	675	@{$self->{children}}, @widgets
608	];	676	];
609		677
610	$self->check_size (1);	678	$self->realloc;
611	$self->update;
612	}	679	}
613		680
614	sub children {	681	sub children {
615	@{ $_[0]{children} }	682	@{ $_[0]{children} }
616	}	683	}
…		…
621	delete $child->{parent};	688	delete $child->{parent};
622	$child->hide;	689	$child->hide;
623		690
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	691	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		692
626	$self->check_size (1);	693	$self->realloc;
627	$self->update;
628	}	694	}
629		695
630	sub clear {	696	sub clear {
631	my ($self) = @_;	697	my ($self) = @_;
632		698
…		…
636	for (@$children) {	702	for (@$children) {
637	delete $_->{parent};	703	delete $_->{parent};
638	$_->hide;	704	$_->hide;
639	}	705	}
640		706
641	$self->check_size;	707	$self->realloc;
642	$self->update;
643	}	708	}
644		709
645	sub find_widget {	710	sub find_widget {
646	my ($self, $x, $y) = @_;	711	my ($self, $x, $y) = @_;
647		712
…		…
700	sub size_request {	765	sub size_request {
701	$_[0]{children}[0]->size_request	766	$_[0]{children}[0]->size_request
702	}	767	}
703		768
704	sub size_allocate {	769	sub size_allocate {
705	my ($self, $w, $h) = @_;	770	my ($self, $w, $h, $changed) = @_;
706		771
707	$self->{children}[0]->configure (0, 0, $w, $h);	772	$self->{children}[0]->configure (0, 0, $w, $h);
708	}	773	}
709		774
710	#############################################################################	775	#############################################################################
…		…
727	$ROOT->on_post_alloc ($self => sub { $self->render_child });	792	$ROOT->on_post_alloc ($self => sub { $self->render_child });
728	$self->SUPER::update;	793	$self->SUPER::update;
729	}	794	}
730		795
731	sub size_allocate {	796	sub size_allocate {
732	my ($self, $w, $h) = @_;	797	my ($self, $w, $h, $changed) = @_;
733		798
734	$self->SUPER::size_allocate ($w, $h);	799	$self->SUPER::size_allocate ($w, $h, $changed);
735	$self->update;	800	$self->update
		801	if $changed;
736	}	802	}
737		803
738	sub _render {	804	sub _render {
739	$_[0]{children}[0]->draw;	805	$_[0]{children}[0]->draw;
740	}	806	}
…		…
784	}	850	}
785		851
786	sub size_request {	852	sub size_request {
787	my ($self) = @_;	853	my ($self) = @_;
788		854
789	@$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)};
790		856
791	@$self{qw(child_w child_h)}	857	$w = 10 if $self->{scroll_x};
		858	$h = 10 if $self->{scroll_y};
		859
		860	($w, $h)
792	}	861	}
793		862
794	sub size_allocate {	863	sub size_allocate {
795	my ($self, $w, $h) = @_;	864	my ($self, $w, $h, $changed) = @_;
796		865
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799		868
800	$self->child->configure (0, 0, $w, $h);	869	$self->child->configure (0, 0, $w, $h);
…		…
856	my $class = shift;	925	my $class = shift;
857		926
858	my $self;	927	my $self;
859		928
860	my $slider = new CFClient::UI::Slider	929	my $slider = new CFClient::UI::Slider
861	vertical => 1,	930	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	931	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	932	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	933	$self->{vp}->set_offset (0, $_[1]);
865	},	934	},
866	;	935	;
867		936
868	$self = $class->SUPER::new (	937	$self = $class->SUPER::new (
…		…
876	$self->add ($self->{slider});	945	$self->add ($self->{slider});
877		946
878	$self	947	$self
879	}	948	}
880		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
881	sub size_allocate {	960	sub size_allocate {
882	my ($self, $w, $h) = @_;	961	my ($self, $w, $h, $changed) = @_;
883		962
884	$self->SUPER::size_allocate ($w, $h);	963	$self->SUPER::size_allocate ($w, $h, $changed);
885		964
886	my $child = $self->{vp}->child;	965	my $child = $self->{vp}->child;
887	$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]);
888	}	967	}
889		968
…		…
936		1015
937	our @ISA = CFClient::UI::Bin::;	1016	our @ISA = CFClient::UI::Bin::;
938		1017
939	use CFClient::OpenGL;	1018	use CFClient::OpenGL;
940		1019
941	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 =
942	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943	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);
944		1027
945	sub new {	1028	sub new {
946	my $class = shift;	1029	my $class = shift;
947
948	# TODO: user_x, user_y, overwrite moveto?
949		1030
950	my $self = $class->SUPER::new (	1031	my $self = $class->SUPER::new (
951	bg => [1, 1, 1, 1],	1032	bg => [1, 1, 1, 1],
952	border_bg => [1, 1, 1, 1],	1033	border_bg => [1, 1, 1, 1],
953	border => 0.6,	1034	border => 0.6,
954	is_toplevel => 1,
955	can_events => 1,	1035	can_events => 1,
		1036	min_w => 16,
		1037	min_h => 16,
956	@_	1038	@_
957	);	1039	);
958		1040
959	$self->{title} &&= new CFClient::UI::Label	1041	$self->{title} &&= new CFClient::UI::Label
960	align => 0,	1042	align => 0,
…		…
979	$h + $self->border * 2,	1061	$h + $self->border * 2,
980	)	1062	)
981	}	1063	}
982		1064
983	sub size_allocate {	1065	sub size_allocate {
984	my ($self, $w, $h) = @_;	1066	my ($self, $w, $h, $changed) = @_;
		1067
		1068	return unless $changed;
985		1069
986	$h -= List::Util::max 0, $self->border * 2;	1070	$h -= List::Util::max 0, $self->border * 2;
987	$w -= List::Util::max 0, $self->border * 2;	1071	$w -= List::Util::max 0, $self->border * 2;
988		1072
989	$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)
…		…
1013	my ($ev, $x, $y) = @_;	1097	my ($ev, $x, $y) = @_;
1014		1098
1015	my $dx = $ev->{x} - $ox;	1099	my $dx = $ev->{x} - $ox;
1016	my $dy = $ev->{y} - $oy;	1100	my $dy = $ev->{y} - $oy;
1017		1101
1018	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1104
		1105	$self->realloc;
1020	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021	$self->check_size;
1022	};	1107	};
1023		1108
1024	} elsif ($lr ^ $td) {	1109	} elsif ($lr ^ $td) {
1025	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026	my ($bx, $by) = ($self->{x}, $self->{y});	1111	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1028	$self->{motion} = sub {	1113	$self->{motion} = sub {
1029	my ($ev, $x, $y) = @_;	1114	my ($ev, $x, $y) = @_;
1030		1115
1031	($x, $y) = ($ev->{x}, $ev->{y});	1116	($x, $y) = ($ev->{x}, $ev->{y});
1032		1117
1033	$self->move ($bx + $x - $ox, $by + $y - $oy);	1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034	$self->update;
1035	};	1119	};
1036	}	1120	}
1037	}	1121	}
1038		1122
1039	sub button_up {	1123	sub button_up {
…		…
1058	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059		1143
1060	my $border = $self->border;	1144	my $border = $self->border;
1061		1145
1062	glColor @{ $self->{border_bg} };	1146	glColor @{ $self->{border_bg} };
1063	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1064	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067		1151
1068	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069	my $bg = $tex[0];	1153	glColor @{ $self->{bg} };
1070		1154
1071	# TODO: repeat texture not scale	1155	# TODO: repeat texture not scale
		1156	# solve this better(?)
1072	my $rep_x = $cw / $bg->{w};	1157	$bg->{s} = $cw / $bg->{w};
1073	my $rep_y = $ch / $bg->{h};	1158	$bg->{t} = $ch / $bg->{h};
1074
1075	glColor @{ $self->{bg} };
1076
1077	$bg->{s} = $rep_x;
1078	$bg->{t} = $rep_y;
1079	$bg->{wrap_mode} = 1;
1080	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081	}	1160	}
1082		1161
1083	glDisable GL_TEXTURE_2D;	1162	glDisable GL_TEXTURE_2D;
1084		1163
…		…
1114	my ($self, $x, $y, $child) = @_;	1193	my ($self, $x, $y, $child) = @_;
1115		1194
1116	$child->set_parent ($self);	1195	$child->set_parent ($self);
1117	$self->{children}[$y][$x] = $child;	1196	$self->{children}[$y][$x] = $child;
1118		1197
1119	$self->check_size (1);	1198	$self->realloc;
1120	}	1199	}
1121		1200
1122	# TODO: move to container class maybe? send children a signal on removal?	1201	# TODO: move to container class maybe? send children a signal on removal?
1123	sub clear {	1202	sub clear {
1124	my ($self) = @_;	1203	my ($self) = @_;
…		…
1129	for (@children) {	1208	for (@children) {
1130	delete $_->{parent};	1209	delete $_->{parent};
1131	$_->hide;	1210	$_->hide;
1132	}	1211	}
1133		1212
1134	$self->check_size (1);	1213	$self->realloc;
1135	$self->update;
1136	}	1214	}
1137		1215
1138	sub get_wh {	1216	sub get_wh {
1139	my ($self) = @_;	1217	my ($self) = @_;
1140		1218
…		…
1167	(sum @$hs),	1245	(sum @$hs),
1168	)	1246	)
1169	}	1247	}
1170		1248
1171	sub size_allocate {	1249	sub size_allocate {
1172	my ($self, $w, $h) = @_;	1250	my ($self, $w, $h, $changed) = @_;
1173		1251
1174	my ($ws, $hs) = $self->get_wh;	1252	my ($ws, $hs) = $self->get_wh;
1175		1253
1176	my $req_w = sum @$ws;	1254	my $req_w = (sum @$ws) || 1;
1177	my $req_h = sum @$hs;	1255	my $req_h = (sum @$hs) || 1;
1178		1256
1179	# TODO: nicer code && do row_expand	1257	# TODO: nicer code && do row_expand
1180	my @col_expand = @{$self->{col_expand}};	1258	my @col_expand = @{$self->{col_expand}};
1181	@col_expand = (1) x @$ws unless @col_expand;	1259	@col_expand = (1) x @$ws unless @col_expand;
1182	my $col_expand = (sum @col_expand) || 1;	1260	my $col_expand = (sum @col_expand) || 1;
…		…
1236	}	1314	}
1237	}	1315	}
1238		1316
1239	#############################################################################	1317	#############################################################################
1240		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
1241	package CFClient::UI::HBox;	1379	package CFClient::UI::HBox;
1242		1380
1243	# TODO: wrap into common Box base class
1244
1245	our @ISA = CFClient::UI::Container::;	1381	our @ISA = CFClient::UI::Box::;
1246		1382
1247	sub size_request {	1383	sub new {
1248	my ($self) = @_;	1384	my $class = shift;
1249		1385
1250	my @alloc = map [$_->size_request], @{$self->{children}};	1386	$class->SUPER::new (
1251		1387	vertical => 0,
1252	(	1388	@_,
1253	(List::Util::sum map $_->[0], @alloc),
1254	(List::Util::max map $_->[1], @alloc),
1255	)	1389	)
1256	}	1390	}
1257		1391
1258	sub size_allocate {
1259	my ($self, $w, $h) = @_;
1260
1261	($h, $w) = ($w, $h);
1262
1263	my $children = $self->{children};
1264
1265	my @h = map $_->{req_w}, @$children;
1266
1267	my $req_h = List::Util::sum @h;
1268
1269	if ($req_h > $h) {
1270	# ah well, not enough space
1271	$_ *= $h / $req_h for @h;
1272	} else {
1273	my $exp = List::Util::sum map $_->{expand}, @$children;
1274	$exp ||= 1;
1275
1276	for (0 .. $#$children) {
1277	my $child = $children->[$_];
1278
1279	my $alloc_h = $h[$_];
1280	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281	$h[$_] = $alloc_h;
1282	}
1283	}
1284
1285	CFClient::UI::harmonize \@h;
1286
1287	my $y = 0;
1288	for (0 .. $#$children) {
1289	my $child = $children->[$_];
1290	my $h = $h[$_];
1291	$child->configure ($y, 0, $h, $w);
1292
1293	$y += $h;
1294	}
1295
1296	1
1297	}
1298
1299	#############################################################################	1392	#############################################################################
1300		1393
1301	package CFClient::UI::VBox;	1394	package CFClient::UI::VBox;
1302		1395
1303	# TODO: wrap into common Box base class
1304
1305	our @ISA = CFClient::UI::Container::;	1396	our @ISA = CFClient::UI::Box::;
1306		1397
1307	sub size_request {	1398	sub new {
1308	my ($self) = @_;	1399	my $class = shift;
1309		1400
1310	my @alloc = map [$_->size_request], @{$self->{children}};	1401	$class->SUPER::new (
1311		1402	vertical => 1,
1312	(	1403	@_,
1313	(List::Util::max map $_->[0], @alloc),
1314	(List::Util::sum map $_->[1], @alloc),
1315	)	1404	)
1316	}
1317
1318	sub size_allocate {
1319	my ($self, $w, $h) = @_;
1320
1321	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323	my $children = $self->{children};
1324
1325	my @h = map $_->{req_h}, @$children;
1326
1327	my $req_h = List::Util::sum @h;
1328
1329	if ($req_h > $h) {
1330	# ah well, not enough space
1331	$_ *= $h / $req_h for @h;
1332	} else {
1333	my $exp = List::Util::sum map $_->{expand}, @$children;
1334	$exp ||= 1;
1335
1336	for (0 .. $#$children) {
1337	my $child = $children->[$_];
1338
1339	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340	}
1341	}
1342
1343	CFClient::UI::harmonize \@h;
1344
1345	my $y = 0;
1346	for (0 .. $#$children) {
1347	my $child = $children->[$_];
1348	my $h = $h[$_];
1349	$child->configure (0, $y, $w, $h);
1350
1351	$y += $h;
1352	}
1353
1354	1
1355	}	1405	}
1356		1406
1357	#############################################################################	1407	#############################################################################
1358		1408
1359	package CFClient::UI::Label;	1409	package CFClient::UI::Label;
…		…
1376	ellipsise => 3, # end	1426	ellipsise => 3, # end
1377	layout => (new CFClient::Layout),	1427	layout => (new CFClient::Layout),
1378	fontsize => 1,	1428	fontsize => 1,
1379	align => -1,	1429	align => -1,
1380	valign => -1,	1430	valign => -1,
1381	padding => 2,	1431	padding_x => 2,
		1432	padding_y => 2,
1382	can_events => 0,	1433	can_events => 0,
1383	%arg	1434	%arg
1384	);	1435	);
1385		1436
1386	if (exists $self->{template}) {	1437	if (exists $self->{template}) {
…		…
1422	$self->{text} = "T$text";	1473	$self->{text} = "T$text";
1423		1474
1424	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425	$self->{layout}->set_text ($text);	1476	$self->{layout}->set_text ($text);
1426		1477
		1478	$self->realloc;
1427	$self->update;	1479	$self->update;
1428	$self->check_size;
1429	}	1480	}
1430		1481
1431	sub set_markup {	1482	sub set_markup {
1432	my ($self, $markup) = @_;	1483	my ($self, $markup) = @_;
1433		1484
…		…
1437	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438		1489
1439	$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;
1440	$self->{layout}->set_markup ($markup);	1491	$self->{layout}->set_markup ($markup);
1441		1492
		1493	$self->realloc;
1442	$self->update;	1494	$self->update;
1443	$self->check_size;
1444	}	1495	}
1445		1496
1446	sub size_request {	1497	sub size_request {
1447	my ($self) = @_;	1498	my ($self) = @_;
1448		1499
…		…
1462		1513
1463	$w = List::Util::max $w, $w2;	1514	$w = List::Util::max $w, $w2;
1464	$h = List::Util::max $h, $h2;	1515	$h = List::Util::max $h, $h2;
1465	}	1516	}
1466		1517
1467	(	1518	($w, $h)
1468	$w + $self->{padding} * 2,
1469	$h + $self->{padding} * 2,
1470	)
1471	}	1519	}
1472		1520
1473	sub size_allocate {	1521	sub size_allocate {
1474	my ($self, $w, $h) = @_;	1522	my ($self, $w, $h, $changed) = @_;
1475		1523
1476	delete $self->{texture};	1524	delete $self->{texture}
		1525	if $changed;
1477	}	1526	}
1478		1527
1479	sub set_fontsize {	1528	sub set_fontsize {
1480	my ($self, $fontsize) = @_;	1529	my ($self, $fontsize) = @_;
1481		1530
1482	$self->{fontsize} = $fontsize;	1531	$self->{fontsize} = $fontsize;
1483	delete $self->{texture};	1532	delete $self->{texture};
1484		1533
1485	$self->update;	1534	$self->realloc;
1486	$self->check_size;
1487	}	1535	}
1488		1536
1489	sub _draw {	1537	sub _draw {
1490	my ($self) = @_;	1538	my ($self) = @_;
1491		1539
…		…
1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501		1549
1502	my $tex = new_from_layout CFClient::Texture $self->{layout};	1550	my $tex = new_from_layout CFClient::Texture $self->{layout};
1503		1551
1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506	: ($self->{w} - $tex->{w}) * 0.5);	1554	: ($self->{w} - $tex->{w}) * 0.5);
1507		1555
1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510	: ($self->{h} - $tex->{h}) * 0.5);	1558	: ($self->{h} - $tex->{h}) * 0.5);
1511		1559
1512	$tex	1560	$tex
1513	};	1561	};
1514		1562
…		…
1571	sub set_text {	1619	sub set_text {
1572	my ($self, $text) = @_;	1620	my ($self, $text) = @_;
1573		1621
1574	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1575	$self->_set_text ($text);	1623	$self->_set_text ($text);
1576	$self->update;	1624
1577	$self->check_size;	1625	$self->realloc;
1578	}	1626	}
1579		1627
1580	sub get_text {	1628	sub get_text {
1581	$_[0]{text}	1629	$_[0]{text}
1582	}	1630	}
…		…
1615	} elsif ($uni) {	1663	} elsif ($uni) {
1616	substr $text, $self->{cursor}++, 0, chr $uni;	1664	substr $text, $self->{cursor}++, 0, chr $uni;
1617	}	1665	}
1618		1666
1619	$self->_set_text ($text);	1667	$self->_set_text ($text);
1620	$self->update;	1668
1621	$self->check_size;	1669	$self->realloc;
1622	}	1670	}
1623		1671
1624	sub focus_in {	1672	sub focus_in {
1625	my ($self) = @_;	1673	my ($self) = @_;
1626		1674
…		…
1753		1801
1754	sub new {	1802	sub new {
1755	my $class = shift;	1803	my $class = shift;
1756		1804
1757	$class->SUPER::new (	1805	$class->SUPER::new (
1758	padding => 4,	1806	padding_x => 4,
		1807	padding_y => 4,
1759	fg => [1, 1, 1],	1808	fg => [1, 1, 1],
1760	active_fg => [0, 0, 1],	1809	active_fg => [0, 0, 1],
1761	can_hover => 1,	1810	can_hover => 1,
1762	align => 0,	1811	align => 0,
1763	valign => 0,	1812	valign => 0,
…		…
1810		1859
1811	sub new {	1860	sub new {
1812	my $class = shift;	1861	my $class = shift;
1813		1862
1814	$class->SUPER::new (	1863	$class->SUPER::new (
1815	padding => 2,	1864	padding_x => 2,
		1865	padding_y => 2,
1816	fg => [1, 1, 1],	1866	fg => [1, 1, 1],
1817	active_fg => [1, 1, 0],	1867	active_fg => [1, 1, 0],
1818	bg => [0, 0, 0, 0.2],	1868	bg => [0, 0, 0, 0.2],
1819	active_bg => [1, 1, 1, 0.5],	1869	active_bg => [1, 1, 1, 0.5],
1820	state => 0,	1870	state => 0,
…		…
1824	}	1874	}
1825		1875
1826	sub size_request {	1876	sub size_request {
1827	my ($self) = @_;	1877	my ($self) = @_;
1828		1878
1829	($self->{padding} * 2 + 6) x 2	1879	(6) x 2
1830	}	1880	}
1831		1881
1832	sub button_down {	1882	sub button_down {
1833	my ($self, $ev, $x, $y) = @_;	1883	my ($self, $ev, $x, $y) = @_;
1834		1884
1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837	$self->{state} = !$self->{state};	1887	$self->{state} = !$self->{state};
1838	$self->_emit (changed => $self->{state});	1888	$self->_emit (changed => $self->{state});
1839	}	1889	}
1840	}	1890	}
1841		1891
1842	sub _draw {	1892	sub _draw {
1843	my ($self) = @_;	1893	my ($self) = @_;
1844		1894
1845	$self->SUPER::_draw;	1895	$self->SUPER::_draw;
1846		1896
1847	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1897	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848		1898
1849	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;
1850		1902
1851	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1903	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852		1904
1853	my $tex = $self->{state} ? $tex[1] : $tex[0];	1905	my $tex = $self->{state} ? $tex[1] : $tex[0];
1854		1906
…		…
2119	fg => [1, 1, 1],	2171	fg => [1, 1, 1],
2120	active_fg => [0, 0, 0],	2172	active_fg => [0, 0, 0],
2121	bg => [0, 0, 0, 0.2],	2173	bg => [0, 0, 0, 0.2],
2122	active_bg => [1, 1, 1, 0.5],	2174	active_bg => [1, 1, 1, 0.5],
2123	range => [0, 0, 100, 10, 0],	2175	range => [0, 0, 100, 10, 0],
2124	req_w => $::WIDTH / 80,	2176	min_w => $::WIDTH / 80,
2125	req_h => $::WIDTH / 80,	2177	min_h => $::WIDTH / 80,
2126	vertical => 0,	2178	vertical => 0,
2127	can_hover => 1,	2179	can_hover => 1,
2128	inner_pad => 0.02,	2180	inner_pad => 0.02,
2129	@_	2181	@_
2130	);	2182	);
…		…
2133	$self->update;	2185	$self->update;
2134		2186
2135	$self	2187	$self
2136	}	2188	}
2137		2189
		2190	sub changed { }
		2191
2138	sub set_range {	2192	sub set_range {
2139	my ($self, $range) = @_;	2193	my ($self, $range) = @_;
2140		2194
2141	$self->{range} = $range;	2195	($range, $self->{range}) = ($self->{range}, $range);
2142		2196
2143	$self->update;	2197	$self->update
		2198	if "@$range" ne "@{$self->{range}}";
2144	}	2199	}
2145		2200
2146	sub set_value {	2201	sub set_value {
2147	my ($self, $value) = @_;	2202	my ($self, $value) = @_;
2148		2203
…		…
2167	}	2222	}
2168		2223
2169	sub size_request {	2224	sub size_request {
2170	my ($self) = @_;	2225	my ($self) = @_;
2171		2226
2172	my $w = $self->{req_w};	2227	($self->{req_w}, $self->{req_h})
2173	my $h = $self->{req_h};
2174
2175	$self->{vertical} ? ($h, $w) : ($w, $h)
2176	}	2228	}
2177		2229
2178	sub button_down {	2230	sub button_down {
2179	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
2180		2232
…		…
2330	$self->{fontsize} = $fontsize;	2382	$self->{fontsize} = $fontsize;
2331	$self->reflow;	2383	$self->reflow;
2332	}	2384	}
2333		2385
2334	sub size_allocate {	2386	sub size_allocate {
2335	my ($self, $w, $h) = @_;	2387	my ($self, $w, $h, $changed) = @_;
2336		2388
2337	$self->SUPER::size_allocate ($w, $h);	2389	$self->SUPER::size_allocate ($w, $h, $changed);
		2390
		2391	return unless $changed;
2338		2392
2339	$self->{layout}->set_font ($self->{font}) if $self->{font};	2393	$self->{layout}->set_font ($self->{font}) if $self->{font};
2340	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2341	$self->{layout}->set_width ($self->{children}[0]{w});	2395	$self->{layout}->set_width ($self->{children}[0]{w});
2342		2396
…		…
2531		2585
2532	sub new {	2586	sub new {
2533	my $class = shift;	2587	my $class = shift;
2534		2588
2535	my $self = $class->SUPER::new (	2589	my $self = $class->SUPER::new (
2536	state => 0,	2590	state => 0,
2537	connect_activate => \&toggle_flopper,	2591	on_activate => \&toggle_flopper,
2538	@_	2592	@_
2539	);	2593	);
2540		2594
2541	if ($self->{state}) {
2542	$self->{state} = 0;
2543	$self->toggle_flopper;
2544	}
2545
2546	$self	2595	$self
2547	}	2596	}
2548		2597
2549	sub toggle_flopper {	2598	sub toggle_flopper {
2550	my ($self) = @_;	2599	my ($self) = @_;
2551		2600
2552	# TODO: use animation	2601	$self->{other}->toggle_visibility;
2553	if ($self->{state} = !$self->{state}) {
2554	$CFClient::UI::ROOT->add ($self->{other});
2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2556	$self->_emit ("open");
2557	} else {
2558	$CFClient::UI::ROOT->remove ($self->{other});
2559	$self->_emit ("close");
2560	}
2561
2562	$self->_emit (changed => $self->{state});
2563	}	2602	}
2564		2603
2565	#############################################################################	2604	#############################################################################
2566		2605
2567	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2599		2638
2600	($w + 4, $h + 4)	2639	($w + 4, $h + 4)
2601	}	2640	}
2602		2641
2603	sub size_allocate {	2642	sub size_allocate {
2604	my ($self, $w, $h) = @_;	2643	my ($self, $w, $h, $changed) = @_;
2605		2644
		2645	return unless $changed;
		2646
2606	$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	});
2607	}	2666	}
2608		2667
2609	sub _draw {	2668	sub _draw {
2610	my ($self) = @_;	2669	my ($self) = @_;
2611		2670
…		…
2628	glVertex $w, $h;	2687	glVertex $w, $h;
2629	glVertex $w, 0;	2688	glVertex $w, 0;
2630	glEnd;	2689	glEnd;
2631		2690
2632	glTranslate 2 - 0.375, 2 - 0.375;	2691	glTranslate 2 - 0.375, 2 - 0.375;
		2692
2633	$self->SUPER::_draw;	2693	$self->SUPER::_draw;
2634	}	2694	}
2635		2695
2636	#############################################################################	2696	#############################################################################
2637		2697
…		…
2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});	2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});	2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2753		2813
2754	$row++;	2814	$row++;
2755	}	2815	}
2756
2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758	}
2759
2760	sub size_request {
2761	my ($self) = @_;
2762	($self->{req_w}, $self->{req_h});
2763	}	2816	}
2764		2817
2765	#############################################################################	2818	#############################################################################
2766		2819
2767	package CFClient::UI::Menu;	2820	package CFClient::UI::Menu;
…		…
2809	# maybe save $GRAB? must be careful about events...	2862	# maybe save $GRAB? must be careful about events...
2810	$GRAB = $self;	2863	$GRAB = $self;
2811	$self->{button} = $ev->{button};	2864	$self->{button} = $ev->{button};
2812		2865
2813	$self->show;	2866	$self->show;
2814	$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);
2815	}	2868	}
2816		2869
2817	sub mouse_motion {	2870	sub mouse_motion {
2818	my ($self, $ev, $x, $y) = @_;	2871	my ($self, $ev, $x, $y) = @_;
2819		2872
…		…
2953	use CFClient::OpenGL;	3006	use CFClient::OpenGL;
2954		3007
2955	sub new {	3008	sub new {
2956	my $class = shift;	3009	my $class = shift;
2957		3010
2958	$class->SUPER::new (	3011	my $self = $class->SUPER::new (
		3012	visible => 1,
2959	@_,	3013	@_,
2960	)	3014	);
		3015
		3016	Scalar::Util::weaken ($self->{root} = $self);
		3017
		3018	$self
2961	}	3019	}
2962		3020
2963	sub configure {	3021	sub configure {
2964	my ($self, $x, $y, $w, $h) = @_;	3022	my ($self, $x, $y, $w, $h) = @_;
2965		3023
2966	$self->{w} = $w;	3024	$self->{w} = $w;
2967	$self->{h} = $h;	3025	$self->{h} = $h;
2968	}	3026	}
2969		3027
2970	sub check_size {	3028	sub reconfigure {
2971	my ($self) = @_;	3029	my ($self) = @_;
2972		3030
		3031	$self->SUPER::reconfigure;
		3032
2973	$self->size_allocate ($self->{w}, $self->{h})	3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
2974	if $self->{w};	3034	if $self->{w};
2975	}	3035	}
2976		3036
2977	sub size_request {	3037	sub size_request {
2978	my ($self) = @_;	3038	my ($self) = @_;
2979		3039
2980	($self->{w}, $self->{h})	3040	($self->{w}, $self->{h})
2981	}	3041	}
2982		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
2983	sub size_allocate {	3057	sub size_allocate {
2984	my ($self, $w, $h) = @_;	3058	my ($self, $w, $h, $changed) = @_;
2985		3059
2986	for my $child ($self->children) {	3060	for my $child ($self->children) {
2987	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)};
2988		3062
2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3063	$X = $child->{force_x} if exists $child->{force_x};
2990	if exists $child->{req_x};	3064	$Y = $child->{force_y} if exists $child->{force_y};
2991		3065
2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3066	$X = _to_pixel $X, $W, $self->{w};
2993	if exists $child->{req_y};	3067	$Y = _to_pixel $Y, $H, $self->{h};
2994
2995	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997		3068
2998	$child->configure ($X, $Y, $W, $H);	3069	$child->configure ($X, $Y, $W, $H);
2999	}	3070	}
3000	}	3071	}
3001		3072
…		…
3012	}	3083	}
3013		3084
3014	sub update {	3085	sub update {
3015	my ($self) = @_;	3086	my ($self) = @_;
3016		3087
3017	$self->check_size;
3018	$::WANT_REFRESH++;	3088	$::WANT_REFRESH++;
3019	}	3089	}
3020		3090
3021	sub add {	3091	sub add {
3022	my ($self, @children) = @_;	3092	my ($self, @children) = @_;
3023		3093
3024	for (my @widgets = @children; my $w = pop @widgets; ) {
3025	push @widgets, $w->children;
3026	$w->{root} = $self;
3027	$w->{visible} = 1;
3028	}
3029
3030	for my $child (@children) {
3031	$child->{is_toplevel} = 1;	3094	$_->{is_toplevel} = 1
3032		3095	for @children;
3033	# integerise window positions
3034	$child->{x} = int $child->{x};
3035	$child->{y} = int $child->{y};
3036	}
3037		3096
3038	$self->SUPER::add (@children);	3097	$self->SUPER::add (@children);
3039	}	3098	}
3040		3099
3041	sub remove {	3100	sub remove {
3042	my ($self, @children) = @_;	3101	my ($self, @children) = @_;
3043		3102
3044	$self->SUPER::remove (@children);	3103	$self->SUPER::remove (@children);
		3104
		3105	delete $self->{is_toplevel}
		3106	for @children;
3045		3107
3046	while (@children) {	3108	while (@children) {
3047	my $w = pop @children;	3109	my $w = pop @children;
3048	push @children, $w->children;	3110	push @children, $w->children;
3049	$w->set_invisible;	3111	$w->set_invisible;
…		…
3068	while ($self->{refresh_hook}) {	3130	while ($self->{refresh_hook}) {
3069	$_->()	3131	$_->()
3070	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{refresh_hook}};
3071	}	3133	}
3072		3134
3073	if ($self->{check_size}) {	3135	if ($self->{realloc}) {
3074	my @queue = ([], []);	3136	my @queue;
3075		3137
3076	for (;;) {	3138	while () {
3077	if ($self->{check_size}) {	3139	if ($self->{realloc}) {
3078	# heuristic: check containers last	3140	#TODO use array-of-depth approach
3079	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3141
3080	for values %{delete $self->{check_size}}	3142	@queue = sort { $a->{visible} <=> $b->{visible} }
		3143	@queue, values %{delete $self->{realloc}};
3081	}	3144	}
3082		3145
3083	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3146	my $widget = pop @queue || last;
3084		3147
3085	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3148	$widget->{visible} or last; # do not resize invisible widgets
3086	? @$widget{qw(user_w user_h)}	3149
3087	: $widget->size_request;	3150	my ($w, $h) = $widget->size_request;
3088		3151
3089	if (delete $widget->{force_alloc}	3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3090	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3091	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3154
3092		3155	$w = $widget->{force_w} if exists $widget->{force_w};
		3156	$h = $widget->{force_h} if exists $widget->{force_h};
		3157
3093	$widget->{req_w} = $w;	3158	$widget->{req_w} = $w;
3094	$widget->{req_h} = $h;	3159	$widget->{req_h} = $h;
3095		3160
3096	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];
3097		3162
3098	$widget->{parent}->check_size	3163	push @queue, $widget->{parent}
3099	if $widget->{parent};	3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3100	}
3101	}	3165	}
3102	}	3166	}
3103		3167
3104	while ($self->{size_alloc}) {	3168	while (my $size_alloc = delete $self->{size_alloc}) {
3105	for (values %{delete $self->{size_alloc}}) {	3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3106	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;
3107		3177
3108	$w = 0 if $w < 0;	3178	$w = 0 if $w < 0;
3109	$h = 0 if $h < 0;	3179	$h = 0 if $h < 0;
3110		3180
		3181	$w = int $w + 0.5;
		3182	$h = int $h + 0.5;
		3183
		3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3185
3111	$widget->{w} = $w;	3186	$widget->{w} = $w;
3112	$widget->{h} = $h;	3187	$widget->{h} = $h;
		3188
3113	$widget->emit (size_allocate => $w, $h);	3189	$widget->emit (size_allocate => $w, $h, $changed);
3114	}	3190	}
3115	}	3191	}
3116		3192
3117	while ($self->{post_alloc_hook}) {	3193	while ($self->{post_alloc_hook}) {
3118	$_->()	3194	$_->()

Diff Legend

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