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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 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} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $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} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $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
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
315	}	376	}
316		377
317	sub set_max_size {	378	sub set_max_size {
318	my ($self, $w, $h) = @_;	379	my ($self, $w, $h) = @_;
…		…
321	delete $self->{max_h}; $self->{max_h} = $h if $h;	382	delete $self->{max_h}; $self->{max_h} = $h if $h;
322	}	383	}
323		384
324	sub set_tooltip {	385	sub set_tooltip {
325	my ($self, $tooltip) = @_;	386	my ($self, $tooltip) = @_;
		387
		388	$tooltip =~ s/^\s+//;
		389	$tooltip =~ s/\s+$//;
		390
		391	return if $self->{tooltip} eq $tooltip;
326		392
327	$self->{tooltip} = $tooltip;	393	$self->{tooltip} = $tooltip;
328		394
329	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330	delete $CFClient::UI::TOOLTIP->{owner};	396	delete $CFClient::UI::TOOLTIP->{owner};
…		…
384	my ($self, $ev, $x, $y) = @_;	450	my ($self, $ev, $x, $y) = @_;
385		451
386	$self->focus_in;	452	$self->focus_in;
387	}	453	}
388		454
389	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	455	sub find_widget {
390	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	456	my ($self, $x, $y) = @_;
391	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	457
392	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	458	return () unless $self->{can_events};
393	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	459
		460	return $self
		461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		463
		464	()
		465	}
		466
		467	sub set_parent {
		468	my ($self, $parent) = @_;
		469
		470	Scalar::Util::weaken ($self->{parent} = $parent);
		471	$self->set_visible if $parent->{visible};
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub _emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		484	}
		485
		486	sub emit {
		487	my ($self, $signal, @args) = @_;
		488
		489	$self->_emit ($signal, @args)
		490	|| $self->$signal (@args);
		491	}
		492
		493	sub visibility_change {
		494	#my ($self, $visible) = @_;
		495	}
		496
		497	sub realloc {
		498	my ($self) = @_;
		499
		500	if ($self->{visible}) {
		501	return if $self->{root}{realloc}{$self+0};
		502
		503	$self->{root}{realloc}{$self+0} = $self;
		504	$self->{root}->update;
		505	} else {
		506	delete $self->{req_w};
		507	delete $self->{req_h};
		508	}
		509	}
		510
		511	sub update {
		512	my ($self) = @_;
		513
		514	$self->{parent}->update
		515	if $self->{parent};
		516	}
		517
		518	sub reconfigure {
		519	my ($self) = @_;
		520
		521	$self->realloc;
		522	$self->update;
		523	}
		524
		525	# using global variables seems a bit hacky, but passing through all drawing
		526	# functions seems pointless.
		527	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
394		528
395	sub draw {	529	sub draw {
396	my ($self) = @_;	530	my ($self) = @_;
397		531
398	return unless $self->{h} && $self->{w};	532	return unless $self->{h} && $self->{w};
		533
		534	# update screen rectangle
		535	local $draw_x = $draw_x + $self->{x};
		536	local $draw_y = $draw_y + $self->{y};
		537	local $draw_w = $draw_x + $self->{w};
		538	local $draw_h = $draw_y + $self->{h};
		539
		540	# skip widgets that are entirely outside the drawing area
		541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
399		543
400	glPushMatrix;	544	glPushMatrix;
401	glTranslate $self->{x}, $self->{y}, 0;	545	glTranslate $self->{x}, $self->{y}, 0;
402	$self->_draw;	546	$self->_draw;
403	glPopMatrix;	547	glPopMatrix;
…		…
415	glVertex $x , $y + $self->{h};	559	glVertex $x , $y + $self->{h};
416	glEnd;	560	glEnd;
417	glDisable GL_BLEND;	561	glDisable GL_BLEND;
418	}	562	}
419		563
420	if ($ENV{PCLIENT_DEBUG}) {	564	if ($ENV{CFPLUS_DEBUG} & 1) {
421	glPushMatrix;	565	glPushMatrix;
422	glColor 1, 1, 0, 1;	566	glColor 1, 1, 0, 1;
423	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424	glBegin GL_LINE_LOOP;	568	glBegin GL_LINE_LOOP;
425	glVertex 0 , 0;	569	glVertex 0 , 0;
426	glVertex $self->{w}, 0;	570	glVertex $self->{w} - 1, 0;
427	glVertex $self->{w}, $self->{h};	571	glVertex $self->{w} - 1, $self->{h} - 1;
428	glVertex 0 , $self->{h};	572	glVertex 0 , $self->{h} - 1;
429	glEnd;	573	glEnd;
430	glPopMatrix;	574	glPopMatrix;
431	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432	}	576	}
433	}	577	}
434		578
435	sub _draw {	579	sub _draw {
436	my ($self) = @_;	580	my ($self) = @_;
437		581
438	warn "no draw defined for $self\n";	582	warn "no draw defined for $self\n";
439	}
440
441	sub find_widget {
442	my ($self, $x, $y) = @_;
443
444	return () unless $self->{can_events};
445
446	return $self
447	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450	()
451	}
452
453	sub set_parent {
454	my ($self, $parent) = @_;
455
456	Scalar::Util::weaken ($self->{parent} = $parent);
457
458	# TODO: req_w _does_change after ->reconfigure
459	$self->check_size
460	unless exists $self->{req_w};
461
462	$self->show;
463	}
464
465	sub check_size {
466	my ($self, $forced) = @_;
467
468	$self->{force_alloc} = 1 if $forced;
469	$CFClient::UI::ROOT->{check_size}{$self} = $self;
470	}
471
472	sub update {
473	my ($self) = @_;
474
475	$self->{parent}->update
476	if $self->{parent};
477	}
478
479	sub connect {
480	my ($self, $signal, $cb) = @_;
481
482	push @{ $self->{signal_cb}{$signal} }, $cb;
483	}
484
485	sub _emit {
486	my ($self, $signal, @args) = @_;
487
488	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489	}
490
491	sub emit {
492	my ($self, $signal, @args) = @_;
493
494	$self->_emit ($signal, @args)
495	|| $self->$signal (@args);
496	}	583	}
497		584
498	sub DESTROY {	585	sub DESTROY {
499	my ($self) = @_;	586	my ($self) = @_;
500		587
…		…
558	my ($class, %arg) = @_;	645	my ($class, %arg) = @_;
559	$class->SUPER::new (can_events => 0, %arg);	646	$class->SUPER::new (can_events => 0, %arg);
560	}	647	}
561		648
562	sub size_request {	649	sub size_request {
563	(0, 0)	650	my ($self) = @_;
		651
		652	($self->{w} + 0, $self->{h} + 0)
564	}	653	}
565		654
566	sub draw { }	655	sub draw { }
567		656
568	#############################################################################	657	#############################################################################
…		…
597	$self->{children} = [	686	$self->{children} = [
598	sort { $a->{z} <=> $b->{z} }	687	sort { $a->{z} <=> $b->{z} }
599	@{$self->{children}}, @widgets	688	@{$self->{children}}, @widgets
600	];	689	];
601		690
602	$self->check_size (1);	691	$self->realloc;
603	$self->update;
604	}	692	}
605		693
606	sub children {	694	sub children {
607	@{ $_[0]{children} }	695	@{ $_[0]{children} }
608	}	696	}
…		…
613	delete $child->{parent};	701	delete $child->{parent};
614	$child->hide;	702	$child->hide;
615		703
616	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	704	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617		705
618	$self->check_size;	706	$self->realloc;
619	$self->update;
620	}	707	}
621		708
622	sub clear {	709	sub clear {
623	my ($self) = @_;	710	my ($self) = @_;
624		711
…		…
628	for (@$children) {	715	for (@$children) {
629	delete $_->{parent};	716	delete $_->{parent};
630	$_->hide;	717	$_->hide;
631	}	718	}
632		719
633	$self->check_size;	720	$self->realloc;
634	$self->update;
635	}	721	}
636		722
637	sub find_widget {	723	sub find_widget {
638	my ($self, $x, $y) = @_;	724	my ($self, $x, $y) = @_;
639		725
…		…
726	$self->SUPER::size_allocate ($w, $h);	812	$self->SUPER::size_allocate ($w, $h);
727	$self->update;	813	$self->update;
728	}	814	}
729		815
730	sub _render {	816	sub _render {
		817	my ($self) = @_;
		818
731	$_[0]{children}[0]->draw;	819	$self->{children}[0]->draw;
732	}	820	}
733		821
734	sub render_child {	822	sub render_child {
735	my ($self) = @_;	823	my ($self) = @_;
736		824
737	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	825	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738	glClearColor 0, 0, 0, 0;	826	glClearColor 0, 0, 0, 0;
739	glClear GL_COLOR_BUFFER_BIT;	827	glClear GL_COLOR_BUFFER_BIT;
740		828
		829	{
		830	package CFClient::UI::Base;
		831
		832	($draw_x, $draw_y, $draw_w, $draw_h) =
		833	(0, 0, $self->{w}, $self->{h});
		834	}
		835
741	$self->_render;	836	$self->_render;
742	};	837	};
743	}	838	}
744		839
745	sub _draw {	840	sub _draw {
746	my ($self) = @_;	841	my ($self) = @_;
747		842
748	my ($w, $h) = ($self->w, $self->h);	843	my ($w, $h) = @$self{qw(w h)};
749		844
750	my $tex = $self->{texture}	845	my $tex = $self->{texture}
751	or return;	846	or return;
752		847
753	glEnable GL_TEXTURE_2D;	848	glEnable GL_TEXTURE_2D;
…		…
763		858
764	package CFClient::UI::ViewPort;	859	package CFClient::UI::ViewPort;
765		860
766	our @ISA = CFClient::UI::Window::;	861	our @ISA = CFClient::UI::Window::;
767		862
		863	sub new {
		864	my $class = shift;
		865
		866	$class->SUPER::new (
		867	scroll_x => 0,
		868	scroll_y => 1,
		869	@_,
		870	)
		871	}
		872
768	sub size_request {	873	sub size_request {
769	my ($self) = @_;	874	my ($self) = @_;
770		875
771	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	876	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772		877
773	@$self{qw(child_w child_h)}	878	$w = 10 if $self->{scroll_x};
		879	$h = 10 if $self->{scroll_y};
		880
		881	($w, $h)
774	}	882	}
775		883
776	sub size_allocate {	884	sub size_allocate {
777	my ($self, $w, $h) = @_;	885	my ($self, $w, $h) = @_;
778		886
779	my ($cw, $ch) = @$self{qw(child_w child_h)};	887	my $child = $self->child;
780	# $w = $self->{w};	888
		889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		891
781	$self->child->configure (0, 0, $cw, $ch);	892	$self->child->configure (0, 0, $w, $h);
782	$self->update;	893	$self->update;
783	}	894	}
784		895
785	sub set_offset {	896	sub set_offset {
786	my ($self, $x, $y) = @_;	897	my ($self, $x, $y) = @_;
…		…
820	}	931	}
821		932
822	sub _render {	933	sub _render {
823	my ($self) = @_;	934	my ($self) = @_;
824		935
		936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		938
825	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826		940
827	$self->SUPER::_render;	941	$self->SUPER::_render;
828	}	942	}
829		943
…		…
837	my $class = shift;	951	my $class = shift;
838		952
839	my $self;	953	my $self;
840		954
841	my $slider = new CFClient::UI::Slider	955	my $slider = new CFClient::UI::Slider
842	vertical => 1,	956	vertical => 1,
843	range => [0, 0, 1, 0.01], # HACK fix	957	range => [0, 0, 1, 0.01], # HACK fix
844	connect_changed => sub {	958	on_changed => sub {
845	$self->{vp}->set_offset (0, $_[1]);	959	$self->{vp}->set_offset (0, $_[1]);
846	},	960	},
847	;	961	;
848		962
849	$self = $class->SUPER::new (	963	$self = $class->SUPER::new (
…		…
855	$self->{vp}->add ($self->{scrolled});	969	$self->{vp}->add ($self->{scrolled});
856	$self->add ($self->{vp});	970	$self->add ($self->{vp});
857	$self->add ($self->{slider});	971	$self->add ($self->{slider});
858		972
859	$self	973	$self
		974	}
		975
		976	sub update {
		977	my ($self) = @_;
		978
		979	$self->SUPER::update;
		980
		981	# todo: overwrite size_allocate of child
		982	my $child = $self->{vp}->child;
		983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860	}	984	}
861		985
862	sub size_allocate {	986	sub size_allocate {
863	my ($self, $w, $h) = @_;	987	my ($self, $w, $h) = @_;
864		988
…		…
917		1041
918	our @ISA = CFClient::UI::Bin::;	1042	our @ISA = CFClient::UI::Bin::;
919		1043
920	use CFClient::OpenGL;	1044	use CFClient::OpenGL;
921		1045
922	my @tex =	1046	my $bg =
		1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1048	mipmap => 1, wrap => 1;
		1049
		1050	my @border =
923	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925		1053
926	sub new {	1054	sub new {
927	my $class = shift;	1055	my $class = shift;
928
929	# TODO: user_x, user_y, overwrite moveto?
930		1056
931	my $self = $class->SUPER::new (	1057	my $self = $class->SUPER::new (
932	bg => [1, 1, 1, 1],	1058	bg => [1, 1, 1, 1],
933	border_bg => [1, 1, 1, 1],	1059	border_bg => [1, 1, 1, 1],
934	border => 0.6,	1060	border => 0.6,
935	is_toplevel => 1,
936	can_events => 1,	1061	can_events => 1,
		1062	min_w => 16,
		1063	min_h => 16,
937	@_	1064	@_
938	);	1065	);
939		1066
940	$self->{title} &&= new CFClient::UI::Label	1067	$self->{title} &&= new CFClient::UI::Label
941	align => 0,	1068	align => 0,
…		…
994	my ($ev, $x, $y) = @_;	1121	my ($ev, $x, $y) = @_;
995		1122
996	my $dx = $ev->{x} - $ox;	1123	my $dx = $ev->{x} - $ox;
997	my $dy = $ev->{y} - $oy;	1124	my $dy = $ev->{y} - $oy;
998		1125
999	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1128
		1129	$self->realloc;
1001	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002	$self->check_size;
1003	};	1131	};
1004		1132
1005	} elsif ($lr ^ $td) {	1133	} elsif ($lr ^ $td) {
1006	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007	my ($bx, $by) = ($self->{x}, $self->{y});	1135	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1009	$self->{motion} = sub {	1137	$self->{motion} = sub {
1010	my ($ev, $x, $y) = @_;	1138	my ($ev, $x, $y) = @_;
1011		1139
1012	($x, $y) = ($ev->{x}, $ev->{y});	1140	($x, $y) = ($ev->{x}, $ev->{y});
1013		1141
1014	$self->move ($bx + $x - $ox, $by + $y - $oy);	1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015	$self->update;
1016	};	1143	};
1017	}	1144	}
1018	}	1145	}
1019		1146
1020	sub button_up {	1147	sub button_up {
…		…
1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040		1167
1041	my $border = $self->border;	1168	my $border = $self->border;
1042		1169
1043	glColor @{ $self->{border_bg} };	1170	glColor @{ $self->{border_bg} };
1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1174	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048		1175
1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050	my $bg = $tex[0];	1177	glColor @{ $self->{bg} };
1051		1178
1052	# TODO: repeat texture not scale	1179	# TODO: repeat texture not scale
		1180	# solve this better(?)
1053	my $rep_x = $cw / $bg->{w};	1181	$bg->{s} = $cw / $bg->{w};
1054	my $rep_y = $ch / $bg->{h};	1182	$bg->{t} = $ch / $bg->{h};
1055
1056	glColor @{ $self->{bg} };
1057
1058	$bg->{s} = $rep_x;
1059	$bg->{t} = $rep_y;
1060	$bg->{wrap_mode} = 1;
1061	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062	}	1184	}
1063		1185
1064	glDisable GL_TEXTURE_2D;	1186	glDisable GL_TEXTURE_2D;
1065		1187
…		…
1081	sub new {	1203	sub new {
1082	my $class = shift;	1204	my $class = shift;
1083		1205
1084	$class->SUPER::new (	1206	$class->SUPER::new (
1085	col_expand => [],	1207	col_expand => [],
1086	@_	1208	@_,
1087	)	1209	)
		1210	}
		1211
		1212	sub children {
		1213	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088	}	1214	}
1089		1215
1090	sub add {	1216	sub add {
1091	my ($self, $x, $y, $child) = @_;	1217	my ($self, $x, $y, $child) = @_;
1092		1218
1093	$child->set_parent ($self);	1219	$child->set_parent ($self);
1094	$self->{children}[$y][$x] = $child;	1220	$self->{children}[$y][$x] = $child;
1095		1221
1096	$child->check_size;	1222	$self->realloc;
1097	}	1223	}
1098		1224
1099	sub children {
1100	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101	}
1102
1103	# TODO: move to container class maybe? send childs a signal on removal?	1225	# TODO: move to container class maybe? send children a signal on removal?
1104	sub clear {	1226	sub clear {
1105	my ($self) = @_;	1227	my ($self) = @_;
1106		1228
1107	my @children = $self->children;	1229	my @children = $self->children;
1108	delete $self->{children};	1230	delete $self->{children};
…		…
1110	for (@children) {	1232	for (@children) {
1111	delete $_->{parent};	1233	delete $_->{parent};
1112	$_->hide;	1234	$_->hide;
1113	}	1235	}
1114		1236
1115	$self->update;	1237	$self->realloc;
1116	}	1238	}
1117		1239
1118	sub get_wh {	1240	sub get_wh {
1119	my ($self) = @_;	1241	my ($self) = @_;
1120		1242
…		…
1151	sub size_allocate {	1273	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1274	my ($self, $w, $h) = @_;
1153		1275
1154	my ($ws, $hs) = $self->get_wh;	1276	my ($ws, $hs) = $self->get_wh;
1155		1277
1156	my $req_w = sum @$ws;	1278	my $req_w = (sum @$ws) || 1;
1157	my $req_h = sum @$hs;	1279	my $req_h = (sum @$hs) || 1;
1158		1280
1159	# TODO: nicer code && do row_expand	1281	# TODO: nicer code && do row_expand
1160	my @col_expand = @{$self->{col_expand}};	1282	my @col_expand = @{$self->{col_expand}};
1161	@col_expand = (1) x @$ws unless @col_expand;	1283	@col_expand = (1) x @$ws unless @col_expand;
1162	my $col_expand = (sum @col_expand) || 1;	1284	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1338	}
1217	}	1339	}
1218		1340
1219	#############################################################################	1341	#############################################################################
1220		1342
1221	package CFClient::UI::HBox;	1343	package CFClient::UI::Box;
1222
1223	# TODO: wrap into common Box base class
1224		1344
1225	our @ISA = CFClient::UI::Container::;	1345	our @ISA = CFClient::UI::Container::;
1226		1346
1227	sub size_request {	1347	sub size_request {
1228	my ($self) = @_;	1348	my ($self) = @_;
1229		1349
1230	my @alloc = map [$_->size_request], @{$self->{children}};	1350	$self->{vertical}
1231		1351	? (
1232	(	1352	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1233	(List::Util::sum map $_->[0], @alloc),	1353	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234	(List::Util::max map $_->[1], @alloc),	1354	)
1235	)	1355	: (
		1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1358	)
1236	}	1359	}
1237		1360
1238	sub size_allocate {	1361	sub size_allocate {
1239	my ($self, $w, $h) = @_;	1362	my ($self, $w, $h) = @_;
1240		1363
1241	($h, $w) = ($w, $h);	1364	my $space = $self->{vertical} ? $h : $w;
1242
1243	my $children = $self->{children};	1365	my $children = $self->{children};
1244		1366
1245	my @h = map $_->{req_w}, @$children;	1367	my @req;
1246		1368
1247	my $req_h = List::Util::sum @h;	1369	if ($self->{homogeneous}) {
1248		1370	@req = ($space / (@$children || 1)) x @$children;
1249	if ($req_h > $h) {
1250	# ah well, not enough space
1251	$_ *= $h / $req_h for @h;
1252	} else {	1371	} else {
		1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1373	my $req = List::Util::sum @req;
		1374
		1375	if ($req > $space) {
		1376	# ah well, not enough space
		1377	$_ *= $space / $req for @req;
		1378	} else {
1253	my $exp = List::Util::sum map $_->{expand}, @$children;	1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254	$exp ||= 1;
1255		1380
		1381	$space = ($space - $req) / $expand; # remaining space to give away
		1382
		1383	$req[$_] += $space * $children->[$_]{expand}
1256	for (0 .. $#$children) {	1384	for 0 .. $#$children;
1257	my $child = $children->[$_];
1258
1259	my $alloc_h = $h[$_];
1260	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261	$h[$_] = $alloc_h;
1262	}	1385	}
1263	}	1386	}
1264		1387
1265	CFClient::UI::harmonize \@h;	1388	CFClient::UI::harmonize \@req;
1266		1389
1267	my $y = 0;	1390	my $pos = 0;
1268	for (0 .. $#$children) {	1391	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270	my $h = $h[$_];	1392	my $alloc = $req[$_];
1271	$child->configure ($y, 0, $h, $w);	1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272		1394
1273	$y += $h;	1395	$pos += $alloc;
1274	}	1396	}
1275		1397
1276	1	1398	1
1277	}	1399	}
1278		1400
1279	#############################################################################	1401	#############################################################################
1280		1402
		1403	package CFClient::UI::HBox;
		1404
		1405	our @ISA = CFClient::UI::Box::;
		1406
		1407	sub new {
		1408	my $class = shift;
		1409
		1410	$class->SUPER::new (
		1411	vertical => 0,
		1412	@_,
		1413	)
		1414	}
		1415
		1416	#############################################################################
		1417
1281	package CFClient::UI::VBox;	1418	package CFClient::UI::VBox;
1282		1419
1283	# TODO: wrap into common Box base class
1284
1285	our @ISA = CFClient::UI::Container::;	1420	our @ISA = CFClient::UI::Box::;
1286		1421
1287	sub size_request {	1422	sub new {
1288	my ($self) = @_;	1423	my $class = shift;
1289		1424
1290	my @alloc = map [$_->size_request], @{$self->{children}};	1425	$class->SUPER::new (
1291		1426	vertical => 1,
1292	(	1427	@_,
1293	(List::Util::max map $_->[0], @alloc),
1294	(List::Util::sum map $_->[1], @alloc),
1295	)	1428	)
1296	}
1297
1298	sub size_allocate {
1299	my ($self, $w, $h) = @_;
1300
1301	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303	my $children = $self->{children};
1304
1305	my @h = map $_->{req_h}, @$children;
1306
1307	my $req_h = List::Util::sum @h;
1308
1309	if ($req_h > $h) {
1310	# ah well, not enough space
1311	$_ *= $h / $req_h for @h;
1312	} else {
1313	my $exp = List::Util::sum map $_->{expand}, @$children;
1314	$exp ||= 1;
1315
1316	for (0 .. $#$children) {
1317	my $child = $children->[$_];
1318
1319	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320	}
1321	}
1322
1323	CFClient::UI::harmonize \@h;
1324
1325	my $y = 0;
1326	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];
1329	$child->configure (0, $y, $w, $h);
1330
1331	$y += $h;
1332	}
1333
1334	1
1335	}	1429	}
1336		1430
1337	#############################################################################	1431	#############################################################################
1338		1432
1339	package CFClient::UI::Label;	1433	package CFClient::UI::Label;
…		…
1356	ellipsise => 3, # end	1450	ellipsise => 3, # end
1357	layout => (new CFClient::Layout),	1451	layout => (new CFClient::Layout),
1358	fontsize => 1,	1452	fontsize => 1,
1359	align => -1,	1453	align => -1,
1360	valign => -1,	1454	valign => -1,
1361	padding => 2,	1455	padding_x => 2,
		1456	padding_y => 2,
1362	can_events => 0,	1457	can_events => 0,
1363	%arg	1458	%arg
1364	);	1459	);
1365		1460
1366	if (exists $self->{template}) {	1461	if (exists $self->{template}) {
…		…
1402	$self->{text} = "T$text";	1497	$self->{text} = "T$text";
1403		1498
1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405	$self->{layout}->set_text ($text);	1500	$self->{layout}->set_text ($text);
1406		1501
		1502	$self->realloc;
1407	$self->update;	1503	$self->update;
1408	$self->check_size;
1409	}	1504	}
1410		1505
1411	sub set_markup {	1506	sub set_markup {
1412	my ($self, $markup) = @_;	1507	my ($self, $markup) = @_;
1413		1508
…		…
1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418		1513
1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420	$self->{layout}->set_markup ($markup);	1515	$self->{layout}->set_markup ($markup);
1421		1516
		1517	$self->realloc;
1422	$self->update;	1518	$self->update;
1423	$self->check_size;
1424	}	1519	}
1425		1520
1426	sub size_request {	1521	sub size_request {
1427	my ($self) = @_;	1522	my ($self) = @_;
1428		1523
…		…
1442		1537
1443	$w = List::Util::max $w, $w2;	1538	$w = List::Util::max $w, $w2;
1444	$h = List::Util::max $h, $h2;	1539	$h = List::Util::max $h, $h2;
1445	}	1540	}
1446		1541
1447	(	1542	($w, $h)
1448	$w + $self->{padding} * 2,
1449	$h + $self->{padding} * 2,
1450	)
1451	}	1543	}
1452		1544
1453	sub size_allocate {	1545	sub size_allocate {
1454	my ($self, $w, $h) = @_;	1546	my ($self, $w, $h) = @_;
1455		1547
1456	delete $self->{texture};	1548	delete $self->{texture}
		1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457	}	1550	}
1458		1551
1459	sub set_fontsize {	1552	sub set_fontsize {
1460	my ($self, $fontsize) = @_;	1553	my ($self, $fontsize) = @_;
1461		1554
1462	$self->{fontsize} = $fontsize;	1555	$self->{fontsize} = $fontsize;
1463	delete $self->{texture};	1556	delete $self->{texture};
1464		1557
1465	$self->update;	1558	$self->realloc;
1466	$self->check_size;
1467	}	1559	}
1468		1560
1469	sub _draw {	1561	sub _draw {
1470	my ($self) = @_;	1562	my ($self) = @_;
1471		1563
…		…
1479	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481		1573
1482	my $tex = new_from_layout CFClient::Texture $self->{layout};	1574	my $tex = new_from_layout CFClient::Texture $self->{layout};
1483		1575
1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486	: ($self->{w} - $tex->{w}) * 0.5);	1578	: ($self->{w} - $tex->{w}) * 0.5);
1487		1579
1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490	: ($self->{h} - $tex->{h}) * 0.5);	1582	: ($self->{h} - $tex->{h}) * 0.5);
1491		1583
1492	$tex	1584	$tex
1493	};	1585	};
1494		1586
…		…
1551	sub set_text {	1643	sub set_text {
1552	my ($self, $text) = @_;	1644	my ($self, $text) = @_;
1553		1645
1554	$self->{cursor} = length $text;	1646	$self->{cursor} = length $text;
1555	$self->_set_text ($text);	1647	$self->_set_text ($text);
1556	$self->update;	1648
1557	$self->check_size;	1649	$self->realloc;
1558	}	1650	}
1559		1651
1560	sub get_text {	1652	sub get_text {
1561	$_[0]{text}	1653	$_[0]{text}
1562	}	1654	}
…		…
1595	} elsif ($uni) {	1687	} elsif ($uni) {
1596	substr $text, $self->{cursor}++, 0, chr $uni;	1688	substr $text, $self->{cursor}++, 0, chr $uni;
1597	}	1689	}
1598		1690
1599	$self->_set_text ($text);	1691	$self->_set_text ($text);
1600	$self->update;	1692
1601	$self->check_size;	1693	$self->realloc;
1602	}	1694	}
1603		1695
1604	sub focus_in {	1696	sub focus_in {
1605	my ($self) = @_;	1697	my ($self) = @_;
1606		1698
…		…
1733		1825
1734	sub new {	1826	sub new {
1735	my $class = shift;	1827	my $class = shift;
1736		1828
1737	$class->SUPER::new (	1829	$class->SUPER::new (
1738	padding => 4,	1830	padding_x => 4,
		1831	padding_y => 4,
1739	fg => [1, 1, 1],	1832	fg => [1, 1, 1],
1740	active_fg => [0, 0, 1],	1833	active_fg => [0, 0, 1],
1741	can_hover => 1,	1834	can_hover => 1,
1742	align => 0,	1835	align => 0,
1743	valign => 0,	1836	valign => 0,
…		…
1790		1883
1791	sub new {	1884	sub new {
1792	my $class = shift;	1885	my $class = shift;
1793		1886
1794	$class->SUPER::new (	1887	$class->SUPER::new (
1795	padding => 2,	1888	padding_x => 2,
		1889	padding_y => 2,
1796	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1797	active_fg => [1, 1, 0],	1891	active_fg => [1, 1, 0],
1798	bg => [0, 0, 0, 0.2],	1892	bg => [0, 0, 0, 0.2],
1799	active_bg => [1, 1, 1, 0.5],	1893	active_bg => [1, 1, 1, 0.5],
1800	state => 0,	1894	state => 0,
…		…
1804	}	1898	}
1805		1899
1806	sub size_request {	1900	sub size_request {
1807	my ($self) = @_;	1901	my ($self) = @_;
1808		1902
1809	($self->{padding} * 2 + 6) x 2	1903	(6) x 2
1810	}	1904	}
1811		1905
1812	sub button_down {	1906	sub button_down {
1813	my ($self, $ev, $x, $y) = @_;	1907	my ($self, $ev, $x, $y) = @_;
1814		1908
1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817	$self->{state} = !$self->{state};	1911	$self->{state} = !$self->{state};
1818	$self->_emit (changed => $self->{state});	1912	$self->_emit (changed => $self->{state});
1819	}	1913	}
1820	}	1914	}
1821		1915
1822	sub _draw {	1916	sub _draw {
1823	my ($self) = @_;	1917	my ($self) = @_;
1824		1918
1825	$self->SUPER::_draw;	1919	$self->SUPER::_draw;
1826		1920
1827	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1921	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828		1922
1829	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1923	my ($w, $h) = @$self{qw(w h)};
		1924
		1925	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830		1926
1831	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1927	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832		1928
1833	my $tex = $self->{state} ? $tex[1] : $tex[0];	1929	my $tex = $self->{state} ? $tex[1] : $tex[0];
1834		1930
…		…
2099	fg => [1, 1, 1],	2195	fg => [1, 1, 1],
2100	active_fg => [0, 0, 0],	2196	active_fg => [0, 0, 0],
2101	bg => [0, 0, 0, 0.2],	2197	bg => [0, 0, 0, 0.2],
2102	active_bg => [1, 1, 1, 0.5],	2198	active_bg => [1, 1, 1, 0.5],
2103	range => [0, 0, 100, 10, 0],	2199	range => [0, 0, 100, 10, 0],
2104	req_w => $::WIDTH / 80,	2200	min_w => $::WIDTH / 80,
2105	req_h => $::WIDTH / 80,	2201	min_h => $::WIDTH / 80,
2106	vertical => 0,	2202	vertical => 0,
2107	can_hover => 1,	2203	can_hover => 1,
2108	inner_pad => 0.02,	2204	inner_pad => 0.02,
2109	@_	2205	@_
2110	);	2206	);
…		…
2113	$self->update;	2209	$self->update;
2114		2210
2115	$self	2211	$self
2116	}	2212	}
2117		2213
		2214	sub changed { }
		2215
2118	sub set_range {	2216	sub set_range {
2119	my ($self, $range) = @_;	2217	my ($self, $range) = @_;
2120		2218
2121	$self->{range} = $range;	2219	($range, $self->{range}) = ($self->{range}, $range);
2122		2220
2123	$self->update;	2221	$self->update
		2222	if "@$range" ne "@{$self->{range}}";
2124	}	2223	}
2125		2224
2126	sub set_value {	2225	sub set_value {
2127	my ($self, $value) = @_;	2226	my ($self, $value) = @_;
2128		2227
…		…
2147	}	2246	}
2148		2247
2149	sub size_request {	2248	sub size_request {
2150	my ($self) = @_;	2249	my ($self) = @_;
2151		2250
2152	my $w = $self->{req_w};	2251	($self->{req_w}, $self->{req_h})
2153	my $h = $self->{req_h};
2154
2155	$self->{vertical} ? ($h, $w) : ($w, $h)
2156	}	2252	}
2157		2253
2158	sub button_down {	2254	sub button_down {
2159	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2160		2256
…		…
2511		2607
2512	sub new {	2608	sub new {
2513	my $class = shift;	2609	my $class = shift;
2514		2610
2515	my $self = $class->SUPER::new (	2611	my $self = $class->SUPER::new (
2516	state => 0,	2612	state => 0,
2517	connect_activate => \&toggle_flopper,	2613	on_activate => \&toggle_flopper,
2518	@_	2614	@_
2519	);	2615	);
2520		2616
2521	if ($self->{state}) {
2522	$self->{state} = 0;
2523	$self->toggle_flopper;
2524	}
2525
2526	$self	2617	$self
2527	}	2618	}
2528		2619
2529	sub toggle_flopper {	2620	sub toggle_flopper {
2530	my ($self) = @_;	2621	my ($self) = @_;
2531		2622
2532	# TODO: use animation	2623	$self->{other}->toggle_visibility;
2533	if ($self->{state} = !$self->{state}) {
2534	$CFClient::UI::ROOT->add ($self->{other});
2535	$self->{other}->move ($self->coord2global (0, $self->{h}));
2536	$self->_emit ("open");
2537	} else {
2538	$CFClient::UI::ROOT->remove ($self->{other});
2539	$self->_emit ("close");
2540	}
2541
2542	$self->_emit (changed => $self->{state});
2543	}	2624	}
2544		2625
2545	#############################################################################	2626	#############################################################################
2546		2627
2547	package CFClient::UI::Tooltip;	2628	package CFClient::UI::Tooltip;
…		…
2560	}	2641	}
2561		2642
2562	sub set_tooltip_from {	2643	sub set_tooltip_from {
2563	my ($self, $widget) = @_;	2644	my ($self, $widget) = @_;
2564		2645
		2646	my $tooltip = $widget->{tooltip};
		2647
		2648	if ($ENV{CFPLUS_DEBUG} & 2) {
		2649	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2651	. "req $widget->{req_w} $widget->{req_h}\n"
		2652	. "visible $widget->{visible}";
		2653	}
		2654
2565	$self->add (new CFClient::UI::Label	2655	$self->add (new CFClient::UI::Label
2566	markup => $widget->{tooltip},	2656	markup => $tooltip,
2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568	fontsize => 0.8,	2658	fontsize => 0.8,
2569	fg => [0, 0, 0, 1],	2659	fg => [0, 0, 0, 1],
2570	ellipsise => 0,	2660	ellipsise => 0,
2571	font => ($widget->{tooltip_font} || $::FONT_PROP),	2661	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2582		2672
2583	sub size_allocate {	2673	sub size_allocate {
2584	my ($self, $w, $h) = @_;	2674	my ($self, $w, $h) = @_;
2585		2675
2586	$self->SUPER::size_allocate ($w - 4, $h - 4);	2676	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2677	}
		2678
		2679	sub visibility_change {
		2680	my ($self, $visible) = @_;
		2681
		2682	return unless $visible;
		2683
		2684	$self->{root}->on_post_alloc ("move_$self" => sub {
		2685	my $widget = $self->{owner}
		2686	or return;
		2687
		2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2689
		2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2691	if $x + $self->{w} > $::WIDTH;
		2692
		2693	$self->move_abs ($x, $y);
		2694	});
2587	}	2695	}
2588		2696
2589	sub _draw {	2697	sub _draw {
2590	my ($self) = @_;	2698	my ($self) = @_;
2591		2699
…		…
2608	glVertex $w, $h;	2716	glVertex $w, $h;
2609	glVertex $w, 0;	2717	glVertex $w, 0;
2610	glEnd;	2718	glEnd;
2611		2719
2612	glTranslate 2 - 0.375, 2 - 0.375;	2720	glTranslate 2 - 0.375, 2 - 0.375;
		2721
2613	$self->SUPER::_draw;	2722	$self->SUPER::_draw;
2614	}	2723	}
2615		2724
2616	#############################################################################	2725	#############################################################################
2617		2726
…		…
2623		2732
2624	sub new {	2733	sub new {
2625	my $class = shift;	2734	my $class = shift;
2626		2735
2627	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2628	aspect => 1,	2737	aspect => 1,
		2738	can_events => 0,
2629	@_,	2739	@_,
2630	);	2740	);
2631		2741
2632	if ($self->{anim} && $self->{animspeed}) {	2742	if ($self->{anim} && $self->{animspeed}) {
2633	Scalar::Util::weaken (my $widget = $self);	2743	Scalar::Util::weaken (my $widget = $self);
…		…
2692	$self->SUPER::DESTROY;	2802	$self->SUPER::DESTROY;
2693	}	2803	}
2694		2804
2695	#############################################################################	2805	#############################################################################
2696		2806
2697	package CFClient::UI::InventoryItem;
2698
2699	our @ISA = CFClient::UI::HBox::;
2700
2701	sub _item_to_desc {
2702	my ($item) = @_;
2703
2704	my $desc =
2705	$item->{nrof} < 2
2706	? $item->{name}
2707	: "$item->{nrof} × $item->{name_pl}";
2708
2709	$item->{flags} & Crossfire::Protocol::F_OPEN
2710	and $desc .= " (open)";
2711	$item->{flags} & Crossfire::Protocol::F_APPLIED
2712	and $desc .= " (applied)";
2713	$item->{flags} & Crossfire::Protocol::F_UNPAID
2714	and $desc .= " (unpaid)";
2715	$item->{flags} & Crossfire::Protocol::F_MAGIC
2716	and $desc .= " (magic)";
2717	$item->{flags} & Crossfire::Protocol::F_CURSED
2718	and $desc .= " (cursed)";
2719	$item->{flags} & Crossfire::Protocol::F_DAMNED
2720	and $desc .= " (damned)";
2721	$item->{flags} & Crossfire::Protocol::F_LOCKED
2722	and $desc .= " *";
2723
2724	$desc
2725	}
2726
2727	sub new {
2728	my $class = shift;
2729
2730	my %args = @_;
2731
2732	my $item = delete $args{item};
2733
2734	my $desc = _item_to_desc ($item);
2735
2736	my $self = $class->SUPER::new (
2737	can_hover => 1,
2738	can_events => 1,
2739	tooltip => ((CFClient::UI::Label::escape $desc)
2740	. "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741	connect_button_down => sub {
2742	my ($self, $ev, $x, $y) = @_;
2743
2744	# todo: maybe put examine on 1? but should just be a tooltip :(
2745	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746	my $targ = $::CONN->{player}{tag};
2747
2748	if ($item->{container} == $::CONN->{player}{tag}) {
2749	$targ = $main::OPENCONT;
2750	}
2751
2752	$::CONN->send ("move $targ $item->{tag} 0");
2753	} elsif ($ev->{button} == 1) {
2754	$::CONN->send ("examine $item->{tag}");
2755	} elsif ($ev->{button} == 2) {
2756	$::CONN->send ("apply $item->{tag}");
2757	} elsif ($ev->{button} == 3) {
2758	my @menu_items = (
2759	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762	(
2763	$item->{flags} & Crossfire::Protocol::F_LOCKED
2764	? (
2765	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766	)
2767	: (
2768	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770	)
2771	),
2772	);
2773
2774	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775	}
2776
2777	1
2778	},
2779	%args
2780	);
2781
2782
2783	$self->add (new CFClient::UI::Face
2784	can_events => 0,
2785	face => $item->{face},
2786	anim => $item->{anim},
2787	animspeed => $item->{animspeed},
2788	);
2789
2790	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792	$self->{item} = $item;
2793
2794	$self->update_item;
2795
2796	$self
2797	}
2798
2799	sub update_item {
2800	my ($self) = @_;
2801
2802	my $desc = _item_to_desc ($self->{item});
2803
2804	$self->{name_lbl}->set_text ($desc);
2805	}
2806
2807	#############################################################################
2808
2809	package CFClient::UI::Inventory;
2810
2811	our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813	sub new {
2814	my $class = shift;
2815
2816	my $self = $class->SUPER::new (
2817	scrolled => (new CFClient::UI::Table),
2818	@_,
2819	);
2820
2821	$self
2822	}
2823
2824	sub set_items {
2825	my ($self, $items) = @_;
2826
2827	$self->{scrolled}->clear;
2828	return unless $items;
2829
2830	my @items = sort {
2831	($a->{type} <=> $b->{type})
2832	or ($a->{name} cmp $b->{name})
2833	} @$items;
2834
2835	$self->{real_items} = \@items;
2836
2837	for my $item (@items) {
2838	$item->{item} = $item;
2839	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840	$item->update_item ();
2841	}
2842
2843	my $i = 0;
2844	for (@items) {
2845	$self->{scrolled}->add (0, $i, $_);
2846	my $nrof = $_->{item}->{nrof} || 1;
2847	$self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848	}
2849
2850	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851	}
2852
2853	sub size_request {
2854	my ($self) = @_;
2855	($self->{req_w}, $self->{req_h});
2856	}
2857
2858	#############################################################################
2859
2860	package CFClient::UI::Menu;	2807	package CFClient::UI::Menu;
2861		2808
2862	our @ISA = CFClient::UI::FancyFrame::;	2809	our @ISA = CFClient::UI::FancyFrame::;
2863		2810
2864	use CFClient::OpenGL;	2811	use CFClient::OpenGL;
…		…
2902	# maybe save $GRAB? must be careful about events...	2849	# maybe save $GRAB? must be careful about events...
2903	$GRAB = $self;	2850	$GRAB = $self;
2904	$self->{button} = $ev->{button};	2851	$self->{button} = $ev->{button};
2905		2852
2906	$self->show;	2853	$self->show;
2907	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908	}	2855	}
2909		2856
2910	sub mouse_motion {	2857	sub mouse_motion {
2911	my ($self, $ev, $x, $y) = @_;	2858	my ($self, $ev, $x, $y) = @_;
2912		2859
…		…
2992	sub add {	2939	sub add {
2993	my ($self, $text, %arg) = @_;	2940	my ($self, $text, %arg) = @_;
2994		2941
2995	$text =~ s/^\s+//;	2942	$text =~ s/^\s+//;
2996	$text =~ s/\s+$//;	2943	$text =~ s/\s+$//;
		2944
		2945	return unless $text;
2997		2946
2998	my $timeout = time + ((delete $arg{timeout}) || 60);	2947	my $timeout = time + ((delete $arg{timeout}) || 60);
2999		2948
3000	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2949	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001		2950
…		…
3035	$self->SUPER::reconfigure;	2984	$self->SUPER::reconfigure;
3036	}	2985	}
3037		2986
3038	#############################################################################	2987	#############################################################################
3039		2988
3040	package CFClient::UI::Root;	2989	package CFClient::UI::Inventory;
3041		2990
3042	our @ISA = CFClient::UI::Container::;	2991	our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044	use CFClient::OpenGL;
3045		2992
3046	sub new {	2993	sub new {
3047	my $class = shift;	2994	my $class = shift;
3048		2995
3049	$class->SUPER::new (	2996	my $self = $class->SUPER::new (
		2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3050	@_,	2998	@_,
3051	)	2999	);
3052	}
3053		3000
3054	sub configure {	3001	$self
		3002	}
		3003
		3004	sub set_items {
		3005	my ($self, $items) = @_;
		3006
		3007	$self->{scrolled}->clear;
		3008	return unless $items;
		3009
		3010	my @items = sort {
		3011	($a->{type} <=> $b->{type})
		3012	or ($a->{name} cmp $b->{name})
		3013	} @$items;
		3014
		3015	$self->{real_items} = \@items;
		3016
		3017	my $row = 0;
		3018	for my $item (@items) {
		3019	CFClient::Item::update_widgets $item;
		3020
		3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3024
		3025	$row++;
		3026	}
		3027	}
		3028
		3029	#############################################################################
		3030
		3031	package CFClient::UI::BindEditor;
		3032
		3033	our @ISA = CFClient::UI::FancyFrame::;
		3034
		3035	sub new {
		3036	my $class = shift;
		3037
		3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3039
		3040	$self->add (my $vb = new CFClient::UI::VBox);
		3041
		3042
		3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3044	text => "start recording",
		3045	tooltip => "Start/Stops recording of actions."
		3046	."All subsequent actions after the recording started will be captured."
		3047	."The actions are displayed after the record was stopped."
		3048	."To bind the action you have to click on the 'Bind' button",
		3049	on_activate => sub {
		3050	unless ($self->{recording}) {
		3051	$self->start;
		3052	} else {
		3053	$self->stop;
		3054	}
		3055	});
		3056
		3057	$vb->add (new CFClient::UI::Label text => "Actions:");
		3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3059
		3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3061	$vb->add (my $hb = new CFClient::UI::HBox);
		3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3063	$hb->add (new CFClient::UI::Button
		3064	text => "bind",
		3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3066	on_activate => sub {
		3067	$self->ask_for_bind;
		3068	});
		3069
		3070	$vb->add (my $hb = new CFClient::UI::HBox);
		3071	$hb->add (new CFClient::UI::Button
		3072	text => "ok",
		3073	expand => 1,
		3074	tooltip => "This closes the binding editor and saves the binding",
		3075	on_activate => sub {
		3076	$self->hide;
		3077	$self->commit;
		3078	});
		3079
		3080	$hb->add (new CFClient::UI::Button
		3081	text => "cancel",
		3082	expand => 1,
		3083	tooltip => "This closes the binding editor without saving",
		3084	on_activate => sub {
		3085	$self->hide;
		3086	$self->{binding_cancel}->()
		3087	if $self->{binding_cancel};
		3088	});
		3089
		3090	$self->update_binding_widgets;
		3091
		3092	$self
		3093	}
		3094
		3095	sub commit {
		3096	my ($self) = @_;
		3097	my ($mod, $sym, $cmds) = $self->get_binding;
		3098	if ($sym != 0 && @$cmds > 0) {
		3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3100	."'. Don't forget 'Save Config'!");
		3101	$self->{binding_change}->($mod, $sym, $cmds)
		3102	if $self->{binding_change};
		3103	} else {
		3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3105	$self->{binding_cancel}->()
		3106	if $self->{binding_cancel};
		3107	}
		3108	}
		3109
		3110	sub start {
		3111	my ($self) = @_;
		3112
		3113	$self->{rec_btn}->set_text ("stop recording");
		3114	$self->{recording} = 1;
		3115	$self->clear_command_list;
		3116	$::CONN->start_record if $::CONN;
		3117	}
		3118
		3119	sub stop {
		3120	my ($self) = @_;
		3121
		3122	$self->{rec_btn}->set_text ("start recording");
		3123	$self->{recording} = 0;
		3124
		3125	my $rec;
		3126	$rec = $::CONN->stop_record if $::CONN;
		3127	return unless ref $rec eq 'ARRAY';
		3128	$self->set_command_list ($rec);
		3129	}
		3130
		3131	# if $commit is true, the binding will be set after the user entered a key combo
		3132	sub ask_for_bind {
		3133	my ($self, $commit) = @_;
		3134
		3135	CFClient::Binder::open_binding_dialog (sub {
		3136	my ($mod, $sym) = @_;
		3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3138	$self->update_binding_widgets;
		3139	$self->commit if $commit;
		3140	});
		3141	}
		3142
		3143	# $mod and $sym are the modifiers and key symbol
		3144	# $cmds is a array ref of strings (the commands)
		3145	# $cb is the callback that is executed on OK
		3146	# $ccb is the callback that is executed on CANCEL and
		3147	# when the binding was unsuccessful on OK
		3148	sub set_binding {
3055	my ($self, $x, $y, $w, $h) = @_;	3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3056		3150
3057	$self->{w} = $w;	3151	$self->clear_command_list;
3058	$self->{h} = $h;	3152	$self->{recording} = 0;
3059	}	3153	$self->{rec_btn}->set_text ("start recording");
3060		3154
3061	sub check_size {	3155	$self->{binding} = [$mod, $sym];
		3156	$self->{commands} = $cmds;
		3157
		3158	$self->{binding_change} = $cb;
		3159	$self->{binding_cancel} = $ccb;
		3160
		3161	$self->update_binding_widgets;
		3162	}
		3163
		3164	# this is a shortcut method that asks for a binding
		3165	# and then just binds it.
		3166	sub do_quick_binding {
3062	my ($self) = @_;	3167	my ($self, $cmds) = @_;
		3168	$self->set_binding (undef, undef, $cmds, sub {
		3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3170	});
		3171	$self->ask_for_bind (1);
		3172	}
3063		3173
3064	$self->size_allocate ($self->{w}, $self->{h})	3174	sub update_binding_widgets {
3065	if $self->{w};	3175	my ($self) = @_;
		3176	my ($mod, $sym, $cmds) = $self->get_binding;
		3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3178	$self->set_command_list ($cmds);
		3179	}
		3180
		3181	sub get_binding {
		3182	my ($self) = @_;
		3183	return (
		3184	$self->{binding}->[0],
		3185	$self->{binding}->[1],
		3186	[ grep { defined $_ } @{$self->{commands}} ]
		3187	);
		3188	}
		3189
		3190	sub clear_command_list {
		3191	my ($self) = @_;
		3192	$self->{cmdbox}->clear ();
		3193	}
		3194
		3195	sub set_command_list {
		3196	my ($self, $cmds) = @_;
		3197
		3198	$self->{cmdbox}->clear ();
		3199	$self->{commands} = $cmds;
		3200
		3201	my $idx = 0;
		3202
		3203	for (@$cmds) {
		3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3205
		3206	my $i = $idx;
		3207	$hb->add (new CFClient::UI::Label text => $_);
		3208	$hb->add (new CFClient::UI::Button
		3209	text => "delete",
		3210	tooltip => "Deletes the action from the record",
		3211	on_activate => sub {
		3212	$self->{cmdbox}->remove ($hb);
		3213	$cmds->[$i] = undef;
		3214	});
		3215
		3216
		3217	$idx++
		3218	}
		3219	}
		3220
		3221	#############################################################################
		3222
		3223	package CFClient::UI::SpellList;
		3224
		3225	our @ISA = CFClient::UI::FancyFrame::;
		3226
		3227	sub new {
		3228	my $class = shift;
		3229
		3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3231
		3232	$self->add (new CFClient::UI::ScrolledWindow
		3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3234
		3235	$self;
		3236	}
		3237
		3238	# XXX: Do sorting? Argl...
		3239	sub add_spell {
		3240	my ($self, $spell) = @_;
		3241	$self->{spells}->{$spell->{name}} = $spell;
		3242
		3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3244	face => $spell->{face},
		3245	can_hover => 1,
		3246	can_events => 1,
		3247	tooltip => $spell->{message});
		3248
		3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3250	text => $spell->{name},
		3251	can_hover => 1,
		3252	can_events => 1,
		3253	tooltip => $spell->{message},
		3254	expand => 1);
		3255
		3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3259	expand => 1);
		3260
		3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3262	text => "bind to key",
		3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3264	}
		3265
		3266	sub rebuild_spell_list {
		3267	my ($self) = @_;
		3268	$self->{tbl_idx} = 0;
		3269	$self->add_spell ($_) for values %{$self->{spells}};
		3270	}
		3271
		3272	sub remove_spell {
		3273	my ($self, $spell) = @_;
		3274	delete $self->{spells}->{$spell->{name}};
		3275	$self->rebuild_spell_list;
		3276	}
		3277
		3278	#############################################################################
		3279
		3280	package CFClient::UI::Root;
		3281
		3282	our @ISA = CFClient::UI::Container::;
		3283
		3284	use CFClient::OpenGL;
		3285
		3286	sub new {
		3287	my $class = shift;
		3288
		3289	my $self = $class->SUPER::new (
		3290	visible => 1,
		3291	@_,
		3292	);
		3293
		3294	Scalar::Util::weaken ($self->{root} = $self);
		3295
		3296	$self
3066	}	3297	}
3067		3298
3068	sub size_request {	3299	sub size_request {
3069	my ($self) = @_;	3300	my ($self) = @_;
3070		3301
3071	($self->{w}, $self->{h})	3302	($self->{w}, $self->{h})
		3303	}
		3304
		3305	sub _to_pixel {
		3306	my ($coord, $size, $max) = @_;
		3307
		3308	$coord =
		3309	$coord eq "center" ? ($max - $size) * 0.5
		3310	: $coord eq "max" ? $max
		3311	: $coord;
		3312
		3313	$coord = 0 if $coord < 0;
		3314	$coord = $max - $size if $coord > $max - $size;
		3315
		3316	int $coord + 0.5
3072	}	3317	}
3073		3318
3074	sub size_allocate {	3319	sub size_allocate {
3075	my ($self, $w, $h) = @_;	3320	my ($self, $w, $h) = @_;
3076		3321
3077	for my $child ($self->children) {	3322	for my $child ($self->children) {
3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079		3324
3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3325	$X = $child->{force_x} if exists $child->{force_x};
3081	if exists $child->{req_x};	3326	$Y = $child->{force_y} if exists $child->{force_y};
3082		3327
3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3328	$X = _to_pixel $X, $W, $self->{w};
3084	if exists $child->{req_y};	3329	$Y = _to_pixel $Y, $H, $self->{h};
3085
3086	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088		3330
3089	$child->configure ($X, $Y, $W, $H);	3331	$child->configure ($X, $Y, $W, $H);
3090	}	3332	}
3091	}	3333	}
3092		3334
…		…
3103	}	3345	}
3104		3346
3105	sub update {	3347	sub update {
3106	my ($self) = @_;	3348	my ($self) = @_;
3107		3349
3108	$self->check_size;
3109	$::WANT_REFRESH++;	3350	$::WANT_REFRESH++;
3110	}	3351	}
3111		3352
3112	sub add {	3353	sub add {
3113	my ($self, @children) = @_;	3354	my ($self, @children) = @_;
3114		3355
3115	for (my @widgets = @children; my $w = pop @widgets; ) {
3116	push @widgets, $w->children;
3117	$w->{root} = $self;
3118	$w->{visible} = 1;
3119	}
3120
3121	for my $child (@children) {
3122	$child->{is_toplevel} = 1;	3356	$_->{is_toplevel} = 1
3123		3357	for @children;
3124	# integerise window positions
3125	$child->{x} = int $child->{x};
3126	$child->{y} = int $child->{y};
3127	}
3128		3358
3129	$self->SUPER::add (@children);	3359	$self->SUPER::add (@children);
3130	}	3360	}
3131		3361
3132	sub remove {	3362	sub remove {
3133	my ($self, @children) = @_;	3363	my ($self, @children) = @_;
3134		3364
3135	$self->SUPER::remove (@children);	3365	$self->SUPER::remove (@children);
		3366
		3367	delete $self->{is_toplevel}
		3368	for @children;
3136		3369
3137	while (@children) {	3370	while (@children) {
3138	my $w = pop @children;	3371	my $w = pop @children;
3139	push @children, $w->children;	3372	push @children, $w->children;
3140	$w->set_invisible;	3373	$w->set_invisible;
…		…
3159	while ($self->{refresh_hook}) {	3392	while ($self->{refresh_hook}) {
3160	$_->()	3393	$_->()
3161	for values %{delete $self->{refresh_hook}};	3394	for values %{delete $self->{refresh_hook}};
3162	}	3395	}
3163		3396
3164	if ($self->{check_size}) {	3397	if ($self->{realloc}) {
3165	my @queue = ([], []);	3398	my %queue;
		3399	my @queue;
		3400	my $widget;
3166		3401
3167	for (;;) {	3402	outer:
3168	if ($self->{check_size}) {	3403	while () {
3169	# heuristic: check containers last	3404	if (my $realloc = delete $self->{realloc}) {
3170	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3405	for $widget (values %$realloc) {
3171	for values %{delete $self->{check_size}}	3406	$widget->{visible} or next; # do not resize invisible widgets
		3407
		3408	$queue{$widget+0}++ and next; # duplicates are common
		3409
		3410	push @{ $queue[$widget->{visible}] }, $widget;
		3411	}
3172	}	3412	}
3173		3413
3174	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3414	while () {
		3415	@queue or last outer;
3175		3416
3176	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3417	$widget = pop @{ $queue[-1] || [] }
3177	? @$widget{qw(user_w user_h)}	3418	and last;
3178	: $widget->size_request;
3179
3180	if (delete $widget->{force_alloc}
3181	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183		3419
		3420	pop @queue;
		3421	}
		3422
		3423	delete $queue{$widget+0};
		3424
		3425	my ($w, $h) = $widget->size_request;
		3426
		3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3429
		3430	$w = $widget->{force_w} if exists $widget->{force_w};
		3431	$h = $widget->{force_h} if exists $widget->{force_h};
		3432
		3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3434	|| delete $widget->{force_realloc}) {
3184	$widget->{req_w} = $w;	3435	$widget->{req_w} = $w;
3185	$widget->{req_h} = $h;	3436	$widget->{req_h} = $h;
3186		3437
3187	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3438	$self->{size_alloc}{$widget+0} = $widget;
3188		3439
3189	$widget->{parent}->check_size
3190	if $widget->{parent};	3440	if (my $parent = $widget->{parent}) {
		3441	$self->{realloc}{$parent+0} = $parent
		3442	unless $queue{$parent+0};
		3443
		3444	$parent->{force_size_alloc} = 1;
		3445	$self->{size_alloc}{$parent+0} = $parent;
		3446	}
3191	}	3447	}
		3448
		3449	delete $self->{realloc}{$widget+0};
3192	}	3450	}
3193	}	3451	}
3194		3452
3195	while ($self->{size_alloc}) {	3453	while (my $size_alloc = delete $self->{size_alloc}) {
3196	for (values %{delete $self->{size_alloc}}) {	3454	my @queue = sort { $b->{visible} <=> $a->{visible} }
3197	my ($widget, $w, $h) = @$_;	3455	values %$size_alloc;
		3456
		3457	while () {
		3458	my $widget = pop @queue || last;
		3459
		3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198		3461
3199	$w = 0 if $w < 0;	3462	$w = 0 if $w < 0;
3200	$h = 0 if $h < 0;	3463	$h = 0 if $h < 0;
3201		3464
		3465	$w = int $w + 0.5;
		3466	$h = int $h + 0.5;
		3467
		3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3469	$widget->{old_w} = $widget->{w};
		3470	$widget->{old_h} = $widget->{h};
		3471
3202	$widget->{w} = $w;	3472	$widget->{w} = $w;
3203	$widget->{h} = $h;	3473	$widget->{h} = $h;
		3474
3204	$widget->emit (size_allocate => $w, $h);	3475	$widget->emit (size_allocate => $w, $h);
		3476	}
3205	}	3477	}
3206	}	3478	}
3207		3479
3208	while ($self->{post_alloc_hook}) {	3480	while ($self->{post_alloc_hook}) {
3209	$_->()	3481	$_->()
3210	for values %{delete $self->{post_alloc_hook}};	3482	for values %{delete $self->{post_alloc_hook}};
3211	}	3483	}
		3484
3212		3485
3213	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215	glClear GL_COLOR_BUFFER_BIT;	3488	glClear GL_COLOR_BUFFER_BIT;
3216		3489
…		…
3218	glLoadIdentity;	3491	glLoadIdentity;
3219	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220	glMatrixMode GL_MODELVIEW;	3493	glMatrixMode GL_MODELVIEW;
3221	glLoadIdentity;	3494	glLoadIdentity;
3222		3495
		3496	{
		3497	package CFClient::UI::Base;
		3498
		3499	($draw_x, $draw_y, $draw_w, $draw_h) =
		3500	(0, 0, $self->{w}, $self->{h});
		3501	}
		3502
3223	$self->_draw;	3503	$self->_draw;
3224	}	3504	}
3225		3505
3226	#############################################################################	3506	#############################################################################
3227		3507

Diff Legend

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