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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->check_size;
61	$TOOLTIP->update;
62	}	61	}
63		62
64	return;	63	return;
65	}	64	}
66	}	65	}
…		…
172	sub rescale_widgets {	171	sub rescale_widgets {
173	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
174		173
175	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
176	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
177	$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.]+$/;
178	$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};
179	$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};
180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181	$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.]+$/;
182	$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};
183	$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};
184	$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
185	}	189	}
186	}	190	}
187		191
188	reconfigure_widgets;	192	reconfigure_widgets;
189	}	193	}
…		…
198		202
199	sub new {	203	sub new {
200	my $class = shift;	204	my $class = shift;
201		205
202	my $self = bless {	206	my $self = bless {
203	x => 0,	207	x => "center",
204	y => 0,	208	y => "center",
205	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
206	can_events => 1,	212	can_events => 1,
207	@_	213	@_
208	}, $class;	214	}, $class;
209		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
210	for (keys %$self) {	218	for (keys %$self) {
211	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
212	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
213	}	221	}
214	}	222	}
215		223
216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219	$self->{user_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220	$self->{user_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
223	}	234	}
224		235
225	$self	236	$self
226	}	237	}
227		238
…		…
232	%$self = ();	243	%$self = ();
233	}	244	}
234		245
235	sub show {	246	sub show {
236	my ($self) = @_;	247	my ($self) = @_;
		248
237	return if $self->{parent};	249	return if $self->{parent};
238		250
239	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
240	}	252	}
241		253
242	sub show_centered {	254	sub set_visible {
243	my ($self) = @_;	255	my ($self) = @_;
		256
244	return if $self->{parent};	257	return if $self->{visible};
245		258
246	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
247		261
248	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
249	"centered $self" => sub {	263
250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
251	},	265
252	);	266	$_->set_visible for $self->children;
253	}	267	}
254		268
255	sub set_invisible {	269	sub set_invisible {
256	my ($self) = @_;	270	my ($self) = @_;
257		271
258	# broken show/hide model	272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
259		275
260	delete $self->{root};	276	delete $self->{root};
261	delete $self->{visible};	277	delete $self->{visible};
262		278
263	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
264	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
265		281
266	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
267	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
268		284
269	$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;
270	}	305	}
271		306
272	sub hide {	307	sub hide {
273	my ($self) = @_;	308	my ($self) = @_;
274		309
…		…
276		311
277	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
278	if $self->{parent};	313	if $self->{parent};
279	}	314	}
280		315
281	sub move {	316	sub move_abs {
282	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
283		318
284	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
285	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
286	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
287		322
288	$self->update;	323	$self->update;
289	}	324	}
290		325
291	sub set_size {	326	sub set_size {
292	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
293		328
294	$self->{user_w} = $w;	329	$self->{force_w} = $w;
295	$self->{user_h} = $h;	330	$self->{force_h} = $h;
296		331
297	$self->check_size;	332	$self->realloc;
298	}	333	}
299		334
300	sub size_request {	335	sub size_request {
301	require Carp;	336	require Carp;
302	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
304		339
305	sub configure {	340	sub configure {
306	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
307		342
308	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
309	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
310	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
311		348
312	# use alignment to adjust x, y	349	# use alignment to adjust x, y
313		350
314	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
315	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
316
317	($w, $h) = ($w2, $h2);
318	}	353	}
319		354
320	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
321	$self->{x} = $x;	356	$self->{x} = $x;
322	$self->{y} = $y;	357	$self->{y} = $y;
323	$self->update;	358	$self->update;
324	}	359	}
325		360
326	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327	$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;
328	}	368	}
329	}	369	}
330		370
331	sub size_allocate {	371	sub size_allocate {
332	# nothing to be done	372	# nothing to be done
333	}	373	}
334		374
335	sub reconfigure {
336	my ($self) = @_;
337
338	$self->check_size (1);
339	$self->update;
340	}
341
342	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
343	}	381	}
344		382
345	sub set_max_size {	383	sub set_max_size {
346	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
347		385
…		…
406		444
407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408	unless $FOCUS;	446	unless $FOCUS;
409	}	447	}
410		448
411	sub mouse_motion { }	449	sub mouse_motion { 0 }
412	sub button_up { }	450	sub button_up { 0 }
413	sub key_down { }	451	sub key_down { 0 }
414	sub key_up { }	452	sub key_up { 0 }
415		453
416	sub button_down {	454	sub button_down {
417	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
418		456
419	$self->focus_in;	457	$self->focus_in;
420	}
421		458
422	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
423	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
424	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
425	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
426	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427		535
428	sub draw {	536	sub draw {
429	my ($self) = @_;	537	my ($self) = @_;
430		538
431	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432		550
433	glPushMatrix;	551	glPushMatrix;
434	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
435	$self->_draw;	553	$self->_draw;
436	glPopMatrix;	554	glPopMatrix;
…		…
448	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
449	glEnd;	567	glEnd;
450	glDisable GL_BLEND;	568	glDisable GL_BLEND;
451	}	569	}
452		570
453	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
454	glPushMatrix;	572	glPushMatrix;
455	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
458	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
469	my ($self) = @_;	587	my ($self) = @_;
470		588
471	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
472	}	590	}
473		591
474	sub find_widget {
475	my ($self, $x, $y) = @_;
476
477	return () unless $self->{can_events};
478
479	return $self
480	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483	()
484	}
485
486	sub set_parent {
487	my ($self, $parent) = @_;
488
489	Scalar::Util::weaken ($self->{parent} = $parent);
490
491	$self->{root} = $parent->{root};
492	$self->{visible} = $parent->{visible} + 1;
493
494	# TODO: req_w _does_change after ->reconfigure
495	$self->check_size
496	unless exists $self->{req_w};
497
498	$self->show;
499	}
500
501	sub check_size {
502	my ($self, $forced) = @_;
503
504	$self->{force_alloc} = 1 if $forced;
505	$CFClient::UI::ROOT->{check_size}{$self} = $self;
506	}
507
508	sub update {
509	my ($self) = @_;
510
511	$self->{parent}->update
512	if $self->{parent};
513	}
514
515	sub connect {
516	my ($self, $signal, $cb) = @_;
517
518	push @{ $self->{signal_cb}{$signal} }, $cb;
519	}
520
521	sub _emit {
522	my ($self, $signal, @args) = @_;
523
524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525	}
526
527	sub emit {
528	my ($self, $signal, @args) = @_;
529
530	$self->_emit ($signal, @args)
531	|| $self->$signal (@args);
532	}
533
534	sub DESTROY {	592	sub DESTROY {
535	my ($self) = @_;	593	my ($self) = @_;
536		594
537	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
538	#$self->deactivate;	596	#$self->deactivate;
…		…
594	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
595	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
596	}	654	}
597		655
598	sub size_request {	656	sub size_request {
599	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
600	}	660	}
601		661
602	sub draw { }	662	sub draw { }
603		663
604	#############################################################################	664	#############################################################################
…		…
608	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
609		669
610	sub new {	670	sub new {
611	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
612		672
613	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
614		674
615	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
616	children => [],	676	children => [],
617	can_events => 0,	677	can_events => 0,
618	%arg,	678	%arg,
619	);	679	);
		680
620	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
621		683
622	$self	684	$self
623	}	685	}
624		686
625	sub add {	687	sub add {
…		…
633	$self->{children} = [	695	$self->{children} = [
634	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
635	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
636	];	698	];
637		699
638	$self->check_size (1);	700	$self->realloc;
639	$self->update;
640	}	701	}
641		702
642	sub children {	703	sub children {
643	@{ $_[0]{children} }	704	@{ $_[0]{children} }
644	}	705	}
…		…
649	delete $child->{parent};	710	delete $child->{parent};
650	$child->hide;	711	$child->hide;
651		712
652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653		714
654	$self->check_size (1);	715	$self->realloc;
655	$self->update;
656	}	716	}
657		717
658	sub clear {	718	sub clear {
659	my ($self) = @_;	719	my ($self) = @_;
660		720
…		…
664	for (@$children) {	724	for (@$children) {
665	delete $_->{parent};	725	delete $_->{parent};
666	$_->hide;	726	$_->hide;
667	}	727	}
668		728
669	$self->check_size;	729	$self->realloc;
670	$self->update;
671	}	730	}
672		731
673	sub find_widget {	732	sub find_widget {
674	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
675		734
676	$x -= $self->{x};	735	$x -= $self->{x};
677	$y -= $self->{y};	736	$y -= $self->{y};
678		737
679	my $res;	738	my $res;
680		739
681	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
682	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
683	and return $res;	742	and return $res;
684	}	743	}
685		744
686	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
735	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
736	}	795	}
737		796
738	#############################################################################	797	#############################################################################
739		798
		799	# back-buffered drawing area
		800
740	package CFClient::UI::Window;	801	package CFClient::UI::Window;
741		802
742	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
743		804
744	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
762	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
763	$self->update;	824	$self->update;
764	}	825	}
765		826
766	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
767	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
768	}	831	}
769		832
770	sub render_child {	833	sub render_child {
771	my ($self) = @_;	834	my ($self) = @_;
772		835
773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
775	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
776		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
777	$self->_render;	847	$self->_render;
778	};	848	};
779	}	849	}
780		850
781	sub _draw {	851	sub _draw {
782	my ($self) = @_;	852	my ($self) = @_;
783		853
784	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
785		855
786	my $tex = $self->{texture}	856	my $tex = $self->{texture}
787	or return;	857	or return;
788		858
789	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
812	}	882	}
813		883
814	sub size_request {	884	sub size_request {
815	my ($self) = @_;	885	my ($self) = @_;
816		886
817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818		888
819	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
820	}	893	}
821		894
822	sub size_allocate {	895	sub size_allocate {
823	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
824		897
		898	my $child = $self->child;
		899
825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827		902
828	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
829	$self->update;	904	$self->update;
830	}	905	}
831		906
…		…
867	}	942	}
868		943
869	sub _render {	944	sub _render {
870	my ($self) = @_;	945	my ($self) = @_;
871		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
872	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873		951
874	$self->SUPER::_render;	952	$self->SUPER::_render;
875	}	953	}
876		954
…		…
879	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
880		958
881	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
882		960
883	sub new {	961	sub new {
884	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
885		965
886	my $self;	966	my $self;
887		967
888	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
889	vertical => 1,	969	vertical => 1,
890	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
891	connect_changed => sub {	971	on_changed => sub {
892	$self->{vp}->set_offset (0, $_[1]);	972	$self->{vp}->set_offset (0, $_[1]);
893	},	973	},
894	;	974	;
895		975
896	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
897	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
898	slider => $slider,	978	slider => $slider,
899	@_,	979	%arg,
900	);	980	);
901		981
902	$self->{vp}->add ($self->{scrolled});
903	$self->add ($self->{vp});
904	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
905		984
906	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
907	}	992	}
908		993
909	sub update {	994	sub update {
910	my ($self) = @_;	995	my ($self) = @_;
911		996
…		…
974		1059
975	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
976		1061
977	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
978		1063
979	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
980	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982		1071
983	sub new {	1072	sub new {
984	my $class = shift;	1073	my ($class, %arg) = @_;
985		1074
986	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
987		1076
988	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
989	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
990	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
991	border => 0.6,	1080	border => 0.6,
992	is_toplevel => 1,
993	can_events => 1,	1081	can_events => 1,
994	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
995	);	1085	);
996		1086
997	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
998	align => 0,	1088	align => 0,
999	valign => 1,	1089	valign => 1,
1000	text => $self->{title},	1090	text => $title,
1001	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1002		1093
1003	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004	}	1102	}
1005		1103
1006	sub border {	1104	sub border {
1007	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1008	}	1106	}
1009		1107
1010	sub size_request {	1108	sub size_request {
1011	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1012		1113
1013	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1014		1115
1015	(	1116	(
1016	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
1019	}	1120	}
1020		1121
1021	sub size_allocate {	1122	sub size_allocate {
1022	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
1023		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
1024	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1025	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1026		1135
1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028	if $self->{title};
1029
1030	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1031	}	1137	}
1032		1138
1033	sub button_down {	1139	sub button_down {
1034	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1035		1141
…		…
1051	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1052		1158
1053	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1054	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1055		1161
1056	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
		1165	$self->realloc;
1058	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059	$self->check_size;
1060	};	1167	};
1061		1168
1062	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1063	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1066	$self->{motion} = sub {	1173	$self->{motion} = sub {
1067	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1068		1175
1069	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1070		1177
1071	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072	$self->update;
1073	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1074	}	1184	1
1075	}	1185	}
1076		1186
1077	sub button_up {	1187	sub button_up {
1078	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1079		1189
1080	delete $self->{motion};	1190	!!delete $self->{motion}
1081	}	1191	}
1082		1192
1083	sub mouse_motion {	1193	sub mouse_motion {
1084	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1085		1195
1086	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1087	}	1199	}
1088		1200
1089	sub _draw {	1201	sub _draw {
1090	my ($self) = @_;	1202	my ($self) = @_;
1091		1203
		1204	my $child = $self->{children}[0];
		1205
1092	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1093	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1094		1208
1095	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1096	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097		1211
1098	my $border = $self->border;	1212	my $border = $self->border;
1099		1213
1100	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1101	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1102	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105		1219
1106	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1108		1222
1109	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1110	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1111	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1112
1113	glColor @{ $self->{bg} };
1114
1115	$bg->{s} = $rep_x;
1116	$bg->{t} = $rep_y;
1117	$bg->{wrap_mode} = 1;
1118	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119	}	1228	}
1120		1229
1121	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1122		1231
1123	$self->{title}->draw if $self->{title};
1124
1125	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1126	}	1238	}
1127		1239
1128	#############################################################################	1240	#############################################################################
1129		1241
1130	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1152	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1153		1265
1154	$child->set_parent ($self);	1266	$child->set_parent ($self);
1155	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1156		1268
1157	$self->check_size (1);	1269	$self->realloc;
1158	}	1270	}
1159		1271
1160	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1161	sub clear {	1273	sub clear {
1162	my ($self) = @_;	1274	my ($self) = @_;
…		…
1167	for (@children) {	1279	for (@children) {
1168	delete $_->{parent};	1280	delete $_->{parent};
1169	$_->hide;	1281	$_->hide;
1170	}	1282	}
1171		1283
1172	$self->check_size (1);	1284	$self->realloc;
1173	$self->update;
1174	}	1285	}
1175		1286
1176	sub get_wh {	1287	sub get_wh {
1177	my ($self) = @_;	1288	my ($self) = @_;
1178		1289
…		…
1274	}	1385	}
1275	}	1386	}
1276		1387
1277	#############################################################################	1388	#############################################################################
1278		1389
1279	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1280
1281	# TODO: wrap into common Box base class
1282		1391
1283	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1284		1393
1285	sub size_request {	1394	sub size_request {
1286	my ($self) = @_;	1395	my ($self) = @_;
1287		1396
1288	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1289		1398	? (
1290	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1291	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292	(List::Util::max map $_->[1], @alloc),	1401	)
1293	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1294	}	1406	}
1295		1407
1296	sub size_allocate {	1408	sub size_allocate {
1297	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1298		1410
1299	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1300
1301	my $children = $self->{children};	1412	my $children = $self->{children};
1302		1413
1303	my @h = map $_->{req_w}, @$children;	1414	my @req;
1304		1415
1305	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1306		1417	@req = ($space / (@$children || 1)) x @$children;
1307	if ($req_h > $h) {
1308	# ah well, not enough space
1309	$_ *= $h / $req_h for @h;
1310	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1311	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312	$exp ||= 1;
1313		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1314	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1315	my $child = $children->[$_];
1316
1317	my $alloc_h = $h[$_];
1318	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319	$h[$_] = $alloc_h;
1320	}	1432	}
1321	}	1433	}
1322		1434
1323	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1324		1436
1325	my $y = 0;	1437	my $pos = 0;
1326	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1327	my $child = $children->[$_];
1328	my $h = $h[$_];	1439	my $alloc = $req[$_];
1329	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330		1441
1331	$y += $h;	1442	$pos += $alloc;
1332	}	1443	}
1333		1444
1334	1	1445	1
1335	}	1446	}
1336		1447
1337	#############################################################################	1448	#############################################################################
1338		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1339	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1340		1466
1341	# TODO: wrap into common Box base class
1342
1343	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1344		1468
1345	sub size_request {	1469	sub new {
1346	my ($self) = @_;	1470	my $class = shift;
1347		1471
1348	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1349		1473	vertical => 1,
1350	(	1474	@_,
1351	(List::Util::max map $_->[0], @alloc),
1352	(List::Util::sum map $_->[1], @alloc),
1353	)	1475	)
1354	}
1355
1356	sub size_allocate {
1357	my ($self, $w, $h) = @_;
1358
1359	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361	my $children = $self->{children};
1362
1363	my @h = map $_->{req_h}, @$children;
1364
1365	my $req_h = List::Util::sum @h;
1366
1367	if ($req_h > $h) {
1368	# ah well, not enough space
1369	$_ *= $h / $req_h for @h;
1370	} else {
1371	my $exp = List::Util::sum map $_->{expand}, @$children;
1372	$exp ||= 1;
1373
1374	for (0 .. $#$children) {
1375	my $child = $children->[$_];
1376
1377	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378	}
1379	}
1380
1381	CFClient::UI::harmonize \@h;
1382
1383	my $y = 0;
1384	for (0 .. $#$children) {
1385	my $child = $children->[$_];
1386	my $h = $h[$_];
1387	$child->configure (0, $y, $w, $h);
1388
1389	$y += $h;
1390	}
1391
1392	1
1393	}	1476	}
1394		1477
1395	#############################################################################	1478	#############################################################################
1396		1479
1397	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1414	ellipsise => 3, # end	1497	ellipsise => 3, # end
1415	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1416	fontsize => 1,	1499	fontsize => 1,
1417	align => -1,	1500	align => -1,
1418	valign => -1,	1501	valign => -1,
1419	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1420	can_events => 0,	1504	can_events => 0,
1421	%arg	1505	%arg
1422	);	1506	);
1423		1507
1424	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1460	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1461		1545
1462	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1464		1548
		1549	$self->realloc;
1465	$self->update;	1550	$self->update;
1466	$self->check_size;
1467	}	1551	}
1468		1552
1469	sub set_markup {	1553	sub set_markup {
1470	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1471		1555
…		…
1475	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476		1560
1477	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1479		1563
		1564	$self->realloc;
1480	$self->update;	1565	$self->update;
1481	$self->check_size;
1482	}	1566	}
1483		1567
1484	sub size_request {	1568	sub size_request {
1485	my ($self) = @_;	1569	my ($self) = @_;
1486		1570
…		…
1500		1584
1501	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1502	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1503	}	1587	}
1504		1588
1505	(	1589	($w, $h)
1506	$w + $self->{padding} * 2,
1507	$h + $self->{padding} * 2,
1508	)
1509	}	1590	}
1510		1591
1511	sub size_allocate {	1592	sub size_allocate {
1512	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1513		1594
		1595	delete $self->{ox};
		1596
1514	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515	}	1599	}
1516		1600
1517	sub set_fontsize {	1601	sub set_fontsize {
1518	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1519		1603
1520	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1521	delete $self->{texture};	1605	delete $self->{texture};
1522		1606
1523	$self->update;	1607	$self->realloc;
1524	$self->check_size;
1525	}	1608	}
1526		1609
1527	sub _draw {	1610	sub _draw {
1528	my ($self) = @_;	1611	my ($self) = @_;
1529		1612
…		…
1535	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1536	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539		1622
1540	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1541		1625
		1626	unless (exists $self->{ox}) {
1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1545		1630
1546	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1549
1550	$tex
1551	};	1634	};
1552		1635
1553	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555		1638
…		…
1593		1676
1594	delete $self->{cur_h};	1677	delete $self->{cur_h};
1595		1678
1596	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1597		1680
1598	delete $self->{texture};
1599
1600	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1601	$self->{text} = $text;	1682	$self->{text} = $text;
1602		1683
1603	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1604	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1605		1686
1606	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1607	}	1689	}
1608		1690
1609	sub set_text {	1691	sub set_text {
1610	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1611		1693
1612	$self->{cursor} = length $text;	1694	$self->{cursor} = length $text;
1613	$self->_set_text ($text);	1695	$self->_set_text ($text);
1614	$self->update;	1696
1615	$self->check_size;	1697	$self->realloc;
1616	}	1698	}
1617		1699
1618	sub get_text {	1700	sub get_text {
1619	$_[0]{text}	1701	$_[0]{text}
1620	}	1702	}
…		…
1650	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1651	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1652	$self->_emit ('escape');	1734	$self->_emit ('escape');
1653	} elsif ($uni) {	1735	} elsif ($uni) {
1654	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1655	}	1739	}
1656		1740
1657	$self->_set_text ($text);	1741	$self->_set_text ($text);
1658	$self->update;	1742
1659	$self->check_size;	1743	$self->realloc;
		1744
		1745	1
1660	}	1746	}
1661		1747
1662	sub focus_in {	1748	sub focus_in {
1663	my ($self) = @_;	1749	my ($self) = @_;
1664		1750
…		…
1679	utf8::encode $text;	1765	utf8::encode $text;
1680	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1681		1767
1682	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1683	$self->update;	1769	$self->update;
		1770
		1771	1
1684	}	1772	}
1685		1773
1686	sub mouse_motion {	1774	sub mouse_motion {
1687	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1688	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1689	}	1779	}
1690		1780
1691	sub _draw {	1781	sub _draw {
1692	my ($self) = @_;	1782	my ($self) = @_;
1693		1783
…		…
1770	} else {	1860	} else {
1771	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1772	}	1862	}
1773		1863
1774	} else {	1864	} else {
1775	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1776	}	1868	1
1777
1778	}	1869	}
1779		1870
1780	#############################################################################	1871	#############################################################################
1781		1872
1782	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1791		1882
1792	sub new {	1883	sub new {
1793	my $class = shift;	1884	my $class = shift;
1794		1885
1795	$class->SUPER::new (	1886	$class->SUPER::new (
1796	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1797	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1798	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1799	can_hover => 1,	1891	can_hover => 1,
1800	align => 0,	1892	align => 0,
1801	valign => 0,	1893	valign => 0,
…		…
1810	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1811		1903
1812	$self->emit ("activate")	1904	$self->emit ("activate")
1813	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1814	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1815	}	1909	}
1816		1910
1817	sub _draw {	1911	sub _draw {
1818	my ($self) = @_;	1912	my ($self) = @_;
1819		1913
…		…
1848		1942
1849	sub new {	1943	sub new {
1850	my $class = shift;	1944	my $class = shift;
1851		1945
1852	$class->SUPER::new (	1946	$class->SUPER::new (
1853	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1854	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1855	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1856	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1857	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1858	state => 0,	1953	state => 0,
…		…
1862	}	1957	}
1863		1958
1864	sub size_request {	1959	sub size_request {
1865	my ($self) = @_;	1960	my ($self) = @_;
1866		1961
1867	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1868	}	1963	}
1869		1964
1870	sub button_down {	1965	sub button_down {
1871	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1872		1967
1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1876	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1877	}	1976	1
1878	}	1977	}
1879		1978
1880	sub _draw {	1979	sub _draw {
1881	my ($self) = @_;	1980	my ($self) = @_;
1882		1981
1883	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1884		1983
1885	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886		1985
1887	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888		1989
1889	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890		1991
1891	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1892		1993
…		…
2157	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2158	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2159	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2160	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2161	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2162	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2163	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2164	vertical => 0,	2265	vertical => 0,
2165	can_hover => 1,	2266	can_hover => 1,
2166	inner_pad => 0.02,	2267	inner_pad => 0.02,
2167	@_	2268	@_
2168	);	2269	);
…		…
2171	$self->update;	2272	$self->update;
2172		2273
2173	$self	2274	$self
2174	}	2275	}
2175		2276
		2277	sub changed { }
		2278
2176	sub set_range {	2279	sub set_range {
2177	my ($self, $range) = @_;	2280	my ($self, $range) = @_;
2178		2281
2179	($range, $self->{range}) = ($self->{range}, $range);	2282	($range, $self->{range}) = ($self->{range}, $range);
2180		2283
…		…
2206	}	2309	}
2207		2310
2208	sub size_request {	2311	sub size_request {
2209	my ($self) = @_;	2312	my ($self) = @_;
2210		2313
2211	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2212	my $h = $self->{req_h};
2213
2214	$self->{vertical} ? ($h, $w) : ($w, $h)
2215	}	2315	}
2216		2316
2217	sub button_down {	2317	sub button_down {
2218	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2219		2319
2220	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2221		2321
2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223		2323
2224	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2225	}	2325	}
2226		2326
2227	sub mouse_motion {	2327	sub mouse_motion {
2228	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2229		2329
…		…
2233	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2234		2334
2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236		2336
2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2238	}	2342	1
2239	}	2343	}
2240		2344
2241	sub update {	2345	sub update {
2242	my ($self) = @_;	2346	my ($self) = @_;
2243		2347
2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2245	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2246		2357
2247	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2248	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2249		2360
…		…
2255	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2256	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2257		2368
2258	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2259	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2260	});	2371	}
2261
2262	$self->SUPER::update;
2263	}
2264
2265	sub _draw {
2266	my ($self) = @_;
2267		2372
2268	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2269		2374
2270	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2271		2376
…		…
2570		2675
2571	sub new {	2676	sub new {
2572	my $class = shift;	2677	my $class = shift;
2573		2678
2574	my $self = $class->SUPER::new (	2679	my $self = $class->SUPER::new (
2575	state => 0,	2680	state => 0,
2576	connect_activate => \&toggle_flopper,	2681	on_activate => \&toggle_flopper,
2577	@_	2682	@_
2578	);	2683	);
2579		2684
2580	if ($self->{state}) {
2581	$self->{state} = 0;
2582	$self->toggle_flopper;
2583	}
2584
2585	$self	2685	$self
2586	}	2686	}
2587		2687
2588	sub toggle_flopper {	2688	sub toggle_flopper {
2589	my ($self) = @_;	2689	my ($self) = @_;
2590		2690
2591	# TODO: use animation	2691	$self->{other}->toggle_visibility;
2592	if ($self->{state} = !$self->{state}) {
2593	$CFClient::UI::ROOT->add ($self->{other});
2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2595	$self->_emit ("open");
2596	} else {
2597	$CFClient::UI::ROOT->remove ($self->{other});
2598	$self->_emit ("close");
2599	}
2600
2601	$self->_emit (changed => $self->{state});
2602	}	2692	}
2603		2693
2604	#############################################################################	2694	#############################################################################
2605		2695
2606	package CFClient::UI::Tooltip;	2696	package CFClient::UI::Tooltip;
…		…
2619	}	2709	}
2620		2710
2621	sub set_tooltip_from {	2711	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2623		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2624	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2724	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2726	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2728	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2641		2740
2642	sub size_allocate {	2741	sub size_allocate {
2643	my ($self, $w, $h) = @_;	2742	my ($self, $w, $h) = @_;
2644		2743
2645	$self->SUPER::size_allocate ($w - 4, $h - 4);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2646	}	2763	}
2647		2764
2648	sub _draw {	2765	sub _draw {
2649	my ($self) = @_;	2766	my ($self) = @_;
2650		2767
…		…
2667	glVertex $w, $h;	2784	glVertex $w, $h;
2668	glVertex $w, 0;	2785	glVertex $w, 0;
2669	glEnd;	2786	glEnd;
2670		2787
2671	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2672	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2673	}	2791	}
2674		2792
2675	#############################################################################	2793	#############################################################################
2676		2794
…		…
2752	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2753	}	2871	}
2754		2872
2755	#############################################################################	2873	#############################################################################
2756		2874
2757	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2758		2876
2759	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2760		2878
2761	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2762	my $class = shift;
2763
2764	my $self = $class->SUPER::new (
2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766	@_,
2767	);
2768
2769	$self
2770	}
2771
2772	sub set_items {
2773	my ($self, $items) = @_;
2774
2775	$self->{scrolled}->clear;
2776	return unless $items;
2777
2778	my @items = sort {
2779	($a->{type} <=> $b->{type})
2780	or ($a->{name} cmp $b->{name})
2781	} @$items;
2782
2783	$self->{real_items} = \@items;
2784
2785	my $row = 0;
2786	for my $item (@items) {
2787	CFClient::Item::update_widgets $item;
2788
2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793	$row++;
2794	}
2795	}
2796
2797	sub size_request {
2798	my ($self) = @_;
2799	($self->{req_w}, $self->{req_h});
2800	}
2801		2880
2802	#############################################################################	2881	#############################################################################
2803		2882
2804	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2805		2884
…		…
2846	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2847	$GRAB = $self;	2926	$GRAB = $self;
2848	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2849		2928
2850	$self->show;	2929	$self->show;
2851	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2852	}	2931	}
2853		2932
2854	sub mouse_motion {	2933	sub mouse_motion {
2855	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2856		2935
2857	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2858	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2860	}	2941	}
2861		2942
2862	sub button_up {	2943	sub button_up {
2863	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2864		2945
…		…
2866	undef $GRAB;	2947	undef $GRAB;
2867	$self->hide;	2948	$self->hide;
2868		2949
2869	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2870	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2871	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2872	}	3065	}
2873		3066
2874	#############################################################################	3067	#############################################################################
2875		3068
2876	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2981	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2982	}	3175	}
2983		3176
2984	#############################################################################	3177	#############################################################################
2985		3178
2986	package CFClient::UI::Root;	3179	package CFClient::UI::Inventory;
2987		3180
2988	our @ISA = CFClient::UI::Container::;	3181	our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990	use CFClient::OpenGL;
2991		3182
2992	sub new {	3183	sub new {
2993	my $class = shift;	3184	my $class = shift;
2994		3185
2995	$class->SUPER::new (	3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
		3474	package CFClient::UI::Root;
		3475
		3476	our @ISA = CFClient::UI::Container::;
		3477
		3478	use CFClient::OpenGL;
		3479
		3480	sub new {
		3481	my $class = shift;
		3482
		3483	my $self = $class->SUPER::new (
2996	visible => 1,	3484	visible => 1,
2997	@_,	3485	@_,
2998	)	3486	);
2999	}
3000		3487
3001	sub configure {	3488	Scalar::Util::weaken ($self->{root} = $self);
3002	my ($self, $x, $y, $w, $h) = @_;
3003		3489
3004	$self->{w} = $w;	3490	$self
3005	$self->{h} = $h;
3006	}
3007
3008	sub check_size {
3009	my ($self) = @_;
3010
3011	$self->size_allocate ($self->{w}, $self->{h})
3012	if $self->{w};
3013	}	3491	}
3014		3492
3015	sub size_request {	3493	sub size_request {
3016	my ($self) = @_;	3494	my ($self) = @_;
3017		3495
3018	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
		3497	}
		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
3019	}	3511	}
3020		3512
3021	sub size_allocate {	3513	sub size_allocate {
3022	my ($self, $w, $h) = @_;	3514	my ($self, $w, $h) = @_;
3023		3515
3024	for my $child ($self->children) {	3516	for my $child ($self->children) {
3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026		3518
3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
3028	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
3029		3521
3030	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
3031	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3524
3036	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
3037	}	3526	}
3038	}	3527	}
3039		3528
…		…
3050	}	3539	}
3051		3540
3052	sub update {	3541	sub update {
3053	my ($self) = @_;	3542	my ($self) = @_;
3054		3543
3055	$self->check_size;
3056	$::WANT_REFRESH++;	3544	$::WANT_REFRESH++;
3057	}	3545	}
3058		3546
3059	sub add {	3547	sub add {
3060	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3061		3549
3062	for (my @widgets = @children; my $w = pop @widgets; ) {
3063	push @widgets, $w->children;
3064	$w->{root} = $self;
3065	$w->{visible} = $self->{visible} + 1;
3066	}
3067
3068	for my $child (@children) {
3069	$child->{is_toplevel} = 1;	3550	$_->{is_toplevel} = 1
3070		3551	for @children;
3071	# integerise window positions
3072	$child->{x} = int $child->{x};
3073	$child->{y} = int $child->{y};
3074	}
3075		3552
3076	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3077	}	3554	}
3078		3555
3079	sub remove {	3556	sub remove {
3080	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3081		3558
3082	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3083		3563
3084	while (@children) {	3564	while (@children) {
3085	my $w = pop @children;	3565	my $w = pop @children;
3086	push @children, $w->children;	3566	push @children, $w->children;
3087	$w->set_invisible;	3567	$w->set_invisible;
…		…
3106	while ($self->{refresh_hook}) {	3586	while ($self->{refresh_hook}) {
3107	$_->()	3587	$_->()
3108	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3109	}	3589	}
3110		3590
3111	if ($self->{check_size}) {	3591	if ($self->{realloc}) {
3112	my @queue = ([], []);	3592	my %queue;
		3593	my @queue;
		3594	my $widget;
3113		3595
3114	for (;;) {	3596	outer:
3115	if ($self->{check_size}) {	3597	while () {
3116	# heuristic: check containers last	3598	if (my $realloc = delete $self->{realloc}) {
3117	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3599	for $widget (values %$realloc) {
3118	for values %{delete $self->{check_size}}	3600	$widget->{visible} or next; # do not resize invisible widgets
		3601
		3602	$queue{$widget+0}++ and next; # duplicates are common
		3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3119	}	3606	}
3120		3607
3121	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3608	while () {
		3609	@queue or last outer;
3122		3610
3123	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3611	$widget = pop @{ $queue[-1] || [] }
3124	? @$widget{qw(user_w user_h)}	3612	and last;
3125	: $widget->size_request;
3126
3127	if (delete $widget->{force_alloc}
3128	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3131	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3132	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3133		3631
3134	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3632	$self->{size_alloc}{$widget+0} = $widget;
3135		3633
3136	$widget->{parent}->check_size
3137	if $widget->{parent};	3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
3138	}	3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3139	}	3644	}
3140	}	3645	}
3141		3646
3142	while ($self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3143	for (values %{delete $self->{size_alloc}}) {	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3144	my ($widget, $w, $h) = @$_;	3649	values %$size_alloc;
		3650
		3651	while () {
		3652	my $widget = pop @queue || last;
		3653
		3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145		3655
3146	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3147	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3148		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3149	$widget->{w} = $w;	3666	$widget->{w} = $w;
3150	$widget->{h} = $h;	3667	$widget->{h} = $h;
		3668
3151	$widget->emit (size_allocate => $w, $h);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3152	}	3671	}
3153	}	3672	}
3154		3673
3155	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3156	$_->()	3675	$_->()
3157	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3158	}	3677	}
		3678
3159		3679
3160	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3163		3683
…		…
3165	glLoadIdentity;	3685	glLoadIdentity;
3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3168	glLoadIdentity;	3688	glLoadIdentity;
3169		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3170	$self->_draw;	3697	$self->_draw;
3171	}	3698	}
3172		3699
3173	#############################################################################	3700	#############################################################################
3174		3701

Diff Legend

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