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.266 by root, Thu Jun 1 03:42:58 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
18		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	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$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	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$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};	180	$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};	181	$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};	182	$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};	183	$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};	184	$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};	185
		186	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
238	$self->focus_out;	285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
239	}	305	}
240		306
241	sub hide {	307	sub hide {
242	my ($self) = @_;	308	my ($self) = @_;
243		309
…		…
245		311
246	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
247	if $self->{parent};	313	if $self->{parent};
248	}	314	}
249		315
250	sub move {	316	sub move_abs {
251	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
252		318
253	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
254	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
255	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
256		322
257	$self->update;	323	$self->update;
258	}	324	}
259		325
260	sub set_size {	326	sub set_size {
261	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
262		328
263	$self->{user_w} = $w;	329	$self->{force_w} = $w;
264	$self->{user_h} = $h;	330	$self->{force_h} = $h;
265		331
266	$self->check_size;	332	$self->realloc;
267	}	333	}
268		334
269	sub size_request {	335	sub size_request {
270	require Carp;	336	require Carp;
271	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
273		339
274	sub configure {	340	sub configure {
275	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
276		342
277	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
278	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
279	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
280		348
281	# use alignment to adjust x, y	349	# use alignment to adjust x, y
282		350
283	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
284	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
285
286	($w, $h) = ($w2, $h2);
287	}	353	}
288		354
289	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
290	$self->{x} = $x;	356	$self->{x} = $x;
291	$self->{y} = $y;	357	$self->{y} = $y;
292	$self->update;	358	$self->update;
293	}	359	}
294		360
295	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
297	}	368	}
298	}	369	}
299		370
300	sub size_allocate {	371	sub size_allocate {
301	# nothing to be done	372	# nothing to be done
302	}	373	}
303		374
304	sub reconfigure {
305	my ($self) = @_;
306
307	$self->check_size (1);
308	$self->update;
309	}
310
311	sub children {	375	sub children {
312	}	376	}
313		377
314	sub set_max_size {	378	sub set_max_size {
315	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
318	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
319	}	383	}
320		384
321	sub set_tooltip {	385	sub set_tooltip {
322	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
323		392
324	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
325		394
326	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
386	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
387	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
388	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
389	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
390	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		460
		461	sub find_widget {
		462	my ($self, $x, $y) = @_;
		463
		464	return () unless $self->{can_events};
		465
		466	return $self
		467	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		468	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		469
		470	()
		471	}
		472
		473	sub set_parent {
		474	my ($self, $parent) = @_;
		475
		476	Scalar::Util::weaken ($self->{parent} = $parent);
		477	$self->set_visible if $parent->{visible};
		478	}
		479
		480	sub connect {
		481	my ($self, $signal, $cb) = @_;
		482
		483	push @{ $self->{signal_cb}{$signal} }, $cb;
		484	}
		485
		486	sub _emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		490	}
		491
		492	sub emit {
		493	my ($self, $signal, @args) = @_;
		494
		495	$self->_emit ($signal, @args)
		496	|| $self->$signal (@args);
		497	}
		498
		499	sub visibility_change {
		500	#my ($self, $visible) = @_;
		501	}
		502
		503	sub realloc {
		504	my ($self) = @_;
		505
		506	if ($self->{visible}) {
		507	return if $self->{root}{realloc}{$self+0};
		508
		509	$self->{root}{realloc}{$self+0} = $self;
		510	$self->{root}->update;
		511	} else {
		512	delete $self->{req_w};
		513	delete $self->{req_h};
		514	}
		515	}
		516
		517	sub update {
		518	my ($self) = @_;
		519
		520	$self->{parent}->update
		521	if $self->{parent};
		522	}
		523
		524	sub reconfigure {
		525	my ($self) = @_;
		526
		527	$self->realloc;
		528	$self->update;
		529	}
391		530
392	sub draw {	531	sub draw {
393	my ($self) = @_;	532	my ($self) = @_;
394		533
395	return unless $self->{h} && $self->{w};	534	return unless $self->{h} && $self->{w};
…		…
412	glVertex $x , $y + $self->{h};	551	glVertex $x , $y + $self->{h};
413	glEnd;	552	glEnd;
414	glDisable GL_BLEND;	553	glDisable GL_BLEND;
415	}	554	}
416		555
417	if ($ENV{PCLIENT_DEBUG}) {	556	if ($ENV{CFPLUS_DEBUG} & 1) {
418	glPushMatrix;	557	glPushMatrix;
419	glColor 1, 1, 0, 1;	558	glColor 1, 1, 0, 1;
420	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	559	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421	glBegin GL_LINE_LOOP;	560	glBegin GL_LINE_LOOP;
422	glVertex 0 , 0;	561	glVertex 0 , 0;
423	glVertex $self->{w}, 0;	562	glVertex $self->{w} - 1, 0;
424	glVertex $self->{w}, $self->{h};	563	glVertex $self->{w} - 1, $self->{h} - 1;
425	glVertex 0 , $self->{h};	564	glVertex 0 , $self->{h} - 1;
426	glEnd;	565	glEnd;
427	glPopMatrix;	566	glPopMatrix;
428	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	567	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429	}	568	}
430	}	569	}
431		570
432	sub _draw {	571	sub _draw {
433	my ($self) = @_;	572	my ($self) = @_;
434		573
435	warn "no draw defined for $self\n";	574	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	}	575	}
494		576
495	sub DESTROY {	577	sub DESTROY {
496	my ($self) = @_;	578	my ($self) = @_;
497		579
…		…
555	my ($class, %arg) = @_;	637	my ($class, %arg) = @_;
556	$class->SUPER::new (can_events => 0, %arg);	638	$class->SUPER::new (can_events => 0, %arg);
557	}	639	}
558		640
559	sub size_request {	641	sub size_request {
560	(0, 0)	642	my ($self) = @_;
		643
		644	($self->{w} + 0, $self->{h} + 0)
561	}	645	}
562		646
563	sub draw { }	647	sub draw { }
564		648
565	#############################################################################	649	#############################################################################
…		…
594	$self->{children} = [	678	$self->{children} = [
595	sort { $a->{z} <=> $b->{z} }	679	sort { $a->{z} <=> $b->{z} }
596	@{$self->{children}}, @widgets	680	@{$self->{children}}, @widgets
597	];	681	];
598		682
599	$self->check_size (1);	683	$self->realloc;
600	$self->update;
601	}	684	}
602		685
603	sub children {	686	sub children {
604	@{ $_[0]{children} }	687	@{ $_[0]{children} }
605	}	688	}
…		…
610	delete $child->{parent};	693	delete $child->{parent};
611	$child->hide;	694	$child->hide;
612		695
613	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	696	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614		697
615	$self->check_size;	698	$self->realloc;
616	$self->update;
617	}	699	}
618		700
619	sub clear {	701	sub clear {
620	my ($self) = @_;	702	my ($self) = @_;
621		703
…		…
625	for (@$children) {	707	for (@$children) {
626	delete $_->{parent};	708	delete $_->{parent};
627	$_->hide;	709	$_->hide;
628	}	710	}
629		711
630	$self->check_size;	712	$self->realloc;
631	$self->update;
632	}	713	}
633		714
634	sub find_widget {	715	sub find_widget {
635	my ($self, $x, $y) = @_;	716	my ($self, $x, $y) = @_;
636		717
…		…
760		841
761	package CFClient::UI::ViewPort;	842	package CFClient::UI::ViewPort;
762		843
763	our @ISA = CFClient::UI::Window::;	844	our @ISA = CFClient::UI::Window::;
764		845
		846	sub new {
		847	my $class = shift;
		848
		849	$class->SUPER::new (
		850	scroll_x => 0,
		851	scroll_y => 1,
		852	@_,
		853	)
		854	}
		855
765	sub size_request {	856	sub size_request {
766	my ($self) = @_;	857	my ($self) = @_;
767		858
768	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	859	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769		860
770	@$self{qw(child_w child_h)}	861	$w = 10 if $self->{scroll_x};
		862	$h = 10 if $self->{scroll_y};
		863
		864	($w, $h)
771	}	865	}
772		866
773	sub size_allocate {	867	sub size_allocate {
774	my ($self, $w, $h) = @_;	868	my ($self, $w, $h) = @_;
775		869
776	my ($cw, $ch) = @$self{qw(child_w child_h)};	870	my $child = $self->child;
777	# $w = $self->{w};	871
		872	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		873	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		874
778	$self->child->configure (0, 0, $cw, $ch);	875	$self->child->configure (0, 0, $w, $h);
779	$self->update;	876	$self->update;
780	}	877	}
781		878
782	sub set_offset {	879	sub set_offset {
783	my ($self, $x, $y) = @_;	880	my ($self, $x, $y) = @_;
…		…
834	my $class = shift;	931	my $class = shift;
835		932
836	my $self;	933	my $self;
837		934
838	my $slider = new CFClient::UI::Slider	935	my $slider = new CFClient::UI::Slider
839	vertical => 1,	936	vertical => 1,
840	range => [0, 0, 1, 0.01], # HACK fix	937	range => [0, 0, 1, 0.01], # HACK fix
841	connect_changed => sub {	938	on_changed => sub {
842	$self->{vp}->set_offset (0, $_[1]);	939	$self->{vp}->set_offset (0, $_[1]);
843	},	940	},
844	;	941	;
845		942
846	$self = $class->SUPER::new (	943	$self = $class->SUPER::new (
…		…
852	$self->{vp}->add ($self->{scrolled});	949	$self->{vp}->add ($self->{scrolled});
853	$self->add ($self->{vp});	950	$self->add ($self->{vp});
854	$self->add ($self->{slider});	951	$self->add ($self->{slider});
855		952
856	$self	953	$self
		954	}
		955
		956	sub update {
		957	my ($self) = @_;
		958
		959	$self->SUPER::update;
		960
		961	# todo: overwrite size_allocate of child
		962	my $child = $self->{vp}->child;
		963	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857	}	964	}
858		965
859	sub size_allocate {	966	sub size_allocate {
860	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
861		968
…		…
914		1021
915	our @ISA = CFClient::UI::Bin::;	1022	our @ISA = CFClient::UI::Bin::;
916		1023
917	use CFClient::OpenGL;	1024	use CFClient::OpenGL;
918		1025
919	my @tex =	1026	my $bg =
		1027	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1028	mipmap => 1, wrap => 1;
		1029
		1030	my @border =
920	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1031	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);	1032	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922		1033
923	sub new {	1034	sub new {
924	my $class = shift;	1035	my $class = shift;
925
926	# TODO: user_x, user_y, overwrite moveto?
927		1036
928	my $self = $class->SUPER::new (	1037	my $self = $class->SUPER::new (
929	bg => [1, 1, 1, 1],	1038	bg => [1, 1, 1, 1],
930	border_bg => [1, 1, 1, 1],	1039	border_bg => [1, 1, 1, 1],
931	border => 0.6,	1040	border => 0.6,
932	is_toplevel => 1,
933	can_events => 1,	1041	can_events => 1,
		1042	min_w => 16,
		1043	min_h => 16,
934	@_	1044	@_
935	);	1045	);
936		1046
937	$self->{title} &&= new CFClient::UI::Label	1047	$self->{title} &&= new CFClient::UI::Label
938	align => 0,	1048	align => 0,
…		…
991	my ($ev, $x, $y) = @_;	1101	my ($ev, $x, $y) = @_;
992		1102
993	my $dx = $ev->{x} - $ox;	1103	my $dx = $ev->{x} - $ox;
994	my $dy = $ev->{y} - $oy;	1104	my $dy = $ev->{y} - $oy;
995		1105
996	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1106	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1107	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1108
		1109	$self->realloc;
998	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1110	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999	$self->check_size;
1000	};	1111	};
1001		1112
1002	} elsif ($lr ^ $td) {	1113	} elsif ($lr ^ $td) {
1003	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1114	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004	my ($bx, $by) = ($self->{x}, $self->{y});	1115	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1006	$self->{motion} = sub {	1117	$self->{motion} = sub {
1007	my ($ev, $x, $y) = @_;	1118	my ($ev, $x, $y) = @_;
1008		1119
1009	($x, $y) = ($ev->{x}, $ev->{y});	1120	($x, $y) = ($ev->{x}, $ev->{y});
1010		1121
1011	$self->move ($bx + $x - $ox, $by + $y - $oy);	1122	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012	$self->update;
1013	};	1123	};
1014	}	1124	}
1015	}	1125	}
1016		1126
1017	sub button_up {	1127	sub button_up {
…		…
1036	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1146	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037		1147
1038	my $border = $self->border;	1148	my $border = $self->border;
1039		1149
1040	glColor @{ $self->{border_bg} };	1150	glColor @{ $self->{border_bg} };
1041	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1151	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1042	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1152	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1153	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1154	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045		1155
1046	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1156	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047	my $bg = $tex[0];	1157	glColor @{ $self->{bg} };
1048		1158
1049	# TODO: repeat texture not scale	1159	# TODO: repeat texture not scale
		1160	# solve this better(?)
1050	my $rep_x = $cw / $bg->{w};	1161	$bg->{s} = $cw / $bg->{w};
1051	my $rep_y = $ch / $bg->{h};	1162	$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);	1163	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059	}	1164	}
1060		1165
1061	glDisable GL_TEXTURE_2D;	1166	glDisable GL_TEXTURE_2D;
1062		1167
…		…
1078	sub new {	1183	sub new {
1079	my $class = shift;	1184	my $class = shift;
1080		1185
1081	$class->SUPER::new (	1186	$class->SUPER::new (
1082	col_expand => [],	1187	col_expand => [],
1083	@_	1188	@_,
1084	)	1189	)
		1190	}
		1191
		1192	sub children {
		1193	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085	}	1194	}
1086		1195
1087	sub add {	1196	sub add {
1088	my ($self, $x, $y, $child) = @_;	1197	my ($self, $x, $y, $child) = @_;
1089		1198
1090	$child->set_parent ($self);	1199	$child->set_parent ($self);
1091	$self->{children}[$y][$x] = $child;	1200	$self->{children}[$y][$x] = $child;
1092		1201
1093	$child->check_size;	1202	$self->realloc;
1094	}	1203	}
1095		1204
1096	sub children {
1097	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098	}
1099
1100	# TODO: move to container class maybe? send childs a signal on removal?	1205	# TODO: move to container class maybe? send children a signal on removal?
1101	sub clear {	1206	sub clear {
1102	my ($self) = @_;	1207	my ($self) = @_;
1103		1208
1104	my @children = $self->children;	1209	my @children = $self->children;
1105	delete $self->{children};	1210	delete $self->{children};
…		…
1107	for (@children) {	1212	for (@children) {
1108	delete $_->{parent};	1213	delete $_->{parent};
1109	$_->hide;	1214	$_->hide;
1110	}	1215	}
1111		1216
1112	$self->update;	1217	$self->realloc;
1113	}	1218	}
1114		1219
1115	sub get_wh {	1220	sub get_wh {
1116	my ($self) = @_;	1221	my ($self) = @_;
1117		1222
…		…
1148	sub size_allocate {	1253	sub size_allocate {
1149	my ($self, $w, $h) = @_;	1254	my ($self, $w, $h) = @_;
1150		1255
1151	my ($ws, $hs) = $self->get_wh;	1256	my ($ws, $hs) = $self->get_wh;
1152		1257
1153	my $req_w = sum @$ws;	1258	my $req_w = (sum @$ws) || 1;
1154	my $req_h = sum @$hs;	1259	my $req_h = (sum @$hs) || 1;
1155		1260
1156	# TODO: nicer code && do row_expand	1261	# TODO: nicer code && do row_expand
1157	my @col_expand = @{$self->{col_expand}};	1262	my @col_expand = @{$self->{col_expand}};
1158	@col_expand = (1) x @$ws unless @col_expand;	1263	@col_expand = (1) x @$ws unless @col_expand;
1159	my $col_expand = (sum @col_expand) || 1;	1264	my $col_expand = (sum @col_expand) || 1;
…		…
1213	}	1318	}
1214	}	1319	}
1215		1320
1216	#############################################################################	1321	#############################################################################
1217		1322
1218	package CFClient::UI::HBox;	1323	package CFClient::UI::Box;
1219
1220	# TODO: wrap into common Box base class
1221		1324
1222	our @ISA = CFClient::UI::Container::;	1325	our @ISA = CFClient::UI::Container::;
1223		1326
1224	sub size_request {	1327	sub size_request {
1225	my ($self) = @_;	1328	my ($self) = @_;
1226		1329
1227	my @alloc = map [$_->size_request], @{$self->{children}};	1330	$self->{vertical}
1228		1331	? (
1229	(	1332	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1230	(List::Util::sum map $_->[0], @alloc),	1333	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231	(List::Util::max map $_->[1], @alloc),	1334	)
1232	)	1335	: (
		1336	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1337	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1338	)
1233	}	1339	}
1234		1340
1235	sub size_allocate {	1341	sub size_allocate {
1236	my ($self, $w, $h) = @_;	1342	my ($self, $w, $h) = @_;
1237		1343
1238	($h, $w) = ($w, $h);	1344	my $space = $self->{vertical} ? $h : $w;
1239
1240	my $children = $self->{children};	1345	my $children = $self->{children};
1241		1346
1242	my @h = map $_->{req_w}, @$children;	1347	my @req;
1243		1348
1244	my $req_h = List::Util::sum @h;	1349	if ($self->{homogeneous}) {
1245		1350	@req = ($space / (@$children || 1)) x @$children;
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {	1351	} else {
		1352	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1353	my $req = List::Util::sum @req;
		1354
		1355	if ($req > $space) {
		1356	# ah well, not enough space
		1357	$_ *= $space / $req for @req;
		1358	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;	1359	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251	$exp ||= 1;
1252		1360
		1361	$space = ($space - $req) / $expand; # remaining space to give away
		1362
		1363	$req[$_] += $space * $children->[$_]{expand}
1253	for (0 .. $#$children) {	1364	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	}	1365	}
1260	}	1366	}
1261		1367
1262	CFClient::UI::harmonize \@h;	1368	CFClient::UI::harmonize \@req;
1263		1369
1264	my $y = 0;	1370	my $pos = 0;
1265	for (0 .. $#$children) {	1371	for (0 .. $#$children) {
1266	my $child = $children->[$_];
1267	my $h = $h[$_];	1372	my $alloc = $req[$_];
1268	$child->configure ($y, 0, $h, $w);	1373	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269		1374
1270	$y += $h;	1375	$pos += $alloc;
1271	}	1376	}
1272		1377
1273	1	1378	1
1274	}	1379	}
1275		1380
1276	#############################################################################	1381	#############################################################################
1277		1382
		1383	package CFClient::UI::HBox;
		1384
		1385	our @ISA = CFClient::UI::Box::;
		1386
		1387	sub new {
		1388	my $class = shift;
		1389
		1390	$class->SUPER::new (
		1391	vertical => 0,
		1392	@_,
		1393	)
		1394	}
		1395
		1396	#############################################################################
		1397
1278	package CFClient::UI::VBox;	1398	package CFClient::UI::VBox;
1279		1399
1280	# TODO: wrap into common Box base class
1281
1282	our @ISA = CFClient::UI::Container::;	1400	our @ISA = CFClient::UI::Box::;
1283		1401
1284	sub size_request {	1402	sub new {
1285	my ($self) = @_;	1403	my $class = shift;
1286		1404
1287	my @alloc = map [$_->size_request], @{$self->{children}};	1405	$class->SUPER::new (
1288		1406	vertical => 1,
1289	(	1407	@_,
1290	(List::Util::max map $_->[0], @alloc),
1291	(List::Util::sum map $_->[1], @alloc),
1292	)	1408	)
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	}	1409	}
1333		1410
1334	#############################################################################	1411	#############################################################################
1335		1412
1336	package CFClient::UI::Label;	1413	package CFClient::UI::Label;
…		…
1353	ellipsise => 3, # end	1430	ellipsise => 3, # end
1354	layout => (new CFClient::Layout),	1431	layout => (new CFClient::Layout),
1355	fontsize => 1,	1432	fontsize => 1,
1356	align => -1,	1433	align => -1,
1357	valign => -1,	1434	valign => -1,
1358	padding => 2,	1435	padding_x => 2,
		1436	padding_y => 2,
1359	can_events => 0,	1437	can_events => 0,
1360	%arg	1438	%arg
1361	);	1439	);
1362		1440
1363	if (exists $self->{template}) {	1441	if (exists $self->{template}) {
…		…
1399	$self->{text} = "T$text";	1477	$self->{text} = "T$text";
1400		1478
1401	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1479	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402	$self->{layout}->set_text ($text);	1480	$self->{layout}->set_text ($text);
1403		1481
		1482	$self->realloc;
1404	$self->update;	1483	$self->update;
1405	$self->check_size;
1406	}	1484	}
1407		1485
1408	sub set_markup {	1486	sub set_markup {
1409	my ($self, $markup) = @_;	1487	my ($self, $markup) = @_;
1410		1488
…		…
1414	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1492	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415		1493
1416	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1494	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417	$self->{layout}->set_markup ($markup);	1495	$self->{layout}->set_markup ($markup);
1418		1496
		1497	$self->realloc;
1419	$self->update;	1498	$self->update;
1420	$self->check_size;
1421	}	1499	}
1422		1500
1423	sub size_request {	1501	sub size_request {
1424	my ($self) = @_;	1502	my ($self) = @_;
1425		1503
…		…
1439		1517
1440	$w = List::Util::max $w, $w2;	1518	$w = List::Util::max $w, $w2;
1441	$h = List::Util::max $h, $h2;	1519	$h = List::Util::max $h, $h2;
1442	}	1520	}
1443		1521
1444	(	1522	($w, $h)
1445	$w + $self->{padding} * 2,
1446	$h + $self->{padding} * 2,
1447	)
1448	}	1523	}
1449		1524
1450	sub size_allocate {	1525	sub size_allocate {
1451	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1452		1527
1453	delete $self->{texture};	1528	delete $self->{texture}
		1529	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454	}	1530	}
1455		1531
1456	sub set_fontsize {	1532	sub set_fontsize {
1457	my ($self, $fontsize) = @_;	1533	my ($self, $fontsize) = @_;
1458		1534
1459	$self->{fontsize} = $fontsize;	1535	$self->{fontsize} = $fontsize;
1460	delete $self->{texture};	1536	delete $self->{texture};
1461		1537
1462	$self->update;	1538	$self->realloc;
1463	$self->check_size;
1464	}	1539	}
1465		1540
1466	sub _draw {	1541	sub _draw {
1467	my ($self) = @_;	1542	my ($self) = @_;
1468		1543
…		…
1476	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1551	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1552	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478		1553
1479	my $tex = new_from_layout CFClient::Texture $self->{layout};	1554	my $tex = new_from_layout CFClient::Texture $self->{layout};
1480		1555
1481	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1556	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1557	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483	: ($self->{w} - $tex->{w}) * 0.5);	1558	: ($self->{w} - $tex->{w}) * 0.5);
1484		1559
1485	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1560	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1561	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487	: ($self->{h} - $tex->{h}) * 0.5);	1562	: ($self->{h} - $tex->{h}) * 0.5);
1488		1563
1489	$tex	1564	$tex
1490	};	1565	};
1491		1566
…		…
1548	sub set_text {	1623	sub set_text {
1549	my ($self, $text) = @_;	1624	my ($self, $text) = @_;
1550		1625
1551	$self->{cursor} = length $text;	1626	$self->{cursor} = length $text;
1552	$self->_set_text ($text);	1627	$self->_set_text ($text);
1553	$self->update;	1628
1554	$self->check_size;	1629	$self->realloc;
1555	}	1630	}
1556		1631
1557	sub get_text {	1632	sub get_text {
1558	$_[0]{text}	1633	$_[0]{text}
1559	}	1634	}
…		…
1562	my ($self) = @_;	1637	my ($self) = @_;
1563		1638
1564	my ($w, $h) = $self->SUPER::size_request;	1639	my ($w, $h) = $self->SUPER::size_request;
1565		1640
1566	($w + 1, $h) # add 1 for cursor	1641	($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	}	1642	}
1574		1643
1575	sub key_down {	1644	sub key_down {
1576	my ($self, $ev) = @_;	1645	my ($self, $ev) = @_;
1577		1646
…		…
1598	} elsif ($uni) {	1667	} elsif ($uni) {
1599	substr $text, $self->{cursor}++, 0, chr $uni;	1668	substr $text, $self->{cursor}++, 0, chr $uni;
1600	}	1669	}
1601		1670
1602	$self->_set_text ($text);	1671	$self->_set_text ($text);
1603	$self->update;	1672
1604	$self->check_size;	1673	$self->realloc;
1605	}	1674	}
1606		1675
1607	sub focus_in {	1676	sub focus_in {
1608	my ($self) = @_;	1677	my ($self) = @_;
1609		1678
…		…
1736		1805
1737	sub new {	1806	sub new {
1738	my $class = shift;	1807	my $class = shift;
1739		1808
1740	$class->SUPER::new (	1809	$class->SUPER::new (
1741	padding => 4,	1810	padding_x => 4,
		1811	padding_y => 4,
1742	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1743	active_fg => [0, 0, 1],	1813	active_fg => [0, 0, 1],
1744	can_hover => 1,	1814	can_hover => 1,
1745	align => 0,	1815	align => 0,
1746	valign => 0,	1816	valign => 0,
…		…
1793		1863
1794	sub new {	1864	sub new {
1795	my $class = shift;	1865	my $class = shift;
1796		1866
1797	$class->SUPER::new (	1867	$class->SUPER::new (
1798	padding => 2,	1868	padding_x => 2,
		1869	padding_y => 2,
1799	fg => [1, 1, 1],	1870	fg => [1, 1, 1],
1800	active_fg => [1, 1, 0],	1871	active_fg => [1, 1, 0],
1801	bg => [0, 0, 0, 0.2],	1872	bg => [0, 0, 0, 0.2],
1802	active_bg => [1, 1, 1, 0.5],	1873	active_bg => [1, 1, 1, 0.5],
1803	state => 0,	1874	state => 0,
…		…
1807	}	1878	}
1808		1879
1809	sub size_request {	1880	sub size_request {
1810	my ($self) = @_;	1881	my ($self) = @_;
1811		1882
1812	($self->{padding} * 2 + 6) x 2	1883	(6) x 2
1813	}	1884	}
1814		1885
1815	sub button_down {	1886	sub button_down {
1816	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1817		1888
1818	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1889	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1890	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820	$self->{state} = !$self->{state};	1891	$self->{state} = !$self->{state};
1821	$self->_emit (changed => $self->{state});	1892	$self->_emit (changed => $self->{state});
1822	}	1893	}
1823	}	1894	}
1824		1895
1825	sub _draw {	1896	sub _draw {
1826	my ($self) = @_;	1897	my ($self) = @_;
1827		1898
1828	$self->SUPER::_draw;	1899	$self->SUPER::_draw;
1829		1900
1830	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1901	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831		1902
1832	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1903	my ($w, $h) = @$self{qw(w h)};
		1904
		1905	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833		1906
1834	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1907	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835		1908
1836	my $tex = $self->{state} ? $tex[1] : $tex[0];	1909	my $tex = $self->{state} ? $tex[1] : $tex[0];
1837		1910
…		…
2102	fg => [1, 1, 1],	2175	fg => [1, 1, 1],
2103	active_fg => [0, 0, 0],	2176	active_fg => [0, 0, 0],
2104	bg => [0, 0, 0, 0.2],	2177	bg => [0, 0, 0, 0.2],
2105	active_bg => [1, 1, 1, 0.5],	2178	active_bg => [1, 1, 1, 0.5],
2106	range => [0, 0, 100, 10, 0],	2179	range => [0, 0, 100, 10, 0],
2107	req_w => $::WIDTH / 80,	2180	min_w => $::WIDTH / 80,
2108	req_h => $::WIDTH / 80,	2181	min_h => $::WIDTH / 80,
2109	vertical => 0,	2182	vertical => 0,
2110	can_hover => 1,	2183	can_hover => 1,
2111	inner_pad => 0.02,	2184	inner_pad => 0.02,
2112	@_	2185	@_
2113	);	2186	);
…		…
2116	$self->update;	2189	$self->update;
2117		2190
2118	$self	2191	$self
2119	}	2192	}
2120		2193
		2194	sub changed { }
		2195
2121	sub set_range {	2196	sub set_range {
2122	my ($self, $range) = @_;	2197	my ($self, $range) = @_;
2123		2198
2124	$self->{range} = $range;	2199	($range, $self->{range}) = ($self->{range}, $range);
2125		2200
2126	$self->update;	2201	$self->update
		2202	if "@$range" ne "@{$self->{range}}";
2127	}	2203	}
2128		2204
2129	sub set_value {	2205	sub set_value {
2130	my ($self, $value) = @_;	2206	my ($self, $value) = @_;
2131		2207
…		…
2150	}	2226	}
2151		2227
2152	sub size_request {	2228	sub size_request {
2153	my ($self) = @_;	2229	my ($self) = @_;
2154		2230
2155	my $w = $self->{req_w};	2231	($self->{req_w}, $self->{req_h})
2156	my $h = $self->{req_h};
2157
2158	$self->{vertical} ? ($h, $w) : ($w, $h)
2159	}	2232	}
2160		2233
2161	sub button_down {	2234	sub button_down {
2162	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2163		2236
…		…
2514		2587
2515	sub new {	2588	sub new {
2516	my $class = shift;	2589	my $class = shift;
2517		2590
2518	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2519	state => 0,	2592	state => 0,
2520	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2521	@_	2594	@_
2522	);	2595	);
2523		2596
2524	if ($self->{state}) {
2525	$self->{state} = 0;
2526	$self->toggle_flopper;
2527	}
2528
2529	$self	2597	$self
2530	}	2598	}
2531		2599
2532	sub toggle_flopper {	2600	sub toggle_flopper {
2533	my ($self) = @_;	2601	my ($self) = @_;
2534		2602
2535	# TODO: use animation	2603	$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	}	2604	}
2547		2605
2548	#############################################################################	2606	#############################################################################
2549		2607
2550	package CFClient::UI::Tooltip;	2608	package CFClient::UI::Tooltip;
…		…
2563	}	2621	}
2564		2622
2565	sub set_tooltip_from {	2623	sub set_tooltip_from {
2566	my ($self, $widget) = @_;	2624	my ($self, $widget) = @_;
2567		2625
		2626	my $tooltip = $widget->{tooltip};
		2627
		2628	if ($ENV{CFPLUS_DEBUG} & 2) {
		2629	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2630	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2631	. "req $widget->{req_w} $widget->{req_h}\n"
		2632	. "visible $widget->{visible}";
		2633	}
		2634
2568	$self->add (new CFClient::UI::Label	2635	$self->add (new CFClient::UI::Label
2569	markup => $widget->{tooltip},	2636	markup => $tooltip,
2570	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2637	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571	fontsize => 0.8,	2638	fontsize => 0.8,
2572	fg => [0, 0, 0, 1],	2639	fg => [0, 0, 0, 1],
2573	ellipsise => 0,	2640	ellipsise => 0,
2574	font => ($widget->{tooltip_font} || $::FONT_PROP),	2641	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2585		2652
2586	sub size_allocate {	2653	sub size_allocate {
2587	my ($self, $w, $h) = @_;	2654	my ($self, $w, $h) = @_;
2588		2655
2589	$self->SUPER::size_allocate ($w - 4, $h - 4);	2656	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2657	}
		2658
		2659	sub visibility_change {
		2660	my ($self, $visible) = @_;
		2661
		2662	return unless $visible;
		2663
		2664	$self->{root}->on_post_alloc ("move_$self" => sub {
		2665	my $widget = $self->{owner}
		2666	or return;
		2667
		2668	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2669
		2670	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2671	if $x + $self->{w} > $::WIDTH;
		2672
		2673	$self->move_abs ($x, $y);
		2674	});
2590	}	2675	}
2591		2676
2592	sub _draw {	2677	sub _draw {
2593	my ($self) = @_;	2678	my ($self) = @_;
2594		2679
…		…
2611	glVertex $w, $h;	2696	glVertex $w, $h;
2612	glVertex $w, 0;	2697	glVertex $w, 0;
2613	glEnd;	2698	glEnd;
2614		2699
2615	glTranslate 2 - 0.375, 2 - 0.375;	2700	glTranslate 2 - 0.375, 2 - 0.375;
		2701
2616	$self->SUPER::_draw;	2702	$self->SUPER::_draw;
2617	}	2703	}
2618		2704
2619	#############################################################################	2705	#############################################################################
2620		2706
…		…
2626		2712
2627	sub new {	2713	sub new {
2628	my $class = shift;	2714	my $class = shift;
2629		2715
2630	my $self = $class->SUPER::new (	2716	my $self = $class->SUPER::new (
2631	aspect => 1,	2717	aspect => 1,
		2718	can_events => 0,
2632	@_,	2719	@_,
2633	);	2720	);
2634		2721
2635	if ($self->{anim} && $self->{animspeed}) {	2722	if ($self->{anim} && $self->{animspeed}) {
2636	Scalar::Util::weaken (my $widget = $self);	2723	Scalar::Util::weaken (my $widget = $self);
…		…
2695	$self->SUPER::DESTROY;	2782	$self->SUPER::DESTROY;
2696	}	2783	}
2697		2784
2698	#############################################################################	2785	#############################################################################
2699		2786
2700	package CFClient::UI::InventoryItem;
2701
2702	our @ISA = CFClient::UI::HBox::;
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
2730	sub new {
2731	my $class = shift;
2732
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 (
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),
2821	@_,
2822	);
2823
2824	$self
2825	}
2826
2827	sub set_items {
2828	my ($self, $items) = @_;
2829
2830	$self->{scrolled}->clear;
2831	return unless $items;
2832
2833	my @items = sort {
2834	($a->{type} <=> $b->{type})
2835	or ($a->{name} cmp $b->{name})
2836	} @$items;
2837
2838	$self->{real_items} = \@items;
2839
2840	for my $item (@items) {
2841	$item->{item} = $item;
2842	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843	$item->update_item ();
2844	}
2845
2846	my $i = 0;
2847	for (@items) {
2848	$self->{scrolled}->add (0, $i, $_);
2849	my $nrof = $_->{item}->{nrof} || 1;
2850	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851	}
2852
2853	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854	}
2855
2856	sub size_request {
2857	my ($self) = @_;
2858	($self->{req_w}, $self->{req_h});
2859	}
2860
2861	#############################################################################
2862
2863	package CFClient::UI::Menu;	2787	package CFClient::UI::Menu;
2864		2788
2865	our @ISA = CFClient::UI::FancyFrame::;	2789	our @ISA = CFClient::UI::FancyFrame::;
2866		2790
2867	use CFClient::OpenGL;	2791	use CFClient::OpenGL;
…		…
2905	# maybe save $GRAB? must be careful about events...	2829	# maybe save $GRAB? must be careful about events...
2906	$GRAB = $self;	2830	$GRAB = $self;
2907	$self->{button} = $ev->{button};	2831	$self->{button} = $ev->{button};
2908		2832
2909	$self->show;	2833	$self->show;
2910	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2834	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911	}	2835	}
2912		2836
2913	sub mouse_motion {	2837	sub mouse_motion {
2914	my ($self, $ev, $x, $y) = @_;	2838	my ($self, $ev, $x, $y) = @_;
2915		2839
…		…
2995	sub add {	2919	sub add {
2996	my ($self, $text, %arg) = @_;	2920	my ($self, $text, %arg) = @_;
2997		2921
2998	$text =~ s/^\s+//;	2922	$text =~ s/^\s+//;
2999	$text =~ s/\s+$//;	2923	$text =~ s/\s+$//;
		2924
		2925	return unless $text;
3000		2926
3001	my $timeout = time + ((delete $arg{timeout}) || 60);	2927	my $timeout = time + ((delete $arg{timeout}) || 60);
3002		2928
3003	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2929	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004		2930
…		…
3038	$self->SUPER::reconfigure;	2964	$self->SUPER::reconfigure;
3039	}	2965	}
3040		2966
3041	#############################################################################	2967	#############################################################################
3042		2968
3043	package CFClient::UI::Root;	2969	package CFClient::UI::Inventory;
3044		2970
3045	our @ISA = CFClient::UI::Container::;	2971	our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047	use CFClient::OpenGL;
3048		2972
3049	sub new {	2973	sub new {
3050	my $class = shift;	2974	my $class = shift;
3051		2975
3052	$class->SUPER::new (	2976	my $self = $class->SUPER::new (
		2977	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3053	@_,	2978	@_,
3054	)	2979	);
3055	}
3056		2980
3057	sub configure {	2981	$self
		2982	}
		2983
		2984	sub set_items {
		2985	my ($self, $items) = @_;
		2986
		2987	$self->{scrolled}->clear;
		2988	return unless $items;
		2989
		2990	my @items = sort {
		2991	($a->{type} <=> $b->{type})
		2992	or ($a->{name} cmp $b->{name})
		2993	} @$items;
		2994
		2995	$self->{real_items} = \@items;
		2996
		2997	my $row = 0;
		2998	for my $item (@items) {
		2999	CFClient::Item::update_widgets $item;
		3000
		3001	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3002	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3003	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3004
		3005	$row++;
		3006	}
		3007	}
		3008
		3009	#############################################################################
		3010
		3011	package CFClient::UI::BindEditor;
		3012
		3013	our @ISA = CFClient::UI::FancyFrame::;
		3014
		3015	sub new {
		3016	my $class = shift;
		3017
		3018	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3019
		3020	$self->add (my $vb = new CFClient::UI::VBox);
		3021
		3022
		3023	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3024	text => "start recording",
		3025	tooltip => "Start/Stops recording of actions."
		3026	."All subsequent actions after the recording started will be captured."
		3027	."The actions are displayed after the record was stopped."
		3028	."To bind the action you have to click on the 'Bind' button",
		3029	on_activate => sub {
		3030	unless ($self->{recording}) {
		3031	$self->start;
		3032	} else {
		3033	$self->stop;
		3034	}
		3035	});
		3036
		3037	$vb->add (new CFClient::UI::Label text => "Actions:");
		3038	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3039
		3040	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3041	$vb->add (my $hb = new CFClient::UI::HBox);
		3042	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3043	$hb->add (new CFClient::UI::Button
		3044	text => "bind",
		3045	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3046	on_activate => sub {
		3047	$self->ask_for_bind;
		3048	});
		3049
		3050	$vb->add (my $hb = new CFClient::UI::HBox);
		3051	$hb->add (new CFClient::UI::Button
		3052	text => "ok",
		3053	expand => 1,
		3054	tooltip => "This closes the binding editor and saves the binding",
		3055	on_activate => sub {
		3056	$self->hide;
		3057	$self->commit;
		3058	});
		3059
		3060	$hb->add (new CFClient::UI::Button
		3061	text => "cancel",
		3062	expand => 1,
		3063	tooltip => "This closes the binding editor without saving",
		3064	on_activate => sub {
		3065	$self->hide;
		3066	$self->{binding_cancel}->()
		3067	if $self->{binding_cancel};
		3068	});
		3069
		3070	$self->update_binding_widgets;
		3071
		3072	$self
		3073	}
		3074
		3075	sub commit {
		3076	my ($self) = @_;
		3077	my ($mod, $sym, $cmds) = $self->get_binding;
		3078	if ($sym != 0 && @$cmds > 0) {
		3079	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3080	."'. Don't forget 'Save Config'!");
		3081	$self->{binding_change}->($mod, $sym, $cmds)
		3082	if $self->{binding_change};
		3083	} else {
		3084	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3085	$self->{binding_cancel}->()
		3086	if $self->{binding_cancel};
		3087	}
		3088	}
		3089
		3090	sub start {
		3091	my ($self) = @_;
		3092
		3093	$self->{rec_btn}->set_text ("stop recording");
		3094	$self->{recording} = 1;
		3095	$self->clear_command_list;
		3096	$::CONN->start_record if $::CONN;
		3097	}
		3098
		3099	sub stop {
		3100	my ($self) = @_;
		3101
		3102	$self->{rec_btn}->set_text ("start recording");
		3103	$self->{recording} = 0;
		3104
		3105	my $rec;
		3106	$rec = $::CONN->stop_record if $::CONN;
		3107	return unless ref $rec eq 'ARRAY';
		3108	$self->set_command_list ($rec);
		3109	}
		3110
		3111	# if $commit is true, the binding will be set after the user entered a key combo
		3112	sub ask_for_bind {
		3113	my ($self, $commit) = @_;
		3114
		3115	CFClient::Binder::open_binding_dialog (sub {
		3116	my ($mod, $sym) = @_;
		3117	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3118	$self->update_binding_widgets;
		3119	$self->commit if $commit;
		3120	});
		3121	}
		3122
		3123	# $mod and $sym are the modifiers and key symbol
		3124	# $cmds is a array ref of strings (the commands)
		3125	# $cb is the callback that is executed on OK
		3126	# $ccb is the callback that is executed on CANCEL and
		3127	# when the binding was unsuccessful on OK
		3128	sub set_binding {
3058	my ($self, $x, $y, $w, $h) = @_;	3129	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3059		3130
3060	$self->{w} = $w;	3131	$self->clear_command_list;
3061	$self->{h} = $h;	3132	$self->{recording} = 0;
3062	}	3133	$self->{rec_btn}->set_text ("start recording");
3063		3134
3064	sub check_size {	3135	$self->{binding} = [$mod, $sym];
		3136	$self->{commands} = $cmds;
		3137
		3138	$self->{binding_change} = $cb;
		3139	$self->{binding_cancel} = $ccb;
		3140
		3141	$self->update_binding_widgets;
		3142	}
		3143
		3144	# this is a shortcut method that asks for a binding
		3145	# and then just binds it.
		3146	sub do_quick_binding {
3065	my ($self) = @_;	3147	my ($self, $cmds) = @_;
		3148	$self->set_binding (undef, undef, $cmds, sub {
		3149	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3150	});
		3151	$self->ask_for_bind (1);
		3152	}
3066		3153
3067	$self->size_allocate ($self->{w}, $self->{h})	3154	sub update_binding_widgets {
3068	if $self->{w};	3155	my ($self) = @_;
		3156	my ($mod, $sym, $cmds) = $self->get_binding;
		3157	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3158	$self->set_command_list ($cmds);
		3159	}
		3160
		3161	sub get_binding {
		3162	my ($self) = @_;
		3163	return (
		3164	$self->{binding}->[0],
		3165	$self->{binding}->[1],
		3166	[ grep { defined $_ } @{$self->{commands}} ]
		3167	);
		3168	}
		3169
		3170	sub clear_command_list {
		3171	my ($self) = @_;
		3172	$self->{cmdbox}->clear ();
		3173	}
		3174
		3175	sub set_command_list {
		3176	my ($self, $cmds) = @_;
		3177
		3178	$self->{cmdbox}->clear ();
		3179	$self->{commands} = $cmds;
		3180
		3181	my $idx = 0;
		3182
		3183	for (@$cmds) {
		3184	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3185
		3186	my $i = $idx;
		3187	$hb->add (new CFClient::UI::Label text => $_);
		3188	$hb->add (new CFClient::UI::Button
		3189	text => "delete",
		3190	tooltip => "Deletes the action from the record",
		3191	on_activate => sub {
		3192	$self->{cmdbox}->remove ($hb);
		3193	$cmds->[$i] = undef;
		3194	});
		3195
		3196
		3197	$idx++
		3198	}
		3199	}
		3200
		3201	#############################################################################
		3202
		3203	package CFClient::UI::SpellList;
		3204
		3205	our @ISA = CFClient::UI::FancyFrame::;
		3206
		3207	sub new {
		3208	my $class = shift;
		3209
		3210	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3211
		3212	$self->add (new CFClient::UI::ScrolledWindow
		3213	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3214
		3215	$self;
		3216	}
		3217
		3218	# XXX: Do sorting? Argl...
		3219	sub add_spell {
		3220	my ($self, $spell) = @_;
		3221	$self->{spells}->{$spell->{name}} = $spell;
		3222
		3223	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3224	face => $spell->{face},
		3225	can_hover => 1,
		3226	can_events => 1,
		3227	tooltip => $spell->{message});
		3228
		3229	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3230	text => $spell->{name},
		3231	can_hover => 1,
		3232	can_events => 1,
		3233	tooltip => $spell->{message},
		3234	expand => 1);
		3235
		3236	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3237	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3238	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3239	expand => 1);
		3240
		3241	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3242	text => "bind to key",
		3243	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3244	}
		3245
		3246	sub rebuild_spell_list {
		3247	my ($self) = @_;
		3248	$self->{tbl_idx} = 0;
		3249	$self->add_spell ($_) for values %{$self->{spells}};
		3250	}
		3251
		3252	sub remove_spell {
		3253	my ($self, $spell) = @_;
		3254	delete $self->{spells}->{$spell->{name}};
		3255	$self->rebuild_spell_list;
		3256	}
		3257
		3258	#############################################################################
		3259
		3260	package CFClient::UI::Root;
		3261
		3262	our @ISA = CFClient::UI::Container::;
		3263
		3264	use CFClient::OpenGL;
		3265
		3266	sub new {
		3267	my $class = shift;
		3268
		3269	my $self = $class->SUPER::new (
		3270	visible => 1,
		3271	@_,
		3272	);
		3273
		3274	Scalar::Util::weaken ($self->{root} = $self);
		3275
		3276	$self
3069	}	3277	}
3070		3278
3071	sub size_request {	3279	sub size_request {
3072	my ($self) = @_;	3280	my ($self) = @_;
3073		3281
3074	($self->{w}, $self->{h})	3282	($self->{w}, $self->{h})
		3283	}
		3284
		3285	sub _to_pixel {
		3286	my ($coord, $size, $max) = @_;
		3287
		3288	$coord =
		3289	$coord eq "center" ? ($max - $size) * 0.5
		3290	: $coord eq "max" ? $max
		3291	: $coord;
		3292
		3293	$coord = 0 if $coord < 0;
		3294	$coord = $max - $size if $coord > $max - $size;
		3295
		3296	int $coord + 0.5
3075	}	3297	}
3076		3298
3077	sub size_allocate {	3299	sub size_allocate {
3078	my ($self, $w, $h) = @_;	3300	my ($self, $w, $h) = @_;
3079		3301
3080	for my $child ($self->children) {	3302	for my $child ($self->children) {
3081	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3303	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082		3304
3083	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3305	$X = $child->{force_x} if exists $child->{force_x};
3084	if exists $child->{req_x};	3306	$Y = $child->{force_y} if exists $child->{force_y};
3085		3307
3086	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3308	$X = _to_pixel $X, $W, $self->{w};
3087	if exists $child->{req_y};	3309	$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		3310
3092	$child->configure ($X, $Y, $W, $H);	3311	$child->configure ($X, $Y, $W, $H);
3093	}	3312	}
3094	}	3313	}
3095		3314
…		…
3106	}	3325	}
3107		3326
3108	sub update {	3327	sub update {
3109	my ($self) = @_;	3328	my ($self) = @_;
3110		3329
3111	$self->check_size;
3112	$::WANT_REFRESH++;	3330	$::WANT_REFRESH++;
3113	}	3331	}
3114		3332
3115	sub add {	3333	sub add {
3116	my ($self, @children) = @_;	3334	my ($self, @children) = @_;
3117		3335
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;	3336	$_->{is_toplevel} = 1
3126		3337	for @children;
3127	# integerise window positions
3128	$child->{x} = int $child->{x};
3129	$child->{y} = int $child->{y};
3130	}
3131		3338
3132	$self->SUPER::add (@children);	3339	$self->SUPER::add (@children);
3133	}	3340	}
3134		3341
3135	sub remove {	3342	sub remove {
3136	my ($self, @children) = @_;	3343	my ($self, @children) = @_;
3137		3344
3138	$self->SUPER::remove (@children);	3345	$self->SUPER::remove (@children);
		3346
		3347	delete $self->{is_toplevel}
		3348	for @children;
3139		3349
3140	while (@children) {	3350	while (@children) {
3141	my $w = pop @children;	3351	my $w = pop @children;
3142	push @children, $w->children;	3352	push @children, $w->children;
3143	$w->set_invisible;	3353	$w->set_invisible;
…		…
3162	while ($self->{refresh_hook}) {	3372	while ($self->{refresh_hook}) {
3163	$_->()	3373	$_->()
3164	for values %{delete $self->{refresh_hook}};	3374	for values %{delete $self->{refresh_hook}};
3165	}	3375	}
3166		3376
3167	if ($self->{check_size}) {	3377	if ($self->{realloc}) {
3168	my @queue = ([], []);	3378	my %queue;
		3379	my @queue;
		3380	my $widget;
3169		3381
3170	for (;;) {	3382	outer:
3171	if ($self->{check_size}) {	3383	while () {
3172	# heuristic: check containers last	3384	if (my $realloc = delete $self->{realloc}) {
3173	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3385	for $widget (values %$realloc) {
3174	for values %{delete $self->{check_size}}	3386	$widget->{visible} or next; # do not resize invisible widgets
		3387
		3388	$queue{$widget+0}++ and next; # duplicates are common
		3389
		3390	push @{ $queue[$widget->{visible}] }, $widget;
		3391	}
3175	}	3392	}
3176		3393
3177	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3394	while () {
		3395	@queue or last outer;
3178		3396
3179	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3397	$widget = pop @{ $queue[-1] || [] }
3180	? @$widget{qw(user_w user_h)}	3398	and last;
3181	: $widget->size_request;
3182
3183	if (delete $widget->{force_alloc}
3184	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186		3399
		3400	pop @queue;
		3401	}
		3402
		3403	delete $queue{$widget+0};
		3404
		3405	my ($w, $h) = $widget->size_request;
		3406
		3407	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3408	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3409
		3410	$w = $widget->{force_w} if exists $widget->{force_w};
		3411	$h = $widget->{force_h} if exists $widget->{force_h};
		3412
		3413	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3414	|| delete $widget->{force_realloc}) {
3187	$widget->{req_w} = $w;	3415	$widget->{req_w} = $w;
3188	$widget->{req_h} = $h;	3416	$widget->{req_h} = $h;
3189		3417
3190	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3418	$self->{size_alloc}{$widget+0} = $widget;
3191		3419
3192	$widget->{parent}->check_size
3193	if $widget->{parent};	3420	if (my $parent = $widget->{parent}) {
		3421	$self->{realloc}{$parent+0} = $parent
		3422	unless $queue{$parent+0};
		3423
		3424	$parent->{force_size_alloc} = 1;
		3425	$self->{size_alloc}{$parent+0} = $parent;
		3426	}
3194	}	3427	}
		3428
		3429	delete $self->{realloc}{$widget+0};
3195	}	3430	}
3196	}	3431	}
3197		3432
3198	while ($self->{size_alloc}) {	3433	while (my $size_alloc = delete $self->{size_alloc}) {
3199	for (values %{delete $self->{size_alloc}}) {	3434	my @queue = sort { $b->{visible} <=> $a->{visible} }
3200	my ($widget, $w, $h) = @$_;	3435	values %$size_alloc;
		3436
		3437	while () {
		3438	my $widget = pop @queue || last;
		3439
		3440	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201		3441
3202	$w = 0 if $w < 0;	3442	$w = 0 if $w < 0;
3203	$h = 0 if $h < 0;	3443	$h = 0 if $h < 0;
3204		3444
		3445	$w = int $w + 0.5;
		3446	$h = int $h + 0.5;
		3447
		3448	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3449	$widget->{old_w} = $widget->{w};
		3450	$widget->{old_h} = $widget->{h};
		3451
3205	$widget->{w} = $w;	3452	$widget->{w} = $w;
3206	$widget->{h} = $h;	3453	$widget->{h} = $h;
		3454
3207	$widget->emit (size_allocate => $w, $h);	3455	$widget->emit (size_allocate => $w, $h);
		3456	}
3208	}	3457	}
3209	}	3458	}
3210		3459
3211	while ($self->{post_alloc_hook}) {	3460	while ($self->{post_alloc_hook}) {
3212	$_->()	3461	$_->()
3213	for values %{delete $self->{post_alloc_hook}};	3462	for values %{delete $self->{post_alloc_hook}};
3214	}	3463	}
		3464
3215		3465
3216	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3466	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3467	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218	glClear GL_COLOR_BUFFER_BIT;	3468	glClear GL_COLOR_BUFFER_BIT;
3219		3469

Diff Legend

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