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.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

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

Diff Legend

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