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.270 by elmex, Fri Jun 2 09:02:49 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, %arg) = @_;
928		1056
929	# TODO: user_x, user_y, overwrite moveto?	1057	my $title = delete $arg{title};
930		1058
931	my $self = $class->SUPER::new (	1059	my $self = $class->SUPER::new (
932	bg => [1, 1, 1, 1],	1060	bg => [1, 1, 1, 1],
933	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
934	border => 0.6,	1062	border => 0.6,
935	is_toplevel => 1,
936	can_events => 1,	1063	can_events => 1,
937	@_	1064	min_w => 16,
		1065	min_h => 16,
		1066	%arg,
938	);	1067	);
939		1068
940	$self->{title} &&= new CFClient::UI::Label	1069	$self->{title} = new CFClient::UI::Label
941	align => 0,	1070	align => 0,
942	valign => 1,	1071	valign => 1,
943	text => $self->{title},	1072	text => $title,
944	fontsize => $self->{border};	1073	fontsize => $self->{border}
		1074	if defined $title;
945		1075
946	$self	1076	$self
		1077	}
		1078
		1079	sub add {
		1080	my ($self, @widgets) = @_;
		1081
		1082	$self->SUPER::add (@widgets);
		1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
947	}	1084	}
948		1085
949	sub border {	1086	sub border {
950	int $_[0]{border} * $::FONTSIZE	1087	int $_[0]{border} * $::FONTSIZE
951	}	1088	}
952		1089
953	sub size_request {	1090	sub size_request {
954	my ($self) = @_;	1091	my ($self) = @_;
		1092
		1093	$self->{title}->size_request
		1094	if $self->{title};
955		1095
956	my ($w, $h) = $self->SUPER::size_request;	1096	my ($w, $h) = $self->SUPER::size_request;
957		1097
958	(	1098	(
959	$w + $self->border * 2,	1099	$w + $self->border * 2,
…		…
962	}	1102	}
963		1103
964	sub size_allocate {	1104	sub size_allocate {
965	my ($self, $w, $h) = @_;	1105	my ($self, $w, $h) = @_;
966		1106
		1107	if ($self->{title}) {
		1108	$self->{title}{w} = $w;
		1109	$self->{title}{h} = $h;
		1110	$self->{title}->size_allocate ($w, $h);
		1111	}
		1112
		1113	my $border = $self->border;
		1114
967	$h -= List::Util::max 0, $self->border * 2;	1115	$h -= List::Util::max 0, $border * 2;
968	$w -= List::Util::max 0, $self->border * 2;	1116	$w -= List::Util::max 0, $border * 2;
969		1117
970	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971	if $self->{title};
972
973	$self->child->configure ($self->border, $self->border, $w, $h);	1118	$self->child->configure ($border, $border, $w, $h);
974	}	1119	}
975		1120
976	sub button_down {	1121	sub button_down {
977	my ($self, $ev, $x, $y) = @_;	1122	my ($self, $ev, $x, $y) = @_;
978		1123
…		…
994	my ($ev, $x, $y) = @_;	1139	my ($ev, $x, $y) = @_;
995		1140
996	my $dx = $ev->{x} - $ox;	1141	my $dx = $ev->{x} - $ox;
997	my $dy = $ev->{y} - $oy;	1142	my $dy = $ev->{y} - $oy;
998		1143
999	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1146
		1147	$self->realloc;
1001	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002	$self->check_size;
1003	};	1149	};
1004		1150
1005	} elsif ($lr ^ $td) {	1151	} elsif ($lr ^ $td) {
1006	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007	my ($bx, $by) = ($self->{x}, $self->{y});	1153	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1009	$self->{motion} = sub {	1155	$self->{motion} = sub {
1010	my ($ev, $x, $y) = @_;	1156	my ($ev, $x, $y) = @_;
1011		1157
1012	($x, $y) = ($ev->{x}, $ev->{y});	1158	($x, $y) = ($ev->{x}, $ev->{y});
1013		1159
1014	$self->move ($bx + $x - $ox, $by + $y - $oy);	1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015	$self->update;
1016	};	1161	};
1017	}	1162	}
1018	}	1163	}
1019		1164
1020	sub button_up {	1165	sub button_up {
…		…
1030	}	1175	}
1031		1176
1032	sub _draw {	1177	sub _draw {
1033	my ($self) = @_;	1178	my ($self) = @_;
1034		1179
		1180	my $child = $self->{children}[0];
		1181
1035	my ($w, $h ) = ($self->{w}, $self->{h});	1182	my ($w, $h ) = ($self->{w}, $self->{h});
1036	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1183	my ($cw, $ch) = ($child->{w}, $child->{h});
1037		1184
1038	glEnable GL_TEXTURE_2D;	1185	glEnable GL_TEXTURE_2D;
1039	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040		1187
1041	my $border = $self->border;	1188	my $border = $self->border;
1042		1189
1043	glColor @{ $self->{border_bg} };	1190	glColor @{ $self->{border_bg} };
1044	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1045	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1194	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048		1195
1049	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050	my $bg = $tex[0];	1197	glColor @{ $self->{bg} };
1051		1198
1052	# TODO: repeat texture not scale	1199	# TODO: repeat texture not scale
		1200	# solve this better(?)
1053	my $rep_x = $cw / $bg->{w};	1201	$bg->{s} = $cw / $bg->{w};
1054	my $rep_y = $ch / $bg->{h};	1202	$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);	1203	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062	}	1204	}
1063		1205
1064	glDisable GL_TEXTURE_2D;	1206	glDisable GL_TEXTURE_2D;
1065		1207
1066	$self->{title}->draw if $self->{title};
1067
1068	$self->child->draw;	1208	$child->draw;
		1209
		1210	if ($self->{title}) {
		1211	glTranslate 0, $border - $self->{h};
		1212	$self->{title}->_draw;
		1213	}
1069	}	1214	}
1070		1215
1071	#############################################################################	1216	#############################################################################
1072		1217
1073	package CFClient::UI::Table;	1218	package CFClient::UI::Table;
…		…
1081	sub new {	1226	sub new {
1082	my $class = shift;	1227	my $class = shift;
1083		1228
1084	$class->SUPER::new (	1229	$class->SUPER::new (
1085	col_expand => [],	1230	col_expand => [],
1086	@_	1231	@_,
1087	)	1232	)
		1233	}
		1234
		1235	sub children {
		1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088	}	1237	}
1089		1238
1090	sub add {	1239	sub add {
1091	my ($self, $x, $y, $child) = @_;	1240	my ($self, $x, $y, $child) = @_;
1092		1241
1093	$child->set_parent ($self);	1242	$child->set_parent ($self);
1094	$self->{children}[$y][$x] = $child;	1243	$self->{children}[$y][$x] = $child;
1095		1244
1096	$child->check_size;	1245	$self->realloc;
1097	}	1246	}
1098		1247
1099	sub children {
1100	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101	}
1102
1103	# TODO: move to container class maybe? send childs a signal on removal?	1248	# TODO: move to container class maybe? send children a signal on removal?
1104	sub clear {	1249	sub clear {
1105	my ($self) = @_;	1250	my ($self) = @_;
1106		1251
1107	my @children = $self->children;	1252	my @children = $self->children;
1108	delete $self->{children};	1253	delete $self->{children};
…		…
1110	for (@children) {	1255	for (@children) {
1111	delete $_->{parent};	1256	delete $_->{parent};
1112	$_->hide;	1257	$_->hide;
1113	}	1258	}
1114		1259
1115	$self->update;	1260	$self->realloc;
1116	}	1261	}
1117		1262
1118	sub get_wh {	1263	sub get_wh {
1119	my ($self) = @_;	1264	my ($self) = @_;
1120		1265
…		…
1151	sub size_allocate {	1296	sub size_allocate {
1152	my ($self, $w, $h) = @_;	1297	my ($self, $w, $h) = @_;
1153		1298
1154	my ($ws, $hs) = $self->get_wh;	1299	my ($ws, $hs) = $self->get_wh;
1155		1300
1156	my $req_w = sum @$ws;	1301	my $req_w = (sum @$ws) || 1;
1157	my $req_h = sum @$hs;	1302	my $req_h = (sum @$hs) || 1;
1158		1303
1159	# TODO: nicer code && do row_expand	1304	# TODO: nicer code && do row_expand
1160	my @col_expand = @{$self->{col_expand}};	1305	my @col_expand = @{$self->{col_expand}};
1161	@col_expand = (1) x @$ws unless @col_expand;	1306	@col_expand = (1) x @$ws unless @col_expand;
1162	my $col_expand = (sum @col_expand) || 1;	1307	my $col_expand = (sum @col_expand) || 1;
…		…
1216	}	1361	}
1217	}	1362	}
1218		1363
1219	#############################################################################	1364	#############################################################################
1220		1365
1221	package CFClient::UI::HBox;	1366	package CFClient::UI::Box;
1222
1223	# TODO: wrap into common Box base class
1224		1367
1225	our @ISA = CFClient::UI::Container::;	1368	our @ISA = CFClient::UI::Container::;
1226		1369
1227	sub size_request {	1370	sub size_request {
1228	my ($self) = @_;	1371	my ($self) = @_;
1229		1372
1230	my @alloc = map [$_->size_request], @{$self->{children}};	1373	$self->{vertical}
1231		1374	? (
1232	(	1375	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1233	(List::Util::sum map $_->[0], @alloc),	1376	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234	(List::Util::max map $_->[1], @alloc),	1377	)
1235	)	1378	: (
		1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1381	)
1236	}	1382	}
1237		1383
1238	sub size_allocate {	1384	sub size_allocate {
1239	my ($self, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1240		1386
1241	($h, $w) = ($w, $h);	1387	my $space = $self->{vertical} ? $h : $w;
1242
1243	my $children = $self->{children};	1388	my $children = $self->{children};
1244		1389
1245	my @h = map $_->{req_w}, @$children;	1390	my @req;
1246		1391
1247	my $req_h = List::Util::sum @h;	1392	if ($self->{homogeneous}) {
1248		1393	@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 {	1394	} else {
		1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1396	my $req = List::Util::sum @req;
		1397
		1398	if ($req > $space) {
		1399	# ah well, not enough space
		1400	$_ *= $space / $req for @req;
		1401	} else {
1253	my $exp = List::Util::sum map $_->{expand}, @$children;	1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254	$exp ||= 1;
1255		1403
		1404	$space = ($space - $req) / $expand; # remaining space to give away
		1405
		1406	$req[$_] += $space * $children->[$_]{expand}
1256	for (0 .. $#$children) {	1407	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	}	1408	}
1263	}	1409	}
1264		1410
1265	CFClient::UI::harmonize \@h;	1411	CFClient::UI::harmonize \@req;
1266		1412
1267	my $y = 0;	1413	my $pos = 0;
1268	for (0 .. $#$children) {	1414	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270	my $h = $h[$_];	1415	my $alloc = $req[$_];
1271	$child->configure ($y, 0, $h, $w);	1416	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272		1417
1273	$y += $h;	1418	$pos += $alloc;
1274	}	1419	}
1275		1420
1276	1	1421	1
1277	}	1422	}
1278		1423
1279	#############################################################################	1424	#############################################################################
1280		1425
		1426	package CFClient::UI::HBox;
		1427
		1428	our @ISA = CFClient::UI::Box::;
		1429
		1430	sub new {
		1431	my $class = shift;
		1432
		1433	$class->SUPER::new (
		1434	vertical => 0,
		1435	@_,
		1436	)
		1437	}
		1438
		1439	#############################################################################
		1440
1281	package CFClient::UI::VBox;	1441	package CFClient::UI::VBox;
1282		1442
1283	# TODO: wrap into common Box base class
1284
1285	our @ISA = CFClient::UI::Container::;	1443	our @ISA = CFClient::UI::Box::;
1286		1444
1287	sub size_request {	1445	sub new {
1288	my ($self) = @_;	1446	my $class = shift;
1289		1447
1290	my @alloc = map [$_->size_request], @{$self->{children}};	1448	$class->SUPER::new (
1291		1449	vertical => 1,
1292	(	1450	@_,
1293	(List::Util::max map $_->[0], @alloc),
1294	(List::Util::sum map $_->[1], @alloc),
1295	)	1451	)
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	}	1452	}
1336		1453
1337	#############################################################################	1454	#############################################################################
1338		1455
1339	package CFClient::UI::Label;	1456	package CFClient::UI::Label;
…		…
1356	ellipsise => 3, # end	1473	ellipsise => 3, # end
1357	layout => (new CFClient::Layout),	1474	layout => (new CFClient::Layout),
1358	fontsize => 1,	1475	fontsize => 1,
1359	align => -1,	1476	align => -1,
1360	valign => -1,	1477	valign => -1,
1361	padding => 2,	1478	padding_x => 2,
		1479	padding_y => 2,
1362	can_events => 0,	1480	can_events => 0,
1363	%arg	1481	%arg
1364	);	1482	);
1365		1483
1366	if (exists $self->{template}) {	1484	if (exists $self->{template}) {
…		…
1402	$self->{text} = "T$text";	1520	$self->{text} = "T$text";
1403		1521
1404	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405	$self->{layout}->set_text ($text);	1523	$self->{layout}->set_text ($text);
1406		1524
		1525	$self->realloc;
1407	$self->update;	1526	$self->update;
1408	$self->check_size;
1409	}	1527	}
1410		1528
1411	sub set_markup {	1529	sub set_markup {
1412	my ($self, $markup) = @_;	1530	my ($self, $markup) = @_;
1413		1531
…		…
1417	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418		1536
1419	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420	$self->{layout}->set_markup ($markup);	1538	$self->{layout}->set_markup ($markup);
1421		1539
		1540	$self->realloc;
1422	$self->update;	1541	$self->update;
1423	$self->check_size;
1424	}	1542	}
1425		1543
1426	sub size_request {	1544	sub size_request {
1427	my ($self) = @_;	1545	my ($self) = @_;
1428		1546
…		…
1442		1560
1443	$w = List::Util::max $w, $w2;	1561	$w = List::Util::max $w, $w2;
1444	$h = List::Util::max $h, $h2;	1562	$h = List::Util::max $h, $h2;
1445	}	1563	}
1446		1564
1447	(	1565	($w, $h)
1448	$w + $self->{padding} * 2,
1449	$h + $self->{padding} * 2,
1450	)
1451	}	1566	}
1452		1567
1453	sub size_allocate {	1568	sub size_allocate {
1454	my ($self, $w, $h) = @_;	1569	my ($self, $w, $h) = @_;
1455		1570
		1571	delete $self->{ox};
		1572
1456	delete $self->{texture};	1573	delete $self->{texture}
		1574	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457	}	1575	}
1458		1576
1459	sub set_fontsize {	1577	sub set_fontsize {
1460	my ($self, $fontsize) = @_;	1578	my ($self, $fontsize) = @_;
1461		1579
1462	$self->{fontsize} = $fontsize;	1580	$self->{fontsize} = $fontsize;
1463	delete $self->{texture};	1581	delete $self->{texture};
1464		1582
1465	$self->update;	1583	$self->realloc;
1466	$self->check_size;
1467	}	1584	}
1468		1585
1469	sub _draw {	1586	sub _draw {
1470	my ($self) = @_;	1587	my ($self) = @_;
1471		1588
…		…
1477	$self->{layout}->set_width ($self->{w});	1594	$self->{layout}->set_width ($self->{w});
1478	$self->{layout}->set_ellipsise ($self->{ellipsise});	1595	$self->{layout}->set_ellipsise ($self->{ellipsise});
1479	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481		1598
1482	my $tex = new_from_layout CFClient::Texture $self->{layout};	1599	new_from_layout CFClient::Texture $self->{layout}
		1600	};
1483		1601
		1602	unless (exists $self->{ox}) {
1484	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486	: ($self->{w} - $tex->{w}) * 0.5);	1605	: ($self->{w} - $tex->{w}) * 0.5);
1487		1606
1488	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490	: ($self->{h} - $tex->{h}) * 0.5);	1609	: ($self->{h} - $tex->{h}) * 0.5);
1491
1492	$tex
1493	};	1610	};
1494		1611
1495	glEnable GL_TEXTURE_2D;	1612	glEnable GL_TEXTURE_2D;
1496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497		1614
…		…
1551	sub set_text {	1668	sub set_text {
1552	my ($self, $text) = @_;	1669	my ($self, $text) = @_;
1553		1670
1554	$self->{cursor} = length $text;	1671	$self->{cursor} = length $text;
1555	$self->_set_text ($text);	1672	$self->_set_text ($text);
1556	$self->update;	1673
1557	$self->check_size;	1674	$self->realloc;
1558	}	1675	}
1559		1676
1560	sub get_text {	1677	sub get_text {
1561	$_[0]{text}	1678	$_[0]{text}
1562	}	1679	}
…		…
1595	} elsif ($uni) {	1712	} elsif ($uni) {
1596	substr $text, $self->{cursor}++, 0, chr $uni;	1713	substr $text, $self->{cursor}++, 0, chr $uni;
1597	}	1714	}
1598		1715
1599	$self->_set_text ($text);	1716	$self->_set_text ($text);
1600	$self->update;	1717
1601	$self->check_size;	1718	$self->realloc;
1602	}	1719	}
1603		1720
1604	sub focus_in {	1721	sub focus_in {
1605	my ($self) = @_;	1722	my ($self) = @_;
1606		1723
…		…
1733		1850
1734	sub new {	1851	sub new {
1735	my $class = shift;	1852	my $class = shift;
1736		1853
1737	$class->SUPER::new (	1854	$class->SUPER::new (
1738	padding => 4,	1855	padding_x => 4,
		1856	padding_y => 4,
1739	fg => [1, 1, 1],	1857	fg => [1, 1, 1],
1740	active_fg => [0, 0, 1],	1858	active_fg => [0, 0, 1],
1741	can_hover => 1,	1859	can_hover => 1,
1742	align => 0,	1860	align => 0,
1743	valign => 0,	1861	valign => 0,
…		…
1790		1908
1791	sub new {	1909	sub new {
1792	my $class = shift;	1910	my $class = shift;
1793		1911
1794	$class->SUPER::new (	1912	$class->SUPER::new (
1795	padding => 2,	1913	padding_x => 2,
		1914	padding_y => 2,
1796	fg => [1, 1, 1],	1915	fg => [1, 1, 1],
1797	active_fg => [1, 1, 0],	1916	active_fg => [1, 1, 0],
1798	bg => [0, 0, 0, 0.2],	1917	bg => [0, 0, 0, 0.2],
1799	active_bg => [1, 1, 1, 0.5],	1918	active_bg => [1, 1, 1, 0.5],
1800	state => 0,	1919	state => 0,
…		…
1804	}	1923	}
1805		1924
1806	sub size_request {	1925	sub size_request {
1807	my ($self) = @_;	1926	my ($self) = @_;
1808		1927
1809	($self->{padding} * 2 + 6) x 2	1928	(6) x 2
1810	}	1929	}
1811		1930
1812	sub button_down {	1931	sub button_down {
1813	my ($self, $ev, $x, $y) = @_;	1932	my ($self, $ev, $x, $y) = @_;
1814		1933
1815	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817	$self->{state} = !$self->{state};	1936	$self->{state} = !$self->{state};
1818	$self->_emit (changed => $self->{state});	1937	$self->_emit (changed => $self->{state});
1819	}	1938	}
1820	}	1939	}
1821		1940
1822	sub _draw {	1941	sub _draw {
1823	my ($self) = @_;	1942	my ($self) = @_;
1824		1943
1825	$self->SUPER::_draw;	1944	$self->SUPER::_draw;
1826		1945
1827	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1946	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828		1947
1829	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1948	my ($w, $h) = @$self{qw(w h)};
		1949
		1950	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830		1951
1831	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1952	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832		1953
1833	my $tex = $self->{state} ? $tex[1] : $tex[0];	1954	my $tex = $self->{state} ? $tex[1] : $tex[0];
1834		1955
…		…
2099	fg => [1, 1, 1],	2220	fg => [1, 1, 1],
2100	active_fg => [0, 0, 0],	2221	active_fg => [0, 0, 0],
2101	bg => [0, 0, 0, 0.2],	2222	bg => [0, 0, 0, 0.2],
2102	active_bg => [1, 1, 1, 0.5],	2223	active_bg => [1, 1, 1, 0.5],
2103	range => [0, 0, 100, 10, 0],	2224	range => [0, 0, 100, 10, 0],
2104	req_w => $::WIDTH / 80,	2225	min_w => $::WIDTH / 80,
2105	req_h => $::WIDTH / 80,	2226	min_h => $::WIDTH / 80,
2106	vertical => 0,	2227	vertical => 0,
2107	can_hover => 1,	2228	can_hover => 1,
2108	inner_pad => 0.02,	2229	inner_pad => 0.02,
2109	@_	2230	@_
2110	);	2231	);
…		…
2113	$self->update;	2234	$self->update;
2114		2235
2115	$self	2236	$self
2116	}	2237	}
2117		2238
		2239	sub changed { }
		2240
2118	sub set_range {	2241	sub set_range {
2119	my ($self, $range) = @_;	2242	my ($self, $range) = @_;
2120		2243
2121	$self->{range} = $range;	2244	($range, $self->{range}) = ($self->{range}, $range);
2122		2245
2123	$self->update;	2246	$self->update
		2247	if "@$range" ne "@{$self->{range}}";
2124	}	2248	}
2125		2249
2126	sub set_value {	2250	sub set_value {
2127	my ($self, $value) = @_;	2251	my ($self, $value) = @_;
2128		2252
…		…
2147	}	2271	}
2148		2272
2149	sub size_request {	2273	sub size_request {
2150	my ($self) = @_;	2274	my ($self) = @_;
2151		2275
2152	my $w = $self->{req_w};	2276	($self->{req_w}, $self->{req_h})
2153	my $h = $self->{req_h};
2154
2155	$self->{vertical} ? ($h, $w) : ($w, $h)
2156	}	2277	}
2157		2278
2158	sub button_down {	2279	sub button_down {
2159	my ($self, $ev, $x, $y) = @_;	2280	my ($self, $ev, $x, $y) = @_;
2160		2281
…		…
2511		2632
2512	sub new {	2633	sub new {
2513	my $class = shift;	2634	my $class = shift;
2514		2635
2515	my $self = $class->SUPER::new (	2636	my $self = $class->SUPER::new (
2516	state => 0,	2637	state => 0,
2517	connect_activate => \&toggle_flopper,	2638	on_activate => \&toggle_flopper,
2518	@_	2639	@_
2519	);	2640	);
2520		2641
2521	if ($self->{state}) {
2522	$self->{state} = 0;
2523	$self->toggle_flopper;
2524	}
2525
2526	$self	2642	$self
2527	}	2643	}
2528		2644
2529	sub toggle_flopper {	2645	sub toggle_flopper {
2530	my ($self) = @_;	2646	my ($self) = @_;
2531		2647
2532	# TODO: use animation	2648	$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	}	2649	}
2544		2650
2545	#############################################################################	2651	#############################################################################
2546		2652
2547	package CFClient::UI::Tooltip;	2653	package CFClient::UI::Tooltip;
…		…
2560	}	2666	}
2561		2667
2562	sub set_tooltip_from {	2668	sub set_tooltip_from {
2563	my ($self, $widget) = @_;	2669	my ($self, $widget) = @_;
2564		2670
		2671	my $tooltip = $widget->{tooltip};
		2672
		2673	if ($ENV{CFPLUS_DEBUG} & 2) {
		2674	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2676	. "req $widget->{req_w} $widget->{req_h}\n"
		2677	. "visible $widget->{visible}";
		2678	}
		2679
2565	$self->add (new CFClient::UI::Label	2680	$self->add (new CFClient::UI::Label
2566	markup => $widget->{tooltip},	2681	markup => $tooltip,
2567	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568	fontsize => 0.8,	2683	fontsize => 0.8,
2569	fg => [0, 0, 0, 1],	2684	fg => [0, 0, 0, 1],
2570	ellipsise => 0,	2685	ellipsise => 0,
2571	font => ($widget->{tooltip_font} || $::FONT_PROP),	2686	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2582		2697
2583	sub size_allocate {	2698	sub size_allocate {
2584	my ($self, $w, $h) = @_;	2699	my ($self, $w, $h) = @_;
2585		2700
2586	$self->SUPER::size_allocate ($w - 4, $h - 4);	2701	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2702	}
		2703
		2704	sub visibility_change {
		2705	my ($self, $visible) = @_;
		2706
		2707	return unless $visible;
		2708
		2709	$self->{root}->on_post_alloc ("move_$self" => sub {
		2710	my $widget = $self->{owner}
		2711	or return;
		2712
		2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2714
		2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2716	if $x + $self->{w} > $::WIDTH;
		2717
		2718	$self->move_abs ($x, $y);
		2719	});
2587	}	2720	}
2588		2721
2589	sub _draw {	2722	sub _draw {
2590	my ($self) = @_;	2723	my ($self) = @_;
2591		2724
…		…
2608	glVertex $w, $h;	2741	glVertex $w, $h;
2609	glVertex $w, 0;	2742	glVertex $w, 0;
2610	glEnd;	2743	glEnd;
2611		2744
2612	glTranslate 2 - 0.375, 2 - 0.375;	2745	glTranslate 2 - 0.375, 2 - 0.375;
		2746
2613	$self->SUPER::_draw;	2747	$self->SUPER::_draw;
2614	}	2748	}
2615		2749
2616	#############################################################################	2750	#############################################################################
2617		2751
…		…
2623		2757
2624	sub new {	2758	sub new {
2625	my $class = shift;	2759	my $class = shift;
2626		2760
2627	my $self = $class->SUPER::new (	2761	my $self = $class->SUPER::new (
2628	aspect => 1,	2762	aspect => 1,
		2763	can_events => 0,
2629	@_,	2764	@_,
2630	);	2765	);
2631		2766
2632	if ($self->{anim} && $self->{animspeed}) {	2767	if ($self->{anim} && $self->{animspeed}) {
2633	Scalar::Util::weaken (my $widget = $self);	2768	Scalar::Util::weaken (my $widget = $self);
…		…
2692	$self->SUPER::DESTROY;	2827	$self->SUPER::DESTROY;
2693	}	2828	}
2694		2829
2695	#############################################################################	2830	#############################################################################
2696		2831
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;	2832	package CFClient::UI::Menu;
2861		2833
2862	our @ISA = CFClient::UI::FancyFrame::;	2834	our @ISA = CFClient::UI::FancyFrame::;
2863		2835
2864	use CFClient::OpenGL;	2836	use CFClient::OpenGL;
…		…
2902	# maybe save $GRAB? must be careful about events...	2874	# maybe save $GRAB? must be careful about events...
2903	$GRAB = $self;	2875	$GRAB = $self;
2904	$self->{button} = $ev->{button};	2876	$self->{button} = $ev->{button};
2905		2877
2906	$self->show;	2878	$self->show;
2907	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2879	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908	}	2880	}
2909		2881
2910	sub mouse_motion {	2882	sub mouse_motion {
2911	my ($self, $ev, $x, $y) = @_;	2883	my ($self, $ev, $x, $y) = @_;
2912		2884
…		…
2992	sub add {	2964	sub add {
2993	my ($self, $text, %arg) = @_;	2965	my ($self, $text, %arg) = @_;
2994		2966
2995	$text =~ s/^\s+//;	2967	$text =~ s/^\s+//;
2996	$text =~ s/\s+$//;	2968	$text =~ s/\s+$//;
		2969
		2970	return unless $text;
2997		2971
2998	my $timeout = time + ((delete $arg{timeout}) || 60);	2972	my $timeout = time + ((delete $arg{timeout}) || 60);
2999		2973
3000	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001		2975
…		…
3035	$self->SUPER::reconfigure;	3009	$self->SUPER::reconfigure;
3036	}	3010	}
3037		3011
3038	#############################################################################	3012	#############################################################################
3039		3013
3040	package CFClient::UI::Root;	3014	package CFClient::UI::Inventory;
3041		3015
3042	our @ISA = CFClient::UI::Container::;	3016	our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044	use CFClient::OpenGL;
3045		3017
3046	sub new {	3018	sub new {
3047	my $class = shift;	3019	my $class = shift;
3048		3020
3049	$class->SUPER::new (	3021	my $self = $class->SUPER::new (
		3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3050	@_,	3023	@_,
3051	)	3024	);
3052	}
3053		3025
3054	sub configure {	3026	$self
		3027	}
		3028
		3029	sub set_items {
		3030	my ($self, $items) = @_;
		3031
		3032	$self->{scrolled}->clear;
		3033	return unless $items;
		3034
		3035	my @items = sort {
		3036	($a->{type} <=> $b->{type})
		3037	or ($a->{name} cmp $b->{name})
		3038	} @$items;
		3039
		3040	$self->{real_items} = \@items;
		3041
		3042	my $row = 0;
		3043	for my $item (@items) {
		3044	CFClient::Item::update_widgets $item;
		3045
		3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
		3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		3049
		3050	$row++;
		3051	}
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::BindEditor;
		3057
		3058	our @ISA = CFClient::UI::FancyFrame::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3064
		3065	$self->add (my $vb = new CFClient::UI::VBox);
		3066
		3067
		3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3069	text => "start recording",
		3070	tooltip => "Start/Stops recording of actions."
		3071	."All subsequent actions after the recording started will be captured."
		3072	."The actions are displayed after the record was stopped."
		3073	."To bind the action you have to click on the 'Bind' button",
		3074	on_activate => sub {
		3075	unless ($self->{recording}) {
		3076	$self->start;
		3077	} else {
		3078	$self->stop;
		3079	}
		3080	});
		3081
		3082	$vb->add (new CFClient::UI::Label text => "Actions:");
		3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3084
		3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3086	$vb->add (my $hb = new CFClient::UI::HBox);
		3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3088	$hb->add (new CFClient::UI::Button
		3089	text => "bind",
		3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3091	on_activate => sub {
		3092	$self->ask_for_bind;
		3093	});
		3094
		3095	$vb->add (my $hb = new CFClient::UI::HBox);
		3096	$hb->add (new CFClient::UI::Button
		3097	text => "ok",
		3098	expand => 1,
		3099	tooltip => "This closes the binding editor and saves the binding",
		3100	on_activate => sub {
		3101	$self->hide;
		3102	$self->commit;
		3103	});
		3104
		3105	$hb->add (new CFClient::UI::Button
		3106	text => "cancel",
		3107	expand => 1,
		3108	tooltip => "This closes the binding editor without saving",
		3109	on_activate => sub {
		3110	$self->hide;
		3111	$self->{binding_cancel}->()
		3112	if $self->{binding_cancel};
		3113	});
		3114
		3115	$self->update_binding_widgets;
		3116
		3117	$self
		3118	}
		3119
		3120	sub commit {
		3121	my ($self) = @_;
		3122	my ($mod, $sym, $cmds) = $self->get_binding;
		3123	if ($sym != 0 && @$cmds > 0) {
		3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3125	."'. Don't forget 'Save Config'!");
		3126	$self->{binding_change}->($mod, $sym, $cmds)
		3127	if $self->{binding_change};
		3128	} else {
		3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3130	$self->{binding_cancel}->()
		3131	if $self->{binding_cancel};
		3132	}
		3133	}
		3134
		3135	sub start {
		3136	my ($self) = @_;
		3137
		3138	$self->{rec_btn}->set_text ("stop recording");
		3139	$self->{recording} = 1;
		3140	$self->clear_command_list;
		3141	$::CONN->start_record if $::CONN;
		3142	}
		3143
		3144	sub stop {
		3145	my ($self) = @_;
		3146
		3147	$self->{rec_btn}->set_text ("start recording");
		3148	$self->{recording} = 0;
		3149
		3150	my $rec;
		3151	$rec = $::CONN->stop_record if $::CONN;
		3152	return unless ref $rec eq 'ARRAY';
		3153	$self->set_command_list ($rec);
		3154	}
		3155
		3156
		3157	sub ask_for_bind_and_commit {
		3158	my ($self) = @_;
		3159	$self->ask_for_bind (1);
		3160	}
		3161
		3162	sub ask_for_bind {
		3163	my ($self, $commit) = @_;
		3164
		3165	CFClient::Binder::open_binding_dialog (sub {
		3166	my ($mod, $sym) = @_;
		3167	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3168	$self->update_binding_widgets;
		3169	$self->commit if $commit;
		3170	});
		3171	}
		3172
		3173	# $mod and $sym are the modifiers and key symbol
		3174	# $cmds is a array ref of strings (the commands)
		3175	# $cb is the callback that is executed on OK
		3176	# $ccb is the callback that is executed on CANCEL and
		3177	# when the binding was unsuccessful on OK
		3178	sub set_binding {
3055	my ($self, $x, $y, $w, $h) = @_;	3179	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3056		3180
3057	$self->{w} = $w;	3181	$self->clear_command_list;
3058	$self->{h} = $h;	3182	$self->{recording} = 0;
3059	}	3183	$self->{rec_btn}->set_text ("start recording");
3060		3184
3061	sub check_size {	3185	$self->{binding} = [$mod, $sym];
		3186	$self->{commands} = $cmds;
		3187
		3188	$self->{binding_change} = $cb;
		3189	$self->{binding_cancel} = $ccb;
		3190
		3191	$self->update_binding_widgets;
		3192	}
		3193
		3194	# this is a shortcut method that asks for a binding
		3195	# and then just binds it.
		3196	sub do_quick_binding {
3062	my ($self) = @_;	3197	my ($self, $cmds) = @_;
		3198	$self->set_binding (undef, undef, $cmds, sub {
		3199	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3200	});
		3201	$self->ask_for_bind (1);
		3202	}
3063		3203
3064	$self->size_allocate ($self->{w}, $self->{h})	3204	sub update_binding_widgets {
3065	if $self->{w};	3205	my ($self) = @_;
		3206	my ($mod, $sym, $cmds) = $self->get_binding;
		3207	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3208	$self->set_command_list ($cmds);
		3209	}
		3210
		3211	sub get_binding {
		3212	my ($self) = @_;
		3213	return (
		3214	$self->{binding}->[0],
		3215	$self->{binding}->[1],
		3216	[ grep { defined $_ } @{$self->{commands}} ]
		3217	);
		3218	}
		3219
		3220	sub clear_command_list {
		3221	my ($self) = @_;
		3222	$self->{cmdbox}->clear ();
		3223	}
		3224
		3225	sub set_command_list {
		3226	my ($self, $cmds) = @_;
		3227
		3228	$self->{cmdbox}->clear ();
		3229	$self->{commands} = $cmds;
		3230
		3231	my $idx = 0;
		3232
		3233	for (@$cmds) {
		3234	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3235
		3236	my $i = $idx;
		3237	$hb->add (new CFClient::UI::Label text => $_);
		3238	$hb->add (new CFClient::UI::Button
		3239	text => "delete",
		3240	tooltip => "Deletes the action from the record",
		3241	on_activate => sub {
		3242	$self->{cmdbox}->remove ($hb);
		3243	$cmds->[$i] = undef;
		3244	});
		3245
		3246
		3247	$idx++
		3248	}
		3249	}
		3250
		3251	#############################################################################
		3252
		3253	package CFClient::UI::SpellList;
		3254
		3255	our @ISA = CFClient::UI::FancyFrame::;
		3256
		3257	sub new {
		3258	my $class = shift;
		3259
		3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3261
		3262	$self->add (new CFClient::UI::ScrolledWindow
		3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);
		3264
		3265	$self;
		3266	}
		3267
		3268	# XXX: Do sorting? Argl...
		3269	sub add_spell {
		3270	my ($self, $spell) = @_;
		3271	$self->{spells}->{$spell->{name}} = $spell;
		3272
		3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3274	face => $spell->{face},
		3275	can_hover => 1,
		3276	can_events => 1,
		3277	tooltip => $spell->{message});
		3278
		3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3280	text => $spell->{name},
		3281	can_hover => 1,
		3282	can_events => 1,
		3283	tooltip => $spell->{message},
		3284	expand => 1);
		3285
		3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3288	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3289	expand => 1);
		3290
		3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3292	text => "bind to key",
		3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3294	}
		3295
		3296	sub rebuild_spell_list {
		3297	my ($self) = @_;
		3298	$self->{tbl_idx} = 0;
		3299	$self->add_spell ($_) for values %{$self->{spells}};
		3300	}
		3301
		3302	sub remove_spell {
		3303	my ($self, $spell) = @_;
		3304	delete $self->{spells}->{$spell->{name}};
		3305	$self->rebuild_spell_list;
		3306	}
		3307
		3308	#############################################################################
		3309
		3310	package CFClient::UI::Root;
		3311
		3312	our @ISA = CFClient::UI::Container::;
		3313
		3314	use CFClient::OpenGL;
		3315
		3316	sub new {
		3317	my $class = shift;
		3318
		3319	my $self = $class->SUPER::new (
		3320	visible => 1,
		3321	@_,
		3322	);
		3323
		3324	Scalar::Util::weaken ($self->{root} = $self);
		3325
		3326	$self
3066	}	3327	}
3067		3328
3068	sub size_request {	3329	sub size_request {
3069	my ($self) = @_;	3330	my ($self) = @_;
3070		3331
3071	($self->{w}, $self->{h})	3332	($self->{w}, $self->{h})
		3333	}
		3334
		3335	sub _to_pixel {
		3336	my ($coord, $size, $max) = @_;
		3337
		3338	$coord =
		3339	$coord eq "center" ? ($max - $size) * 0.5
		3340	: $coord eq "max" ? $max
		3341	: $coord;
		3342
		3343	$coord = 0 if $coord < 0;
		3344	$coord = $max - $size if $coord > $max - $size;
		3345
		3346	int $coord + 0.5
3072	}	3347	}
3073		3348
3074	sub size_allocate {	3349	sub size_allocate {
3075	my ($self, $w, $h) = @_;	3350	my ($self, $w, $h) = @_;
3076		3351
3077	for my $child ($self->children) {	3352	for my $child ($self->children) {
3078	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3353	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079		3354
3080	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3355	$X = $child->{force_x} if exists $child->{force_x};
3081	if exists $child->{req_x};	3356	$Y = $child->{force_y} if exists $child->{force_y};
3082		3357
3083	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3358	$X = _to_pixel $X, $W, $self->{w};
3084	if exists $child->{req_y};	3359	$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		3360
3089	$child->configure ($X, $Y, $W, $H);	3361	$child->configure ($X, $Y, $W, $H);
3090	}	3362	}
3091	}	3363	}
3092		3364
…		…
3103	}	3375	}
3104		3376
3105	sub update {	3377	sub update {
3106	my ($self) = @_;	3378	my ($self) = @_;
3107		3379
3108	$self->check_size;
3109	$::WANT_REFRESH++;	3380	$::WANT_REFRESH++;
3110	}	3381	}
3111		3382
3112	sub add {	3383	sub add {
3113	my ($self, @children) = @_;	3384	my ($self, @children) = @_;
3114		3385
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;	3386	$_->{is_toplevel} = 1
3123		3387	for @children;
3124	# integerise window positions
3125	$child->{x} = int $child->{x};
3126	$child->{y} = int $child->{y};
3127	}
3128		3388
3129	$self->SUPER::add (@children);	3389	$self->SUPER::add (@children);
3130	}	3390	}
3131		3391
3132	sub remove {	3392	sub remove {
3133	my ($self, @children) = @_;	3393	my ($self, @children) = @_;
3134		3394
3135	$self->SUPER::remove (@children);	3395	$self->SUPER::remove (@children);
		3396
		3397	delete $self->{is_toplevel}
		3398	for @children;
3136		3399
3137	while (@children) {	3400	while (@children) {
3138	my $w = pop @children;	3401	my $w = pop @children;
3139	push @children, $w->children;	3402	push @children, $w->children;
3140	$w->set_invisible;	3403	$w->set_invisible;
…		…
3159	while ($self->{refresh_hook}) {	3422	while ($self->{refresh_hook}) {
3160	$_->()	3423	$_->()
3161	for values %{delete $self->{refresh_hook}};	3424	for values %{delete $self->{refresh_hook}};
3162	}	3425	}
3163		3426
3164	if ($self->{check_size}) {	3427	if ($self->{realloc}) {
3165	my @queue = ([], []);	3428	my %queue;
		3429	my @queue;
		3430	my $widget;
3166		3431
3167	for (;;) {	3432	outer:
3168	if ($self->{check_size}) {	3433	while () {
3169	# heuristic: check containers last	3434	if (my $realloc = delete $self->{realloc}) {
3170	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3435	for $widget (values %$realloc) {
3171	for values %{delete $self->{check_size}}	3436	$widget->{visible} or next; # do not resize invisible widgets
		3437
		3438	$queue{$widget+0}++ and next; # duplicates are common
		3439
		3440	push @{ $queue[$widget->{visible}] }, $widget;
		3441	}
3172	}	3442	}
3173		3443
3174	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3444	while () {
		3445	@queue or last outer;
3175		3446
3176	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3447	$widget = pop @{ $queue[-1] || [] }
3177	? @$widget{qw(user_w user_h)}	3448	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		3449
		3450	pop @queue;
		3451	}
		3452
		3453	delete $queue{$widget+0};
		3454
		3455	my ($w, $h) = $widget->size_request;
		3456
		3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3459
		3460	$w = $widget->{force_w} if exists $widget->{force_w};
		3461	$h = $widget->{force_h} if exists $widget->{force_h};
		3462
		3463	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3464	|| delete $widget->{force_realloc}) {
3184	$widget->{req_w} = $w;	3465	$widget->{req_w} = $w;
3185	$widget->{req_h} = $h;	3466	$widget->{req_h} = $h;
3186		3467
3187	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3468	$self->{size_alloc}{$widget+0} = $widget;
3188		3469
3189	$widget->{parent}->check_size
3190	if $widget->{parent};	3470	if (my $parent = $widget->{parent}) {
		3471	$self->{realloc}{$parent+0} = $parent
		3472	unless $queue{$parent+0};
		3473
		3474	$parent->{force_size_alloc} = 1;
		3475	$self->{size_alloc}{$parent+0} = $parent;
		3476	}
3191	}	3477	}
		3478
		3479	delete $self->{realloc}{$widget+0};
3192	}	3480	}
3193	}	3481	}
3194		3482
3195	while ($self->{size_alloc}) {	3483	while (my $size_alloc = delete $self->{size_alloc}) {
3196	for (values %{delete $self->{size_alloc}}) {	3484	my @queue = sort { $b->{visible} <=> $a->{visible} }
3197	my ($widget, $w, $h) = @$_;	3485	values %$size_alloc;
		3486
		3487	while () {
		3488	my $widget = pop @queue || last;
		3489
		3490	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198		3491
3199	$w = 0 if $w < 0;	3492	$w = 0 if $w < 0;
3200	$h = 0 if $h < 0;	3493	$h = 0 if $h < 0;
3201		3494
		3495	$w = int $w + 0.5;
		3496	$h = int $h + 0.5;
		3497
		3498	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3499	$widget->{old_w} = $widget->{w};
		3500	$widget->{old_h} = $widget->{h};
		3501
3202	$widget->{w} = $w;	3502	$widget->{w} = $w;
3203	$widget->{h} = $h;	3503	$widget->{h} = $h;
		3504
3204	$widget->emit (size_allocate => $w, $h);	3505	$widget->emit (size_allocate => $w, $h);
		3506	}
3205	}	3507	}
3206	}	3508	}
3207		3509
3208	while ($self->{post_alloc_hook}) {	3510	while ($self->{post_alloc_hook}) {
3209	$_->()	3511	$_->()
3210	for values %{delete $self->{post_alloc_hook}};	3512	for values %{delete $self->{post_alloc_hook}};
3211	}	3513	}
		3514
3212		3515
3213	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3516	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3517	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215	glClear GL_COLOR_BUFFER_BIT;	3518	glClear GL_COLOR_BUFFER_BIT;
3216		3519
…		…
3218	glLoadIdentity;	3521	glLoadIdentity;
3219	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3522	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220	glMatrixMode GL_MODELVIEW;	3523	glMatrixMode GL_MODELVIEW;
3221	glLoadIdentity;	3524	glLoadIdentity;
3222		3525
		3526	{
		3527	package CFClient::UI::Base;
		3528
		3529	($draw_x, $draw_y, $draw_w, $draw_h) =
		3530	(0, 0, $self->{w}, $self->{h});
		3531	}
		3532
3223	$self->_draw;	3533	$self->_draw;
3224	}	3534	}
3225		3535
3226	#############################################################################	3536	#############################################################################
3227		3537

Diff Legend

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