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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
271		272
272	return unless $self->{visible};	273	return unless $self->{visible};
273		274
274	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
275		276
		277	delete $self->{visible};
276	delete $self->{root};	278	delete $self->{root};
277	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->emit ("focus_out");
286
287	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
288	}	288	}
289		289
290	sub set_visibility {	290	sub set_visibility {
291	my ($self, $visible) = @_;	291	my ($self, $visible) = @_;
…		…
314	}	314	}
315		315
316	sub move_abs {	316	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
318		318
319	$self->{x} = List::Util::max 0, int $x;	319	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	320	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
322		322
323	$self->update;	323	$self->update;
324	}	324	}
325		325
…		…
333	}	333	}
334		334
335	sub size_request {	335	sub size_request {
336	require Carp;	336	require Carp;
337	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
		338	}
		339
		340	sub baseline_shift {
		341	0
338	}	342	}
339		343
340	sub configure {	344	sub configure {
341	my ($self, $x, $y, $w, $h) = @_;	345	my ($self, $x, $y, $w, $h) = @_;
342		346
…		…
366		370
367	$self->{root}{size_alloc}{$self+0} = $self;	371	$self->{root}{size_alloc}{$self+0} = $self;
368	}	372	}
369	}	373	}
370		374
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	375	sub children {
376	# nop	376	# nop
377	}	377	}
378		378
379	sub visible_children {	379	sub visible_children {
…		…
399		399
400	$self->{tooltip} = $tooltip;	400	$self->{tooltip} = $tooltip;
401		401
402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	402	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403	delete $CFClient::UI::TOOLTIP->{owner};	403	delete $CFClient::UI::TOOLTIP->{owner};
404	CFClient::UI::check_tooltip;	404	$CFClient::UI::TOOLTIP_WATCHER->cb->();
405	}	405	}
406	}	406	}
407		407
408	# translate global coordinates to local coordinate system	408	# translate global coordinates to local coordinate system
409	sub coord2local {	409	sub coord2local {
…		…
417	my ($self, $x, $y) = @_;	417	my ($self, $x, $y) = @_;
418		418
419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420	}	420	}
421		421
422	sub focus_in {	422	sub invoke_focus_in {
423	my ($self) = @_;	423	my ($self) = @_;
424		424
425	return if $FOCUS == $self;	425	return if $FOCUS == $self;
426	return unless $self->{can_focus};	426	return unless $self->{can_focus};
427		427
428	my $focus = $FOCUS; $FOCUS = $self;	428	$FOCUS = $self;
429		429
430	$self->_emit (focus_in => $focus);	430	$self->update;
431		431
432	$focus->update if $focus;	432	0
433	$FOCUS->update;
434	}	433	}
435		434
436	sub focus_out {	435	sub invoke_focus_out {
437	my ($self) = @_;	436	my ($self) = @_;
438		437
439	return unless $FOCUS == $self;	438	return unless $FOCUS == $self;
440		439
441	my $focus = $FOCUS; undef $FOCUS;	440	undef $FOCUS;
442		441
443	$self->_emit (focus_out => $focus);	442	$self->update;
444		443
445	$focus->update if $focus; #?
446
447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	444	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448	unless $FOCUS;	445	unless $FOCUS;
449	}
450		446
		447	0
		448	}
		449
		450	sub grab_focus {
		451	my ($self) = @_;
		452
		453	$FOCUS->emit ("focus_out") if $FOCUS;
		454	$self->emit ("focus_in");
		455	}
		456
451	sub mouse_motion { 0 }	457	sub invoke_mouse_motion { 1 }
452	sub button_up { 0 }	458	sub invoke_button_up { 1 }
453	sub key_down { 0 }	459	sub invoke_key_down { 1 }
454	sub key_up { 0 }	460	sub invoke_key_up { 1 }
455		461
456	sub button_down {	462	sub invoke_button_down {
457	my ($self, $ev, $x, $y) = @_;	463	my ($self, $ev, $x, $y) = @_;
458		464
459	$self->focus_in;	465	$self->grab_focus;
460		466
461	0	467	1
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	#d##TODO# stop propagating at first true, do not use sum
		480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462	}	483	}
463		484
464	sub find_widget {	485	sub find_widget {
465	my ($self, $x, $y) = @_;	486	my ($self, $x, $y) = @_;
466		487
…		…
476	sub set_parent {	497	sub set_parent {
477	my ($self, $parent) = @_;	498	my ($self, $parent) = @_;
478		499
479	Scalar::Util::weaken ($self->{parent} = $parent);	500	Scalar::Util::weaken ($self->{parent} = $parent);
480	$self->set_visible if $parent->{visible};	501	$self->set_visible if $parent->{visible};
481	}
482
483	sub connect {
484	my ($self, $signal, $cb) = @_;
485
486	push @{ $self->{signal_cb}{$signal} }, $cb;
487	}
488
489	sub _emit {
490	my ($self, $signal, @args) = @_;
491
492	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493	}
494
495	sub emit {
496	my ($self, $signal, @args) = @_;
497
498	$self->_emit ($signal, @args)
499	|| $self->$signal (@args);
500	}
501
502	sub visibility_change {
503	#my ($self, $visible) = @_;
504	}	502	}
505		503
506	sub realloc {	504	sub realloc {
507	my ($self) = @_;	505	my ($self) = @_;
508		506
…		…
541	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
542		540
543	# update screen rectangle	541	# update screen rectangle
544	local $draw_x = $draw_x + $self->{x};	542	local $draw_x = $draw_x + $self->{x};
545	local $draw_y = $draw_y + $self->{y};	543	local $draw_y = $draw_y + $self->{y};
546	local $draw_w = $draw_x + $self->{w};
547	local $draw_h = $draw_y + $self->{h};
548		544
549	# skip widgets that are entirely outside the drawing area	545	# skip widgets that are entirely outside the drawing area
550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	546	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	547	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552		548
…		…
592		588
593	sub DESTROY {	589	sub DESTROY {
594	my ($self) = @_;	590	my ($self) = @_;
595		591
596	delete $WIDGET{$self+0};	592	delete $WIDGET{$self+0};
597	#$self->deactivate;	593
		594	eval { $self->destroy };
		595	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598	}	596	}
599		597
600	#############################################################################	598	#############################################################################
601		599
602	package CFClient::UI::DrawBG;	600	package CFClient::UI::DrawBG;
…		…
767	}	765	}
768		766
769	sub add {	767	sub add {
770	my ($self, $child) = @_;	768	my ($self, $child) = @_;
771		769
772	$self->{children} = [];	770	$self->SUPER::remove ($_) for @{ $self->{children} };
773
774	$self->SUPER::add ($child);	771	$self->SUPER::add ($child);
775	}	772	}
776		773
777	sub remove {	774	sub remove {
778	my ($self, $widget) = @_;	775	my ($self, $widget) = @_;
…		…
787		784
788	sub size_request {	785	sub size_request {
789	$_[0]{children}[0]->size_request	786	$_[0]{children}[0]->size_request
790	}	787	}
791		788
792	sub size_allocate {	789	sub invoke_size_allocate {
793	my ($self, $w, $h) = @_;	790	my ($self, $w, $h) = @_;
794		791
795	$self->{children}[0]->configure (0, 0, $w, $h);	792	$self->{children}[0]->configure (0, 0, $w, $h);
		793
		794	1
796	}	795	}
797		796
798	#############################################################################	797	#############################################################################
799		798
800	# back-buffered drawing area	799	# back-buffered drawing area
…		…
816		815
817	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
818	$self->SUPER::update;	817	$self->SUPER::update;
819	}	818	}
820		819
821	sub size_allocate {	820	sub invoke_size_allocate {
822	my ($self, $w, $h) = @_;	821	my ($self, $w, $h) = @_;
823		822
824	$self->SUPER::size_allocate ($w, $h);
825	$self->update;	823	$self->update;
		824
		825	$self->SUPER::invoke_size_allocate ($w, $h)
826	}	826	}
827		827
828	sub _render {	828	sub _render {
829	my ($self) = @_;	829	my ($self) = @_;
830		830
…		…
891	$h = 10 if $self->{scroll_y};	891	$h = 10 if $self->{scroll_y};
892		892
893	($w, $h)	893	($w, $h)
894	}	894	}
895		895
896	sub size_allocate {	896	sub invoke_size_allocate {
897	my ($self, $w, $h) = @_;	897	my ($self, $w, $h) = @_;
898		898
899	my $child = $self->child;	899	my $child = $self->child;
900		900
901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	901	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	902	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903		903
904	$self->child->configure (0, 0, $w, $h);	904	$self->child->configure (0, 0, $w, $h);
905	$self->update;	905	$self->update;
		906
		907	1
906	}	908	}
907		909
908	sub set_offset {	910	sub set_offset {
909	my ($self, $x, $y) = @_;	911	my ($self, $x, $y) = @_;
910		912
…		…
984	$self->add ($child) if $child;	986	$self->add ($child) if $child;
985		987
986	$self	988	$self
987	}	989	}
988		990
		991	#TODO# update range on size_allocate depending on child
		992
989	sub add {	993	sub add {
990	my ($self, $widget) = @_;	994	my ($self, $widget) = @_;
991		995
992	$self->{vp}->add ($self->{child} = $widget);	996	$self->{vp}->add ($self->{child} = $widget);
993	}	997	}
994		998
		999	sub update_slider {
		1000	my ($self) = @_;
		1001
		1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1003	}
		1004
995	sub update {	1005	sub update {
996	my ($self) = @_;	1006	my ($self) = @_;
997		1007
998	$self->SUPER::update;	1008	$self->SUPER::update;
999		1009
1000	# todo: overwrite size_allocate of child	1010	$self->update_slider;
1001	my $child = $self->{vp}->child;
1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003	}	1011	}
1004		1012
1005	sub size_allocate {	1013	sub invoke_size_allocate {
1006	my ($self, $w, $h) = @_;	1014	my ($self, $w, $h) = @_;
1007		1015
		1016	$self->update_slider;
		1017
1008	$self->SUPER::size_allocate ($w, $h);	1018	$self->SUPER::invoke_size_allocate ($w, $h)
1009
1010	my $child = $self->{vp}->child;
1011	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012	}	1019	}
1013
1014	#TODO# update range on size_allocate depending on child
1015	# update viewport offset on scroll
1016		1020
1017	#############################################################################	1021	#############################################################################
1018		1022
1019	package CFClient::UI::Frame;	1023	package CFClient::UI::Frame;
1020		1024
…		…
1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1074	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072		1076
1073	sub new {	1077	sub new {
1074	my ($class, %arg) = @_;	1078	my ($class, %arg) = @_;
1075
1076	my $title = delete $arg{title};
1077		1079
1078	my $self = $class->SUPER::new (	1080	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1081	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1082	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1083	border => 0.6,
…		…
1083	min_w => 16,	1085	min_w => 16,
1084	min_h => 16,	1086	min_h => 16,
1085	%arg,	1087	%arg,
1086	);	1088	);
1087		1089
1088	$self->{title} = new CFClient::UI::Label	1090	$self->{title_widget} = new CFClient::UI::Label
1089	align => 0,	1091	align => 0,
1090	valign => 1,	1092	valign => 1,
1091	text => $title,	1093	text => $self->{title},
1092	fontsize => $self->{border}	1094	fontsize => $self->{border},
1093	if defined $title;	1095	if exists $self->{title};
		1096
		1097	if ($self->{has_close_button}) {
		1098	$self->{close_button} =
		1099	new CFClient::UI::ImageButton
		1100	path => 'x1_close.png',
		1101	on_activate => sub { $self->emit ("delete") };
		1102
		1103	$self->CFClient::UI::Container::add ($self->{close_button});
		1104	}
1094		1105
1095	$self	1106	$self
1096	}	1107	}
1097		1108
1098	sub add {	1109	sub add {
1099	my ($self, @widgets) = @_;	1110	my ($self, @widgets) = @_;
1100		1111
1101	$self->SUPER::add (@widgets);	1112	$self->SUPER::add (@widgets);
		1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103	}	1115	}
1104		1116
1105	sub border {	1117	sub border {
1106	int $_[0]{border} * $::FONTSIZE	1118	int $_[0]{border} * $::FONTSIZE
1107	}	1119	}
1108		1120
1109	sub size_request {	1121	sub size_request {
1110	my ($self) = @_;	1122	my ($self) = @_;
1111		1123
1112	$self->{title}->size_request	1124	$self->{title_widget}->size_request
1113	if $self->{title};	1125	if $self->{title_widget};
		1126
		1127	$self->{close_button}->size_request
		1128	if $self->{close_button};
1114		1129
1115	my ($w, $h) = $self->SUPER::size_request;	1130	my ($w, $h) = $self->SUPER::size_request;
1116		1131
1117	(	1132	(
1118	$w + $self->border * 2,	1133	$w + $self->border * 2,
1119	$h + $self->border * 2,	1134	$h + $self->border * 2,
1120	)	1135	)
1121	}	1136	}
1122		1137
1123	sub size_allocate {	1138	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1125		1140
1126	if ($self->{title}) {	1141	if ($self->{title_widget}) {
1127	$self->{title}{w} = $w;	1142	$self->{title_widget}{w} = $w;
1128	$self->{title}{h} = $h;	1143	$self->{title_widget}{h} = $h;
1129	$self->{title}->size_allocate ($w, $h);	1144	$self->{title_widget}->invoke_size_allocate ($w, $h);
1130	}	1145	}
1131		1146
1132	my $border = $self->border;	1147	my $border = $self->border;
1133		1148
1134	$h -= List::Util::max 0, $border * 2;	1149	$h -= List::Util::max 0, $border * 2;
1135	$w -= List::Util::max 0, $border * 2;	1150	$w -= List::Util::max 0, $border * 2;
		1151
		1152	$self->child->configure ($border, $border, $w, $h);
		1153
		1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1155	if $self->{close_button};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_delete {
		1161	my ($self) = @_;
		1162
		1163	$self->hide;
1136		1164
1137	$self->child->configure ($border, $border, $w, $h);	1165	1
1138	}	1166	}
1139		1167
1140	sub button_down {	1168	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1142		1170
1143	my ($w, $h) = @$self{qw(w h)};	1171	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1172	my $border = $self->border;
1145		1173
…		…
1176		1204
1177	($x, $y) = ($ev->{x}, $ev->{y});	1205	($x, $y) = ($ev->{x}, $ev->{y});
1178		1206
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1207	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1208	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1209	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1210	};
1183	} else {	1211	} else {
1184	return 0;	1212	return 0;
1185	}	1213	}
1186		1214
1187	1	1215	1
1188	}	1216	}
1189		1217
1190	sub button_up {	1218	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1219	my ($self, $ev, $x, $y) = @_;
1192		1220
1193	!!delete $self->{motion}	1221	! ! delete $self->{motion}
1194	}	1222	}
1195		1223
1196	sub mouse_motion {	1224	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1225	my ($self, $ev, $x, $y) = @_;
1198		1226
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1227	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1228
1201	!!$self->{motion}	1229	! ! $self->{motion}
1202	}	1230	}
1203		1231
1204	sub _draw {	1232	sub _draw {
1205	my ($self) = @_;	1233	my ($self) = @_;
1206		1234
…		…
1232		1260
1233	glDisable GL_TEXTURE_2D;	1261	glDisable GL_TEXTURE_2D;
1234		1262
1235	$child->draw;	1263	$child->draw;
1236		1264
1237	if ($self->{title}) {	1265	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1266	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1267	$self->{title_widget}->_draw;
		1268
		1269	glTranslate 0, - ($border - $self->{h});
1240	}	1270	}
		1271
		1272	$self->{close_button}->draw
		1273	if $self->{close_button};
1241	}	1274	}
1242		1275
1243	#############################################################################	1276	#############################################################################
1244		1277
1245	package CFClient::UI::Table;	1278	package CFClient::UI::Table;
…		…
1268		1301
1269	$child->set_parent ($self);	1302	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1303	$self->{children}[$y][$x] = $child;
1271		1304
1272	$self->realloc;	1305	$self->realloc;
		1306	}
		1307
		1308	sub remove {
		1309	my ($self, $child) = @_;
		1310
		1311	# TODO: not yet implemented
1273	}	1312	}
1274		1313
1275	# TODO: move to container class maybe? send children a signal on removal?	1314	# TODO: move to container class maybe? send children a signal on removal?
1276	sub clear {	1315	sub clear {
1277	my ($self) = @_;	1316	my ($self) = @_;
…		…
1318	(sum @$ws),	1357	(sum @$ws),
1319	(sum @$hs),	1358	(sum @$hs),
1320	)	1359	)
1321	}	1360	}
1322		1361
1323	sub size_allocate {	1362	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1363	my ($self, $w, $h) = @_;
1325		1364
1326	my ($ws, $hs) = $self->get_wh;	1365	my ($ws, $hs) = $self->get_wh;
1327		1366
1328	my $req_w = (sum @$ws) || 1;	1367	my $req_w = (sum @$ws) || 1;
…		…
1360	}	1399	}
1361		1400
1362	$y += $row_h;	1401	$y += $row_h;
1363	}	1402	}
1364		1403
		1404	1
1365	}	1405	}
1366		1406
1367	sub find_widget {	1407	sub find_widget {
1368	my ($self, $x, $y) = @_;	1408	my ($self, $x, $y) = @_;
1369		1409
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1446	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1447	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1448	)
1409	}	1449	}
1410		1450
1411	sub size_allocate {	1451	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1452	my ($self, $w, $h) = @_;
1413		1453
1414	my $space = $self->{vertical} ? $h : $w;	1454	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1455	my @children = $self->visible_children;
1416		1456
1417	my @req;	1457	my @req;
1418		1458
1419	if ($self->{homogeneous}) {	1459	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1460	@req = ($space / (@children || 1)) x @children;
1421	} else {	1461	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1462	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1463	my $req = List::Util::sum @req;
1424		1464
1425	if ($req > $space) {	1465	if ($req > $space) {
1426	# ah well, not enough space	1466	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1467	$_ *= $space / $req for @req;
1428	} else {	1468	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1469	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1470
1431	$space = ($space - $req) / $expand; # remaining space to give away	1471	$space = ($space - $req) / $expand; # remaining space to give away
1432		1472
1433	$req[$_] += $space * $children->[$_]{expand}	1473	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1474	for 0 .. $#children;
1435	}	1475	}
1436	}	1476	}
1437		1477
1438	CFClient::UI::harmonize \@req;	1478	CFClient::UI::harmonize \@req;
1439		1479
1440	my $pos = 0;	1480	my $pos = 0;
1441	for (0 .. $#$children) {	1481	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1482	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1484
1445	$pos += $alloc;	1485	$pos += $alloc;
1446	}	1486	}
1447		1487
1448	1	1488	1
…		…
1542		1582
1543	sub realloc {	1583	sub realloc {
1544	my ($self) = @_;	1584	my ($self) = @_;
1545		1585
1546	delete $self->{ox};	1586	delete $self->{ox};
1547	delete $self->{req_h};
1548	$self->SUPER::realloc;	1587	$self->SUPER::realloc;
1549	}	1588	}
1550		1589
1551	sub set_text {	1590	sub set_text {
1552	my ($self, $text) = @_;	1591	my ($self, $text) = @_;
…		…
1555	$self->{text} = "T$text";	1594	$self->{text} = "T$text";
1556		1595
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1597	$self->{layout}->set_text ($text);
1559		1598
		1599	delete $self->{size_req};
1560	$self->realloc;	1600	$self->realloc;
1561	$self->update;	1601	$self->update;
1562	}	1602	}
1563		1603
1564	sub set_markup {	1604	sub set_markup {
…		…
1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571		1611
1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1612	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573	$self->{layout}->set_markup ($markup);	1613	$self->{layout}->set_markup ($markup);
1574		1614
		1615	delete $self->{size_req};
1575	$self->realloc;	1616	$self->realloc;
1576	$self->update;	1617	$self->update;
1577	}	1618	}
1578		1619
1579	sub size_request {	1620	sub size_request {
1580	my ($self) = @_;	1621	my ($self) = @_;
1581		1622
1582	if (exists $self->{req_h}) {	1623	$self->{size_req} ||= do {
1583	@$self{qw(req_w req_h)}
1584	} else {
1585	$self->{layout}->set_font ($self->{font}) if $self->{font};	1624	$self->{layout}->set_font ($self->{font}) if $self->{font};
1586	$self->{layout}->set_width ($self->{max_w} || -1);	1625	$self->{layout}->set_width ($self->{max_w} || -1);
1587	$self->{layout}->set_ellipsise ($self->{ellipsise});	1626	$self->{layout}->set_ellipsise ($self->{ellipsise});
1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1627	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1628	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1598		1637
1599	$w = List::Util::max $w, $w2;	1638	$w = List::Util::max $w, $w2;
1600	$h = List::Util::max $h, $h2;	1639	$h = List::Util::max $h, $h2;
1601	}	1640	}
1602		1641
1603	($w, $h)	1642	[$w, $h]
1604	}	1643	};
1605	}
1606		1644
		1645	@{ $self->{size_req} }
		1646	}
		1647
		1648	sub baseline_shift {
		1649	$_[0]{layout}->descent
		1650	}
		1651
1607	sub size_allocate {	1652	sub invoke_size_allocate {
1608	my ($self, $w, $h) = @_;	1653	my ($self, $w, $h) = @_;
1609		1654
1610	delete $self->{ox};	1655	delete $self->{ox};
1611		1656
1612	delete $self->{texture}	1657	delete $self->{texture}
1613	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1658	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1659
		1660	1
1614	}	1661	}
1615		1662
1616	sub set_fontsize {	1663	sub set_fontsize {
1617	my ($self, $fontsize) = @_;	1664	my ($self, $fontsize) = @_;
1618		1665
1619	$self->{fontsize} = $fontsize;	1666	$self->{fontsize} = $fontsize;
		1667	delete $self->{size_req};
1620	delete $self->{texture};	1668	delete $self->{texture};
1621		1669
1622	$self->realloc;	1670	$self->realloc;
		1671	}
		1672
		1673	sub reconfigure {
		1674	my ($self) = @_;
		1675
		1676	delete $self->{size_req};
		1677
		1678	$self->SUPER::reconfigure;
1623	}	1679	}
1624		1680
1625	sub _draw {	1681	sub _draw {
1626	my ($self) = @_;	1682	my ($self) = @_;
1627		1683
…		…
1647	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1648	: ($self->{h} - $tex->{h}) * 0.5);	1704	: ($self->{h} - $tex->{h}) * 0.5);
1649	};	1705	};
1650		1706
1651	glEnable GL_TEXTURE_2D;	1707	glEnable GL_TEXTURE_2D;
		1708
		1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1711
		1712	if ($tex->{format} == GL_ALPHA) {
		1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1714	glColor @{$self->{fg}};
		1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
		1716	} else {
1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654	glColor_premultiply @{$self->{fg}}
1655	if $tex->{format} == GL_ALPHA;
1656
1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
		1719	}
1658		1720
1659	glDisable GL_TEXTURE_2D;	1721	glDisable GL_TEXTURE_2D;
1660	}	1722	}
1661		1723
1662	#############################################################################	1724	#############################################################################
…		…
1678	can_hover => 1,	1740	can_hover => 1,
1679	can_focus => 1,	1741	can_focus => 1,
1680	valign => 0,	1742	valign => 0,
1681	can_events => 1,	1743	can_events => 1,
1682	#text => ...	1744	#text => ...
		1745	#hidden => "*",
1683	@_	1746	@_
1684	)	1747	)
1685	}	1748	}
1686		1749
1687	sub _set_text {	1750	sub _set_text {
…		…
1694	$self->{last_activity} = $::NOW;	1757	$self->{last_activity} = $::NOW;
1695	$self->{text} = $text;	1758	$self->{text} = $text;
1696		1759
1697	$text =~ s/./*/g if $self->{hidden};	1760	$text =~ s/./*/g if $self->{hidden};
1698	$self->{layout}->set_text ("$text ");	1761	$self->{layout}->set_text ("$text ");
		1762	delete $self->{size_req};
1699		1763
1700	$self->_emit (changed => $self->{text});	1764	$self->emit (changed => $self->{text});
		1765
		1766	$self->realloc;
1701	$self->update;	1767	$self->update;
1702	}	1768	}
1703		1769
1704	sub set_text {	1770	sub set_text {
1705	my ($self, $text) = @_;	1771	my ($self, $text) = @_;
1706		1772
1707	$self->{cursor} = length $text;	1773	$self->{cursor} = length $text;
1708	$self->_set_text ($text);	1774	$self->_set_text ($text);
1709
1710	$self->realloc;
1711	}	1775	}
1712		1776
1713	sub get_text {	1777	sub get_text {
1714	$_[0]{text}	1778	$_[0]{text}
1715	}	1779	}
…		…
1720	my ($w, $h) = $self->SUPER::size_request;	1784	my ($w, $h) = $self->SUPER::size_request;
1721		1785
1722	($w + 1, $h) # add 1 for cursor	1786	($w + 1, $h) # add 1 for cursor
1723	}	1787	}
1724		1788
1725	sub key_down {	1789	sub invoke_key_down {
1726	my ($self, $ev) = @_;	1790	my ($self, $ev) = @_;
1727		1791
1728	my $mod = $ev->{mod};	1792	my $mod = $ev->{mod};
1729	my $sym = $ev->{sym};	1793	my $sym = $ev->{sym};
1730	my $uni = $ev->{unicode};	1794	my $uni = $ev->{unicode};
…		…
1742	} elsif ($sym == CFClient::SDLK_HOME) {	1806	} elsif ($sym == CFClient::SDLK_HOME) {
1743	$self->{cursor} = 0;	1807	$self->{cursor} = 0;
1744	} elsif ($sym == CFClient::SDLK_END) {	1808	} elsif ($sym == CFClient::SDLK_END) {
1745	$self->{cursor} = length $text;	1809	$self->{cursor} = length $text;
1746	} elsif ($uni == 27) {	1810	} elsif ($uni == 27) {
1747	$self->_emit ('escape');	1811	$self->emit ('escape');
1748	} elsif ($uni) {	1812	} elsif ($uni) {
1749	substr $text, $self->{cursor}++, 0, chr $uni;	1813	substr $text, $self->{cursor}++, 0, chr $uni;
1750	} else {	1814	} else {
1751	return 0;	1815	return 0;
1752	}	1816	}
…		…
1756	$self->realloc;	1820	$self->realloc;
1757		1821
1758	1	1822	1
1759	}	1823	}
1760		1824
1761	sub focus_in {	1825	sub invoke_focus_in {
1762	my ($self) = @_;	1826	my ($self) = @_;
1763		1827
1764	$self->{last_activity} = $::NOW;	1828	$self->{last_activity} = $::NOW;
1765		1829
1766	$self->SUPER::focus_in;	1830	$self->SUPER::invoke_focus_in
1767	}	1831	}
1768		1832
1769	sub button_down {	1833	sub invoke_button_down {
1770	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1771		1835
1772	$self->SUPER::button_down ($ev, $x, $y);	1836	$self->SUPER::invoke_button_down ($ev, $x, $y);
1773		1837
1774	my $idx = $self->{layout}->xy_to_index ($x, $y);	1838	my $idx = $self->{layout}->xy_to_index ($x, $y);
1775		1839
1776	# byte-index to char-index	1840	# byte-index to char-index
1777	my $text = $self->{text};	1841	my $text = $self->{text};
…		…
1782	$self->update;	1846	$self->update;
1783		1847
1784	1	1848	1
1785	}	1849	}
1786		1850
1787	sub mouse_motion {	1851	sub invoke_mouse_motion {
1788	my ($self, $ev, $x, $y) = @_;	1852	my ($self, $ev, $x, $y) = @_;
1789	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1853	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790		1854
1791	0	1855	1
1792	}	1856	}
1793		1857
1794	sub _draw {	1858	sub _draw {
1795	my ($self) = @_;	1859	my ($self) = @_;
1796		1860
…		…
1837		1901
1838	our @ISA = CFClient::UI::EntryBase::;	1902	our @ISA = CFClient::UI::EntryBase::;
1839		1903
1840	use CFClient::OpenGL;	1904	use CFClient::OpenGL;
1841		1905
1842	sub key_down {	1906	sub invoke_key_down {
1843	my ($self, $ev) = @_;	1907	my ($self, $ev) = @_;
1844		1908
1845	my $sym = $ev->{sym};	1909	my $sym = $ev->{sym};
1846		1910
1847	if ($sym == 13) {	1911	if ($sym == 13) {
1848	unshift @{$self->{history}},	1912	unshift @{$self->{history}},
1849	my $txt = $self->get_text;	1913	my $txt = $self->get_text;
		1914
1850	$self->{history_pointer} = -1;	1915	$self->{history_pointer} = -1;
1851	$self->{history_saveback} = '';	1916	$self->{history_saveback} = '';
1852	$self->_emit (activate => $txt);	1917	$self->emit (activate => $txt);
1853	$self->update;	1918	$self->update;
1854		1919
1855	} elsif ($sym == CFClient::SDLK_UP) {	1920	} elsif ($sym == CFClient::SDLK_UP) {
1856	if ($self->{history_pointer} < 0) {	1921	if ($self->{history_pointer} < 0) {
1857	$self->{history_saveback} = $self->get_text;	1922	$self->{history_saveback} = $self->get_text;
…		…
1873	} else {	1938	} else {
1874	$self->set_text ($self->{history_saveback});	1939	$self->set_text ($self->{history_saveback});
1875	}	1940	}
1876		1941
1877	} else {	1942	} else {
1878	return $self->SUPER::key_down ($ev)	1943	return $self->SUPER::invoke_key_down ($ev)
1879	}	1944	}
1880		1945
1881	1	1946	1
1882	}	1947	}
1883		1948
…		…
1907	can_events => 1,	1972	can_events => 1,
1908	@_	1973	@_
1909	)	1974	)
1910	}	1975	}
1911		1976
1912	sub activate { }
1913
1914	sub button_up {	1977	sub invoke_button_up {
1915	my ($self, $ev, $x, $y) = @_;	1978	my ($self, $ev, $x, $y) = @_;
1916		1979
1917	$self->emit ("activate")	1980	$self->emit ("activate")
1918	if $x >= 0 && $x < $self->{w}	1981	if $x >= 0 && $x < $self->{w}
1919	&& $y >= 0 && $y < $self->{h};	1982	&& $y >= 0 && $y < $self->{h};
…		…
1933	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934		1997
1935	glDisable GL_TEXTURE_2D;	1998	glDisable GL_TEXTURE_2D;
1936		1999
1937	$self->SUPER::_draw;	2000	$self->SUPER::_draw;
		2001	}
		2002
		2003	#############################################################################
		2004
		2005	package CFClient::UI::ImageButton;
		2006
		2007	our @ISA = CFClient::UI::Image::;
		2008
		2009	use CFClient::OpenGL;
		2010
		2011	my %textures;
		2012
		2013	sub new {
		2014	my $class = shift;
		2015
		2016	my $self = $class->SUPER::new (
		2017	padding_x => 4,
		2018	padding_y => 4,
		2019	fg => [1, 1, 1],
		2020	active_fg => [0, 0, 1],
		2021	can_hover => 1,
		2022	align => 0,
		2023	valign => 0,
		2024	can_events => 1,
		2025	@_
		2026	);
		2027	}
		2028
		2029	sub invoke_button_up {
		2030	my ($self, $ev, $x, $y) = @_;
		2031
		2032	$self->emit ("activate")
		2033	if $x >= 0 && $x < $self->{w}
		2034	&& $y >= 0 && $y < $self->{h};
		2035
		2036	1
1938	}	2037	}
1939		2038
1940	#############################################################################	2039	#############################################################################
1941		2040
1942	package CFClient::UI::CheckBox;	2041	package CFClient::UI::CheckBox;
…		…
1969	my ($self) = @_;	2068	my ($self) = @_;
1970		2069
1971	(6) x 2	2070	(6) x 2
1972	}	2071	}
1973		2072
		2073	sub toggle {
		2074	my ($self) = @_;
		2075
		2076	$self->{state} = !$self->{state};
		2077	$self->emit (changed => $self->{state});
		2078	$self->update;
		2079	}
		2080
1974	sub button_down {	2081	sub invoke_button_down {
1975	my ($self, $ev, $x, $y) = @_;	2082	my ($self, $ev, $x, $y) = @_;
1976		2083
1977	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979	$self->{state} = !$self->{state};	2086	$self->toggle;
1980	$self->_emit (changed => $self->{state});
1981	} else {	2087	} else {
1982	return 0	2088	return 0
1983	}	2089	}
1984		2090
1985	1	2091	1
…		…
2010	package CFClient::UI::Image;	2116	package CFClient::UI::Image;
2011		2117
2012	our @ISA = CFClient::UI::Base::;	2118	our @ISA = CFClient::UI::Base::;
2013		2119
2014	use CFClient::OpenGL;	2120	use CFClient::OpenGL;
2015	use Carp qw/confess/;
2016		2121
2017	our %loaded_images;	2122	our %texture_cache;
2018		2123
2019	sub new {	2124	sub new {
2020	my $class = shift;	2125	my $class = shift;
2021		2126
2022	my $self = $class->SUPER::new (can_events => 0, @_);	2127	my $self = $class->SUPER::new (
		2128	can_events => 0,
		2129	@_,
		2130	);
2023		2131
2024	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2132	$self->{path}
		2133	or Carp::croak "required attribute 'path' not set";
2025		2134
2026	$loaded_images{$self->{image}} ||=	2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2027	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2136	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2028		2137
2029	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2030		2139
2031	Scalar::Util::weaken $loaded_images{$self->{image}};	2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033	$self->{aspect} = $tex->{w} / $tex->{h};
2034		2141
2035	$self	2142	$self
2036	}	2143	}
2037		2144
2038	sub size_request {	2145	sub size_request {
2039	my ($self) = @_;	2146	my ($self) = @_;
2040		2147
2041	($self->{tex}->{w}, $self->{tex}->{h})	2148	($self->{tex}{w}, $self->{tex}{h})
2042	}	2149	}
2043		2150
2044	sub _draw {	2151	sub _draw {
2045	my ($self) = @_;	2152	my ($self) = @_;
2046		2153
…		…
2155	my $ycut1 = max 0, min 1, $ycut;	2262	my $ycut1 = max 0, min 1, $ycut;
2156	my $ycut2 = max 0, min 1, $ycut - 1;	2263	my $ycut2 = max 0, min 1, $ycut - 1;
2157		2264
2158	my $h1 = $self->{h} * (1 - $ycut1);	2265	my $h1 = $self->{h} * (1 - $ycut1);
2159	my $h2 = $self->{h} * (1 - $ycut2);	2266	my $h2 = $self->{h} * (1 - $ycut2);
		2267	my $h3 = $self->{h};
		2268
		2269	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160		2270
2161	glEnable GL_BLEND;	2271	glEnable GL_BLEND;
2162	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2272	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2273	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164	glEnable GL_TEXTURE_2D;	2274	glEnable GL_TEXTURE_2D;
…		…
2183		2293
2184	if ($t3) {	2294	if ($t3) {
2185	glBindTexture GL_TEXTURE_2D, $t3->{name};	2295	glBindTexture GL_TEXTURE_2D, $t3->{name};
2186	glBegin GL_QUADS;	2296	glBegin GL_QUADS;
2187	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2297	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2298	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2299	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2300	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191	glEnd;	2301	glEnd;
2192	}	2302	}
2193		2303
2194	glDisable GL_BLEND;	2304	glDisable GL_BLEND;
…		…
2282	$self->update;	2392	$self->update;
2283		2393
2284	$self	2394	$self
2285	}	2395	}
2286		2396
2287	sub changed { }
2288
2289	sub set_range {	2397	sub set_range {
2290	my ($self, $range) = @_;	2398	my ($self, $range) = @_;
2291		2399
2292	($range, $self->{range}) = ($self->{range}, $range);	2400	($range, $self->{range}) = ($self->{range}, $range);
2293		2401
2294	$self->update
2295	if "@$range" ne "@{$self->{range}}";	2402	if ("@$range" ne "@{$self->{range}}") {
		2403	$self->update;
		2404	$self->set_value ($self->{range}[0]);
		2405	}
2296	}	2406	}
2297		2407
2298	sub set_value {	2408	sub set_value {
2299	my ($self, $value) = @_;	2409	my ($self, $value) = @_;
2300		2410
…		…
2311	if $unit;	2421	if $unit;
2312		2422
2313	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2423	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314		2424
2315	if ($value != $old_value) {	2425	if ($value != $old_value) {
2316	$self->_emit (changed => $value);	2426	$self->emit (changed => $value);
2317	$self->update;	2427	$self->update;
2318	}	2428	}
2319	}	2429	}
2320		2430
2321	sub size_request {	2431	sub size_request {
2322	my ($self) = @_;	2432	my ($self) = @_;
2323		2433
2324	($self->{req_w}, $self->{req_h})	2434	($self->{req_w}, $self->{req_h})
2325	}	2435	}
2326		2436
2327	sub button_down {	2437	sub invoke_button_down {
2328	my ($self, $ev, $x, $y) = @_;	2438	my ($self, $ev, $x, $y) = @_;
2329		2439
2330	$self->SUPER::button_down ($ev, $x, $y);	2440	$self->SUPER::invoke_button_down ($ev, $x, $y);
2331		2441
2332	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2442	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333		2443
2334	$self->mouse_motion ($ev, $x, $y)	2444	$self->invoke_mouse_motion ($ev, $x, $y)
2335	}	2445	}
2336		2446
2337	sub mouse_motion {	2447	sub invoke_mouse_motion {
2338	my ($self, $ev, $x, $y) = @_;	2448	my ($self, $ev, $x, $y) = @_;
2339		2449
2340	if ($GRAB == $self) {	2450	if ($GRAB == $self) {
2341	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2451	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342		2452
…		…
2447	sub set_range { shift->{slider}->set_range (@_) }	2557	sub set_range { shift->{slider}->set_range (@_) }
2448	sub set_value { shift->{slider}->set_value (@_) }	2558	sub set_value { shift->{slider}->set_value (@_) }
2449		2559
2450	#############################################################################	2560	#############################################################################
2451		2561
2452	package CFClient::UI::TextView;	2562	package CFClient::UI::TextScroller;
2453		2563
2454	our @ISA = CFClient::UI::HBox::;	2564	our @ISA = CFClient::UI::HBox::;
2455		2565
2456	use CFClient::OpenGL;	2566	use CFClient::OpenGL;
2457		2567
…		…
2459	my $class = shift;	2569	my $class = shift;
2460		2570
2461	my $self = $class->SUPER::new (	2571	my $self = $class->SUPER::new (
2462	fontsize => 1,	2572	fontsize => 1,
2463	can_events => 0,	2573	can_events => 0,
		2574	indent => 0,
2464	#font => default_font	2575	#font => default_font
2465	@_,	2576	@_,
2466		2577
2467	layout => (new CFClient::Layout 1),	2578	layout => (new CFClient::Layout 1),
2468	par => [],	2579	par => [],
…		…
2483		2594
2484	$self->{fontsize} = $fontsize;	2595	$self->{fontsize} = $fontsize;
2485	$self->reflow;	2596	$self->reflow;
2486	}	2597	}
2487		2598
		2599	sub size_request {
		2600	my ($self) = @_;
		2601
		2602	my ($empty, $slider) = @{ $self->{children} };
		2603
		2604	local $self->{children} = [$empty, $slider];
		2605	$self->SUPER::size_request
		2606	}
		2607
2488	sub size_allocate {	2608	sub invoke_size_allocate {
2489	my ($self, $w, $h) = @_;	2609	my ($self, $w, $h) = @_;
2490		2610
2491	$self->SUPER::size_allocate ($w, $h);	2611	my ($empty, $slider, @other) = @{ $self->{children} };
		2612	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492		2613
2493	$self->{layout}->set_font ($self->{font}) if $self->{font};	2614	$self->{layout}->set_font ($self->{font}) if $self->{font};
2494	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495	$self->{layout}->set_width ($self->{children}[0]{w});	2616	$self->{layout}->set_width ($empty->{w});
		2617	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496		2618
2497	$self->reflow;	2619	$self->reflow;
2498	}
2499		2620
2500	sub text_size {	2621	local $self->{children} = [$empty, $slider];
2501	my ($self, $text, $indent) = @_;	2622	$self->SUPER::invoke_size_allocate ($w, $h)
		2623	}
		2624
		2625	sub get_layout {
		2626	my ($self, $para) = @_;
2502		2627
2503	my $layout = $self->{layout};	2628	my $layout = $self->{layout};
2504		2629
		2630	$layout->set_font ($self->{font}) if $self->{font};
		2631	$layout->set_foreground (@{$para->{fg}});
2505	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2632	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506	$layout->set_width ($self->{children}[0]{w} - $indent);	2633	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2634	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507	$layout->set_markup ($text);	2635	$layout->set_markup ($para->{markup});
		2636
		2637	$layout->set_shapes (
		2638	map
		2639	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2640	@{$para->{widget}}
2508		2641	);
		2642
2509	$layout->size	2643	$layout
2510	}	2644	}
2511		2645
2512	sub reflow {	2646	sub reflow {
2513	my ($self) = @_;	2647	my ($self) = @_;
2514		2648
…		…
2523	$self->{children}[1]->set_value ($offset);	2657	$self->{children}[1]->set_value ($offset);
2524	}	2658	}
2525		2659
2526	sub clear {	2660	sub clear {
2527	my ($self) = @_;	2661	my ($self) = @_;
		2662
		2663	my (undef, undef, @other) = @{ $self->{children} };
		2664	$self->remove ($_) for @other;
2528		2665
2529	$self->{par} = [];	2666	$self->{par} = [];
2530	$self->{height} = 0;	2667	$self->{height} = 0;
2531	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532	}	2669	}
2533		2670
2534	sub add_paragraph {	2671	sub add_paragraph {
2535	my ($self, $color, $text, $indent) = @_;	2672	my ($self, $color, $para, $indent) = @_;
2536		2673
2537	for my $line (split /\n/, $text) {	2674	my ($text, @w) = ref $para ? @$para : $para;
2538	my ($w, $h) = $self->text_size ($line);	2675
2539	$self->{height} += $h;	2676	$para = {
2540	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2677	w => 1e10,
		2678	wrapped => 1,
		2679	fg => $color,
		2680	indent => $indent,
		2681	markup => $text,
		2682	widget => \@w,
2541	}	2683	};
2542		2684
2543	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2685	$self->add (@w) if @w;
		2686	push @{$self->{par}}, $para;
		2687
		2688	$self->{need_reflow}++;
		2689	$self->update;
		2690	}
		2691
		2692	sub scroll_to_bottom {
		2693	my ($self) = @_;
		2694
		2695	$self->{scroll_to_bottom} = 1;
		2696	$self->update;
2544	}	2697	}
2545		2698
2546	sub update {	2699	sub update {
2547	my ($self) = @_;	2700	my ($self) = @_;
2548		2701
…		…
2550		2703
2551	return unless $self->{h} > 0;	2704	return unless $self->{h} > 0;
2552		2705
2553	delete $self->{texture};	2706	delete $self->{texture};
2554		2707
2555	$ROOT->on_post_alloc ($self, sub {	2708	$ROOT->on_post_alloc ($self => sub {
2556	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557		2710
2558	if (delete $self->{need_reflow}) {	2711	if (delete $self->{need_reflow}) {
2559	my $height = 0;	2712	my $height = 0;
2560		2713
2561	my $layout = $self->{layout};
2562
2563	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565	for (@{$self->{par}}) {	2714	for my $para (@{$self->{par}}) {
2566	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567	$layout->set_width ($W - $_->[3]);	2716	my $layout = $self->get_layout ($para);
2568	$layout->set_markup ($_->[4]);
2569	my ($w, $h) = $layout->size;	2717	my ($w, $h) = $layout->size;
2570	$_->[0] = $w + $_->[3];	2718
2571	$_->[1] = $h;	2719	$para->{w} = $w + $para->{indent};
		2720	$para->{h} = $h;
		2721	$para->{wrapped} = $layout->has_wrapped;
2572	}	2722	}
2573		2723
2574	$height += $_->[1];	2724	$height += $para->{h};
2575	}	2725	}
2576		2726
2577	$self->{height} = $height;	2727	$self->{height} = $height;
2578		2728
2579	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2729	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580		2730
2581	delete $self->{texture};	2731	delete $self->{texture};
		2732	}
		2733
		2734	if (delete $self->{scroll_to_bottom}) {
		2735	$self->{children}[1]->set_value (1e10);
2582	}	2736	}
2583		2737
2584	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2585	glClearColor 0, 0, 0, 0;	2739	glClearColor 0, 0, 0, 0;
2586	glClear GL_COLOR_BUFFER_BIT;	2740	glClear GL_COLOR_BUFFER_BIT;
…		…
2590	my $y0 = $top;	2744	my $y0 = $top;
2591	my $y1 = $top + $H;	2745	my $y1 = $top + $H;
2592		2746
2593	my $y = 0;	2747	my $y = 0;
2594		2748
2595	my $layout = $self->{layout};
2596
2597	$layout->set_font ($self->{font}) if $self->{font};
2598
2599	glEnable GL_BLEND;	2749	glEnable GL_BLEND;
2600	#TODO# not correct in windows where rgba is forced off	2750	#TODO# not correct in windows where rgba is forced off
2601	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602		2752
2603	for my $par (@{$self->{par}}) {	2753	for my $para (@{$self->{par}}) {
2604	my $h = $par->[1];	2754	my $h = $para->{h};
2605		2755
2606	if ($y0 < $y + $h && $y < $y1) {	2756	if ($y0 < $y + $h && $y < $y1) {
2607	$layout->set_foreground (@{ $par->[2] });	2757
2608	$layout->set_width ($W - $par->[3]);	2758	my $layout = $self->get_layout ($para);
2609	$layout->set_markup ($par->[4]);
2610		2759
2611	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2612		2761
2613	glRasterPos $par->[3], $y - $y0;	2762	glRasterPos $para->{indent}, $y - $y0;
2614	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2763	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2764
		2765	if (my @w = @{ $para->{widget} }) {
		2766	my @s = $layout->get_shapes;
		2767
		2768	glDisable GL_BLEND;
		2769	for (@w) {
		2770	my ($dx, $dy) = splice @s, 0, 2, ();
		2771
		2772	$_->{x} = $dx + $para->{indent};
		2773	$_->{y} = $dy + $y - $y0;
		2774
		2775	$_->draw;
		2776	}
		2777	glEnable GL_BLEND;
		2778	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2779	}
2615	}	2780	}
2616		2781
2617	$y += $h;	2782	$y += $h;
2618	}	2783	}
2619		2784
2620	glDisable GL_BLEND;	2785	glDisable GL_BLEND;
2621	};	2786	};
2622	});	2787	});
		2788	}
		2789
		2790	sub reconfigure {
		2791	my ($self) = @_;
		2792
		2793	$self->SUPER::reconfigure;
		2794
		2795	$_->{w} = 1e10 for @{ $self->{par} };
		2796	$self->reflow;
2623	}	2797	}
2624		2798
2625	sub _draw {	2799	sub _draw {
2626	my ($self) = @_;	2800	my ($self) = @_;
2627		2801
…		…
2630	glColor 0, 0, 0, 1;	2804	glColor 0, 0, 0, 1;
2631	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2805	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2633		2807
2634	$self->{children}[1]->draw;	2808	$self->{children}[1]->draw;
2635
2636	}	2809	}
2637		2810
2638	#############################################################################	2811	#############################################################################
2639		2812
2640	package CFClient::UI::Animator;	2813	package CFClient::UI::Animator;
…		…
2727	$tooltip .= "\n\n" . (ref $widget) . "\n"	2900	$tooltip .= "\n\n" . (ref $widget) . "\n"
2728	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2901	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729	. "req $widget->{req_w} $widget->{req_h}\n"	2902	. "req $widget->{req_w} $widget->{req_h}\n"
2730	. "visible $widget->{visible}";	2903	. "visible $widget->{visible}";
2731	}	2904	}
		2905
		2906	$tooltip =~ s/^\n+//;
		2907	$tooltip =~ s/\n+$//;
2732		2908
2733	$self->add (new CFClient::UI::Label	2909	$self->add (new CFClient::UI::Label
2734	markup => $tooltip,	2910	markup => $tooltip,
2735	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736	fontsize => 0.8,	2912	fontsize => 0.8,
…		…
2746	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747		2923
2748	($w + 4, $h + 4)	2924	($w + 4, $h + 4)
2749	}	2925	}
2750		2926
2751	sub size_allocate {	2927	sub invoke_size_allocate {
2752	my ($self, $w, $h) = @_;	2928	my ($self, $w, $h) = @_;
2753		2929
2754	$self->SUPER::size_allocate ($w - 4, $h - 4);	2930	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755	}	2931	}
2756		2932
2757	sub visibility_change {	2933	sub invoke_visibility_change {
2758	my ($self, $visible) = @_;	2934	my ($self, $visible) = @_;
2759		2935
2760	return unless $visible;	2936	return unless $visible;
2761		2937
2762	$self->{root}->on_post_alloc ("move_$self" => sub {	2938	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2764	or return;	2940	or return;
2765		2941
2766	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767		2943
2768	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769	if $x + $self->{w} > $::WIDTH;	2945	if $x + $self->{w} > $self->{root}{w};
2770		2946
2771	$self->move_abs ($x, $y);	2947	$self->move_abs ($x, $y);
2772	});	2948	});
2773	}	2949	}
2774		2950
…		…
2869	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3045	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870	glDisable GL_TEXTURE_2D;	3046	glDisable GL_TEXTURE_2D;
2871	}	3047	}
2872	}	3048	}
2873		3049
2874	sub DESTROY {	3050	sub destroy {
2875	my ($self) = @_;	3051	my ($self) = @_;
2876		3052
2877	$self->{timer}->cancel	3053	$self->{timer}->cancel
2878	if $self->{timer};	3054	if $self->{timer};
2879		3055
2880	$self->SUPER::DESTROY;	3056	$self->SUPER::destroy;
2881	}	3057	}
2882		3058
2883	#############################################################################	3059	#############################################################################
2884		3060
2885	package CFClient::UI::Buttonbar;	3061	package CFClient::UI::Buttonbar;
…		…
2906	);	3082	);
2907		3083
2908	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2909		3085
2910	for my $item (@{ $self->{items} }) {	3086	for my $item (@{ $self->{items} }) {
2911	my ($widget, $cb) = @$item;	3087	my ($widget, $cb, $tooltip) = @$item;
2912		3088
2913	# handle various types of items, only text for now	3089	# handle various types of items, only text for now
2914	if (!ref $widget) {	3090	if (!ref $widget) {
2915	$widget = new CFClient::UI::Label	3091	$widget = new CFClient::UI::Label
2916	can_hover => 1,	3092	can_hover => 1,
2917	can_events => 1,	3093	can_events => 1,
2918	text => $widget;	3094	markup => $widget,
		3095	tooltip => $tooltip
2919	}	3096	}
2920		3097
2921	$self->{item}{$widget} = $item;	3098	$self->{item}{$widget} = $item;
2922		3099
2923	$self->{vbox}->add ($widget);	3100	$self->{vbox}->add ($widget);
…		…
2928		3105
2929	# popup given the event (must be a mouse button down event currently)	3106	# popup given the event (must be a mouse button down event currently)
2930	sub popup {	3107	sub popup {
2931	my ($self, $ev) = @_;	3108	my ($self, $ev) = @_;
2932		3109
2933	$self->_emit ("popdown");	3110	$self->emit ("popdown");
2934		3111
2935	# maybe save $GRAB? must be careful about events...	3112	# maybe save $GRAB? must be careful about events...
2936	$GRAB = $self;	3113	$GRAB = $self;
2937	$self->{button} = $ev->{button};	3114	$self->{button} = $ev->{button};
2938		3115
2939	$self->show;	3116	$self->show;
2940	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3117	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941	}	3118	}
2942		3119
2943	sub mouse_motion {	3120	sub invoke_mouse_motion {
2944	my ($self, $ev, $x, $y) = @_;	3121	my ($self, $ev, $x, $y) = @_;
2945		3122
2946	# TODO: should use vbox->find_widget or so	3123	# TODO: should use vbox->find_widget or so
2947	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3124	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948	$self->{hover} = $self->{item}{$HOVER};	3125	$self->{hover} = $self->{item}{$HOVER};
2949		3126
2950	0	3127	0
2951	}	3128	}
2952		3129
2953	sub button_up {	3130	sub invoke_button_up {
2954	my ($self, $ev, $x, $y) = @_;	3131	my ($self, $ev, $x, $y) = @_;
2955		3132
2956	if ($ev->{button} == $self->{button}) {	3133	if ($ev->{button} == $self->{button}) {
2957	undef $GRAB;	3134	undef $GRAB;
2958	$self->hide;	3135	$self->hide;
2959		3136
2960	$self->_emit ("popdown");	3137	$self->emit ("popdown");
2961	$self->{hover}[1]->() if $self->{hover};	3138	$self->{hover}[1]->() if $self->{hover};
2962	} else {	3139	} else {
2963	return 0	3140	return 0
2964	}	3141	}
2965		3142
…		…
2992		3169
2993	$self->{current} = $self->{children}[0]	3170	$self->{current} = $self->{children}[0]
2994	if @{ $self->{children} };	3171	if @{ $self->{children} };
2995	}	3172	}
2996		3173
		3174	sub get_current_page {
		3175	my ($self) = @_;
		3176
		3177	$self->{current}
		3178	}
		3179
2997	sub set_current_page {	3180	sub set_current_page {
2998	my ($self, $page_or_widget) = @_;	3181	my ($self, $page_or_widget) = @_;
2999		3182
3000	my $widget = ref $page_or_widget	3183	my $widget = ref $page_or_widget
3001	? $page_or_widget	3184	? $page_or_widget
3002	: $self->{children}[$page_or_widget];	3185	: $self->{children}[$page_or_widget];
3003		3186
3004	$self->{current} = $widget;	3187	$self->{current} = $widget;
3005	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3188	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006		3189
3007	$self->_emit (page_changed => $self->{current});	3190	$self->emit (page_changed => $self->{current});
3008		3191
3009	$self->realloc;	3192	$self->realloc;
3010	}	3193	}
3011		3194
3012	sub visible_children {	3195	sub visible_children {
…		…
3017	my ($self) = @_;	3200	my ($self) = @_;
3018		3201
3019	$self->{current}->size_request	3202	$self->{current}->size_request
3020	}	3203	}
3021		3204
3022	sub size_allocate {	3205	sub invoke_size_allocate {
3023	my ($self, $w, $h) = @_;	3206	my ($self, $w, $h) = @_;
3024		3207
3025	$self->{current}->configure (0, 0, $w, $h);	3208	$self->{current}->configure (0, 0, $w, $h);
		3209
		3210	1
3026	}	3211	}
3027		3212
3028	sub _draw {	3213	sub _draw {
3029	my ($self) = @_;	3214	my ($self) = @_;
3030		3215
…		…
3065	);	3250	);
3066		3251
3067	$self->{multiplexer}->add ($widget);	3252	$self->{multiplexer}->add ($widget);
3068	}	3253	}
3069		3254
		3255	sub get_current_page {
		3256	my ($self) = @_;
		3257
		3258	$self->{multiplexer}->get_current_page
		3259	}
		3260
3070	sub set_current_page {	3261	sub set_current_page {
3071	my ($self, $page) = @_;	3262	my ($self, $page) = @_;
3072		3263
3073	$self->{multiplexer}->set_current_page ($page);	3264	$self->{multiplexer}->set_current_page ($page);
3074	$self->_emit (page_changed => $self->{multiplexer}{current});	3265	$self->emit (page_changed => $self->{multiplexer}{current});
		3266	}
		3267
		3268	#############################################################################
		3269
		3270	package CFClient::UI::Combobox;
		3271
		3272	use utf8;
		3273
		3274	our @ISA = CFClient::UI::Button::;
		3275
		3276	sub new {
		3277	my $class = shift;
		3278
		3279	my $self = $class->SUPER::new (
		3280	options => [], # [value, title, longdesc], ...
		3281	value => undef,
		3282	@_,
		3283	);
		3284
		3285	$self->_set_value ($self->{value});
		3286
		3287	$self
		3288	}
		3289
		3290	sub invoke_button_down {
		3291	my ($self, $ev) = @_;
		3292
		3293	my @menu_items;
		3294
		3295	for (@{ $self->{options} }) {
		3296	my ($value, $title, $tooltip) = @$_;
		3297
		3298	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3299	}
		3300
		3301	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3302	}
		3303
		3304	sub _set_value {
		3305	my ($self, $value) = @_;
		3306
		3307	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3308	or return;
		3309
		3310	$self->{value} = $item->[0];
		3311	$self->set_markup ("$item->[1] ⇓");
		3312	$self->set_tooltip ($item->[2]);
		3313	}
		3314
		3315	sub set_value {
		3316	my ($self, $value) = @_;
		3317
		3318	return unless $self->{value} ne $value;
		3319
		3320	$self->_set_value ($value);
		3321	$self->emit (changed => $value);
3075	}	3322	}
3076		3323
3077	#############################################################################	3324	#############################################################################
3078		3325
3079	package CFClient::UI::Statusbox;	3326	package CFClient::UI::Statusbox;
…		…
3178	$item->{count}++;	3425	$item->{count}++;
3179	} else {	3426	} else {
3180	$item->{count} = 1;	3427	$item->{count} = 1;
3181	$item->{text} = $item->{tooltip} = $text;	3428	$item->{text} = $item->{tooltip} = $text;
3182	}	3429	}
3183	$item->{id} = ++$self->{id};	3430	$item->{id} += 0.2;#d#
3184	$item->{timeout} = $timeout;	3431	$item->{timeout} = $timeout;
3185	delete $item->{label};	3432	delete $item->{label};
3186	} else {	3433	} else {
3187	$self->{item}{$group} = {	3434	$self->{item}{$group} = {
3188	id => ++$self->{id},	3435	id => ++$self->{id},
…		…
3194	count => 1,	3441	count => 1,
3195	%arg,	3442	%arg,
3196	};	3443	};
3197	}	3444	}
3198		3445
		3446	$ROOT->on_refresh (reorder => sub {
3199	$self->reorder;	3447	$self->reorder;
		3448	});
3200	}	3449	}
3201		3450
3202	sub reconfigure {	3451	sub reconfigure {
3203	my ($self) = @_;	3452	my ($self) = @_;
3204		3453
…		…
3207		3456
3208	$self->reorder;	3457	$self->reorder;
3209	$self->SUPER::reconfigure;	3458	$self->SUPER::reconfigure;
3210	}	3459	}
3211		3460
3212	sub DESTROY {	3461	sub destroy {
3213	my ($self) = @_;	3462	my ($self) = @_;
3214		3463
3215	$self->{timer}->cancel;	3464	$self->{timer}->cancel;
3216		3465
3217	$self->SUPER::DESTROY;	3466	$self->SUPER::destroy;
3218	}	3467	}
3219		3468
3220	#############################################################################	3469	#############################################################################
3221		3470
3222	package CFClient::UI::Inventory;	3471	package CFClient::UI::Inventory;
3223		3472
3224	our @ISA = CFClient::UI::ScrolledWindow::;	3473	our @ISA = CFClient::UI::Table::;
3225		3474
3226	sub new {	3475	sub new {
3227	my $class = shift;	3476	my $class = shift;
3228		3477
3229	my $self = $class->SUPER::new (	3478	my $self = $class->SUPER::new (
3230	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3479	col_expand => [0, 1, 0],
3231	@_,	3480	@_,
3232	);	3481	);
3233		3482
3234	$self	3483	$self
3235	}	3484	}
3236		3485
3237	sub set_items {	3486	sub set_items {
3238	my ($self, $items) = @_;	3487	my ($self, $items) = @_;
3239		3488
3240	$self->{child}->clear;	3489	$self->clear;
3241	return unless $items;	3490	return unless $items;
3242		3491
3243	my @items = sort {	3492	my @items = sort {
3244	($a->{type} <=> $b->{type})	3493	($a->{type} <=> $b->{type})
3245	or ($a->{name} cmp $b->{name})	3494	or ($a->{name} cmp $b->{name})
3246	} @$items;	3495	} values %$items;
3247		3496
3248	$self->{real_items} = \@items;	3497	$self->{real_items} = \@items;
3249		3498
3250	my $row = 0;	3499	my $row = 0;
3251	for my $item (@items) {	3500	for my $item (@items) {
3252	CFClient::Item::update_widgets $item;	3501	CFClient::Item::update_widgets $item;
3253		3502
3254	$self->{child}->add (0, $row, $item->{face_widget});	3503	$self->add (0, $row, $item->{face_widget});
3255	$self->{child}->add (1, $row, $item->{desc_widget});	3504	$self->add (1, $row, $item->{desc_widget});
3256	$self->{child}->add (2, $row, $item->{weight_widget});	3505	$self->add (2, $row, $item->{weight_widget});
3257		3506
3258	$row++;	3507	$row++;
3259	}
3260	}
3261
3262	#############################################################################
3263
3264	package CFClient::UI::BindEditor;
3265
3266	our @ISA = CFClient::UI::FancyFrame::;
3267
3268	sub new {
3269	my $class = shift;
3270
3271	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273	$self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277	text => "start recording",
3278	tooltip => "Start/Stops recording of actions."
3279	."All subsequent actions after the recording started will be captured."
3280	."The actions are displayed after the record was stopped."
3281	."To bind the action you have to click on the 'Bind' button",
3282	on_activate => sub {
3283	unless ($self->{recording}) {
3284	$self->start;
3285	} else {
3286	$self->stop;
3287	}
3288	});
3289
3290	$vb->add (new CFClient::UI::Label text => "Actions:");
3291	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3294	$vb->add (my $hb = new CFClient::UI::HBox);
3295	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296	$hb->add (new CFClient::UI::Button
3297	text => "bind",
3298	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299	on_activate => sub {
3300	$self->ask_for_bind;
3301	});
3302
3303	$vb->add (my $hb = new CFClient::UI::HBox);
3304	$hb->add (new CFClient::UI::Button
3305	text => "ok",
3306	expand => 1,
3307	tooltip => "This closes the binding editor and saves the binding",
3308	on_activate => sub {
3309	$self->hide;
3310	$self->commit;
3311	});
3312
3313	$hb->add (new CFClient::UI::Button
3314	text => "cancel",
3315	expand => 1,
3316	tooltip => "This closes the binding editor without saving",
3317	on_activate => sub {
3318	$self->hide;
3319	$self->{binding_cancel}->()
3320	if $self->{binding_cancel};
3321	});
3322
3323	$self->update_binding_widgets;
3324
3325	$self
3326	}
3327
3328	sub commit {
3329	my ($self) = @_;
3330	my ($mod, $sym, $cmds) = $self->get_binding;
3331	if ($sym != 0 && @$cmds > 0) {
3332	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333	."'. Don't forget 'Save Config'!");
3334	$self->{binding_change}->($mod, $sym, $cmds)
3335	if $self->{binding_change};
3336	} else {
3337	$::STATUSBOX->add ("No action bound, no key or action specified!");
3338	$self->{binding_cancel}->()
3339	if $self->{binding_cancel};
3340	}
3341	}
3342
3343	sub start {
3344	my ($self) = @_;
3345
3346	$self->{rec_btn}->set_text ("stop recording");
3347	$self->{recording} = 1;
3348	$self->clear_command_list;
3349	$::CONN->start_record if $::CONN;
3350	}
3351
3352	sub stop {
3353	my ($self) = @_;
3354
3355	$self->{rec_btn}->set_text ("start recording");
3356	$self->{recording} = 0;
3357
3358	my $rec;
3359	$rec = $::CONN->stop_record if $::CONN;
3360	return unless ref $rec eq 'ARRAY';
3361	$self->set_command_list ($rec);
3362	}
3363
3364
3365	sub ask_for_bind_and_commit {
3366	my ($self) = @_;
3367	$self->ask_for_bind (1);
3368	}
3369
3370	sub ask_for_bind {
3371	my ($self, $commit) = @_;
3372
3373	CFClient::Binder::open_binding_dialog (sub {
3374	my ($mod, $sym) = @_;
3375	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376	$self->update_binding_widgets;
3377	$self->commit if $commit;
3378	});
3379	}
3380
3381	# $mod and $sym are the modifiers and key symbol
3382	# $cmds is a array ref of strings (the commands)
3383	# $cb is the callback that is executed on OK
3384	# $ccb is the callback that is executed on CANCEL and
3385	# when the binding was unsuccessful on OK
3386	sub set_binding {
3387	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389	$self->clear_command_list;
3390	$self->{recording} = 0;
3391	$self->{rec_btn}->set_text ("start recording");
3392
3393	$self->{binding} = [$mod, $sym];
3394	$self->{commands} = $cmds;
3395
3396	$self->{binding_change} = $cb;
3397	$self->{binding_cancel} = $ccb;
3398
3399	$self->update_binding_widgets;
3400	}
3401
3402	# this is a shortcut method that asks for a binding
3403	# and then just binds it.
3404	sub do_quick_binding {
3405	my ($self, $cmds) = @_;
3406	$self->set_binding (undef, undef, $cmds, sub {
3407	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408	});
3409	$self->ask_for_bind (1);
3410	}
3411
3412	sub update_binding_widgets {
3413	my ($self) = @_;
3414	my ($mod, $sym, $cmds) = $self->get_binding;
3415	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416	$self->set_command_list ($cmds);
3417	}
3418
3419	sub get_binding {
3420	my ($self) = @_;
3421	return (
3422	$self->{binding}->[0],
3423	$self->{binding}->[1],
3424	[ grep { defined $_ } @{$self->{commands}} ]
3425	);
3426	}
3427
3428	sub clear_command_list {
3429	my ($self) = @_;
3430	$self->{cmdbox}->clear ();
3431	}
3432
3433	sub set_command_list {
3434	my ($self, $cmds) = @_;
3435
3436	$self->{cmdbox}->clear ();
3437	$self->{commands} = $cmds;
3438
3439	my $idx = 0;
3440
3441	for (@$cmds) {
3442	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444	my $i = $idx;
3445	$hb->add (new CFClient::UI::Label text => $_);
3446	$hb->add (new CFClient::UI::Button
3447	text => "delete",
3448	tooltip => "Deletes the action from the record",
3449	on_activate => sub {
3450	$self->{cmdbox}->remove ($hb);
3451	$cmds->[$i] = undef;
3452	});
3453
3454
3455	$idx++
3456	}	3508	}
3457	}	3509	}
3458		3510
3459	#############################################################################	3511	#############################################################################
3460		3512
…		…
3470	commands => [],	3522	commands => [],
3471	@_,	3523	@_,
3472	)	3524	)
3473	}	3525	}
3474		3526
3475	# XXX: Do sorting? Argl...	3527	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3528
		3529	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3530	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3531	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3532	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3533	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3534	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3535	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3536	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3537	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3538	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3539
		3540	sub rebuild_spell_list {
		3541	my ($self) = @_;
		3542
		3543	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3544	$self->clear;
		3545
		3546	return unless $::CONN;
		3547
		3548	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3549	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3550	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3551	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3552	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3553
		3554	my $row = 0;
		3555
		3556	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3557	my $spell = $self->{spell}{$_};
		3558
		3559	$row++;
		3560
		3561	my $spell_cb = sub {
		3562	my ($widget, $ev) = @_;
		3563
		3564	if ($ev->{button} == 1) {
		3565	$::CONN->user_send ("cast $spell->{name}");
		3566	} elsif ($ev->{button} == 2) {
		3567	$::CONN->user_send ("invoke $spell->{name}");
		3568	} elsif ($ev->{button} == 3) {
		3569	(new CFClient::UI::Menu
		3570	items => [
		3571	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3572	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3573	],
		3574	)->popup ($ev);
		3575	} else {
		3576	return 0;
		3577	}
		3578
		3579	1
		3580	};
		3581
		3582	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3583
		3584	#TODO: add path info to tooltip
		3585	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3586
		3587	$self->add (0, $row, new CFClient::UI::Face
		3588	face => $spell->{face},
		3589	can_hover => 1,
		3590	can_events => 1,
		3591	tooltip => $tooltip,
		3592	on_button_down => $spell_cb,
		3593	);
		3594
		3595	$self->add (1, $row, new CFClient::UI::Label
		3596	expand => 1,
		3597	text => $spell->{name},
		3598	can_hover => 1,
		3599	can_events => 1,
		3600	tooltip => $tooltip,
		3601	on_button_down => $spell_cb,
		3602	);
		3603
		3604	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3605	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3606	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3607	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3608	}
		3609	});
		3610	}
		3611
3476	sub add_spell {	3612	sub add_spell {
3477	my ($self, $spell) = @_;	3613	my ($self, $spell) = @_;
		3614
3478	$self->{spells}->{$spell->{name}} = $spell;	3615	$self->{spell}->{$spell->{name}} = $spell;
3479		3616	$self->rebuild_spell_list;
3480	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481	face => $spell->{face},
3482	can_hover => 1,
3483	can_events => 1,
3484	tooltip => $spell->{message});
3485
3486	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487	text => $spell->{name},
3488	can_hover => 1,
3489	can_events => 1,
3490	tooltip => $spell->{message},
3491	expand => 1);
3492
3493	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496	expand => 1);
3497
3498	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499	text => "bind to key",
3500	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501	}
3502
3503	sub rebuild_spell_list {
3504	my ($self) = @_;
3505	$self->{tbl_idx} = 0;
3506	$self->add_spell ($_) for values %{$self->{spells}};
3507	}	3617	}
3508		3618
3509	sub remove_spell {	3619	sub remove_spell {
3510	my ($self, $spell) = @_;	3620	my ($self, $spell) = @_;
		3621
3511	delete $self->{spells}->{$spell->{name}};	3622	delete $self->{spell}->{$spell->{name}};
		3623	$self->rebuild_spell_list;
		3624	}
		3625
		3626	sub clear_spells {
		3627	my ($self) = @_;
		3628
		3629	$self->{spell} = {};
3512	$self->rebuild_spell_list;	3630	$self->rebuild_spell_list;
3513	}	3631	}
3514		3632
3515	#############################################################################	3633	#############################################################################
3516		3634
…		…
3553	$coord = $max - $size if $coord > $max - $size;	3671	$coord = $max - $size if $coord > $max - $size;
3554		3672
3555	int $coord + 0.5	3673	int $coord + 0.5
3556	}	3674	}
3557		3675
3558	sub size_allocate {	3676	sub invoke_size_allocate {
3559	my ($self, $w, $h) = @_;	3677	my ($self, $w, $h) = @_;
3560		3678
3561	for my $child ($self->children) {	3679	for my $child ($self->children) {
3562	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3680	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563		3681
…		…
3567	$X = _to_pixel $X, $W, $self->{w};	3685	$X = _to_pixel $X, $W, $self->{w};
3568	$Y = _to_pixel $Y, $H, $self->{h};	3686	$Y = _to_pixel $Y, $H, $self->{h};
3569		3687
3570	$child->configure ($X, $Y, $W, $H);	3688	$child->configure ($X, $Y, $W, $H);
3571	}	3689	}
		3690
		3691	1
3572	}	3692	}
3573		3693
3574	sub coord2local {	3694	sub coord2local {
3575	my ($self, $x, $y) = @_;	3695	my ($self, $x, $y) = @_;
3576		3696

Diff Legend

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