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.281 by root, Mon Jun 5 01:59:59 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
…		…
1538		1578
1539	delete $self->{texture};	1579	delete $self->{texture};
1540	$self->SUPER::update;	1580	$self->SUPER::update;
1541	}	1581	}
1542		1582
		1583	sub realloc {
		1584	my ($self) = @_;
		1585
		1586	delete $self->{ox};
		1587	$self->SUPER::realloc;
		1588	}
		1589
1543	sub set_text {	1590	sub set_text {
1544	my ($self, $text) = @_;	1591	my ($self, $text) = @_;
1545		1592
1546	return if $self->{text} eq "T$text";	1593	return if $self->{text} eq "T$text";
1547	$self->{text} = "T$text";	1594	$self->{text} = "T$text";
1548		1595
1549	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1596	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550	$self->{layout}->set_text ($text);	1597	$self->{layout}->set_text ($text);
1551		1598
		1599	delete $self->{size_req};
1552	$self->realloc;	1600	$self->realloc;
1553	$self->update;	1601	$self->update;
1554	}	1602	}
1555		1603
1556	sub set_markup {	1604	sub set_markup {
…		…
1562	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1610	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563		1611
1564	$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;
1565	$self->{layout}->set_markup ($markup);	1613	$self->{layout}->set_markup ($markup);
1566		1614
		1615	delete $self->{size_req};
1567	$self->realloc;	1616	$self->realloc;
1568	$self->update;	1617	$self->update;
1569	}	1618	}
1570		1619
1571	sub size_request {	1620	sub size_request {
1572	my ($self) = @_;	1621	my ($self) = @_;
1573		1622
		1623	$self->{size_req} ||= do {
1574	$self->{layout}->set_font ($self->{font}) if $self->{font};	1624	$self->{layout}->set_font ($self->{font}) if $self->{font};
1575	$self->{layout}->set_width ($self->{max_w} || -1);	1625	$self->{layout}->set_width ($self->{max_w} || -1);
1576	$self->{layout}->set_ellipsise ($self->{ellipsise});	1626	$self->{layout}->set_ellipsise ($self->{ellipsise});
1577	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1627	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1628	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579		1629
1580	my ($w, $h) = $self->{layout}->size;	1630	my ($w, $h) = $self->{layout}->size;
1581		1631
1582	if (exists $self->{template}) {	1632	if (exists $self->{template}) {
1583	$self->{template}->set_font ($self->{font}) if $self->{font};	1633	$self->{template}->set_font ($self->{font}) if $self->{font};
1584	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1634	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585		1635
1586	my ($w2, $h2) = $self->{template}->size;	1636	my ($w2, $h2) = $self->{template}->size;
1587		1637
1588	$w = List::Util::max $w, $w2;	1638	$w = List::Util::max $w, $w2;
1589	$h = List::Util::max $h, $h2;	1639	$h = List::Util::max $h, $h2;
		1640	}
		1641
		1642	[$w, $h]
1590	}	1643	};
1591		1644
1592	($w, $h)	1645	@{ $self->{size_req} }
1593	}	1646	}
1594		1647
		1648	sub baseline_shift {
		1649	$_[0]{layout}->descent
		1650	}
		1651
1595	sub size_allocate {	1652	sub invoke_size_allocate {
1596	my ($self, $w, $h) = @_;	1653	my ($self, $w, $h) = @_;
1597		1654
1598	delete $self->{ox};	1655	delete $self->{ox};
1599		1656
1600	delete $self->{texture}	1657	delete $self->{texture}
1601	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
1602	}	1661	}
1603		1662
1604	sub set_fontsize {	1663	sub set_fontsize {
1605	my ($self, $fontsize) = @_;	1664	my ($self, $fontsize) = @_;
1606		1665
1607	$self->{fontsize} = $fontsize;	1666	$self->{fontsize} = $fontsize;
		1667	delete $self->{size_req};
1608	delete $self->{texture};	1668	delete $self->{texture};
1609		1669
1610	$self->realloc;	1670	$self->realloc;
		1671	}
		1672
		1673	sub reconfigure {
		1674	my ($self) = @_;
		1675
		1676	delete $self->{size_req};
		1677
		1678	$self->SUPER::reconfigure;
1611	}	1679	}
1612		1680
1613	sub _draw {	1681	sub _draw {
1614	my ($self) = @_;	1682	my ($self) = @_;
1615		1683
…		…
1635	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1703	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636	: ($self->{h} - $tex->{h}) * 0.5);	1704	: ($self->{h} - $tex->{h}) * 0.5);
1637	};	1705	};
1638		1706
1639	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 {
1640	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642	glColor_premultiply @{$self->{fg}}
1643	if $tex->{format} == GL_ALPHA;
1644
1645	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
		1719	}
1646		1720
1647	glDisable GL_TEXTURE_2D;	1721	glDisable GL_TEXTURE_2D;
1648	}	1722	}
1649		1723
1650	#############################################################################	1724	#############################################################################
…		…
1666	can_hover => 1,	1740	can_hover => 1,
1667	can_focus => 1,	1741	can_focus => 1,
1668	valign => 0,	1742	valign => 0,
1669	can_events => 1,	1743	can_events => 1,
1670	#text => ...	1744	#text => ...
		1745	#hidden => "*",
1671	@_	1746	@_
1672	)	1747	)
1673	}	1748	}
1674		1749
1675	sub _set_text {	1750	sub _set_text {
…		…
1682	$self->{last_activity} = $::NOW;	1757	$self->{last_activity} = $::NOW;
1683	$self->{text} = $text;	1758	$self->{text} = $text;
1684		1759
1685	$text =~ s/./*/g if $self->{hidden};	1760	$text =~ s/./*/g if $self->{hidden};
1686	$self->{layout}->set_text ("$text ");	1761	$self->{layout}->set_text ("$text ");
		1762	delete $self->{size_req};
1687		1763
1688	$self->_emit (changed => $self->{text});	1764	$self->emit (changed => $self->{text});
		1765
		1766	$self->realloc;
1689	$self->update;	1767	$self->update;
1690	}	1768	}
1691		1769
1692	sub set_text {	1770	sub set_text {
1693	my ($self, $text) = @_;	1771	my ($self, $text) = @_;
1694		1772
1695	$self->{cursor} = length $text;	1773	$self->{cursor} = length $text;
1696	$self->_set_text ($text);	1774	$self->_set_text ($text);
1697
1698	$self->realloc;
1699	}	1775	}
1700		1776
1701	sub get_text {	1777	sub get_text {
1702	$_[0]{text}	1778	$_[0]{text}
1703	}	1779	}
…		…
1708	my ($w, $h) = $self->SUPER::size_request;	1784	my ($w, $h) = $self->SUPER::size_request;
1709		1785
1710	($w + 1, $h) # add 1 for cursor	1786	($w + 1, $h) # add 1 for cursor
1711	}	1787	}
1712		1788
1713	sub key_down {	1789	sub invoke_key_down {
1714	my ($self, $ev) = @_;	1790	my ($self, $ev) = @_;
1715		1791
1716	my $mod = $ev->{mod};	1792	my $mod = $ev->{mod};
1717	my $sym = $ev->{sym};	1793	my $sym = $ev->{sym};
1718	my $uni = $ev->{unicode};	1794	my $uni = $ev->{unicode};
…		…
1730	} elsif ($sym == CFClient::SDLK_HOME) {	1806	} elsif ($sym == CFClient::SDLK_HOME) {
1731	$self->{cursor} = 0;	1807	$self->{cursor} = 0;
1732	} elsif ($sym == CFClient::SDLK_END) {	1808	} elsif ($sym == CFClient::SDLK_END) {
1733	$self->{cursor} = length $text;	1809	$self->{cursor} = length $text;
1734	} elsif ($uni == 27) {	1810	} elsif ($uni == 27) {
1735	$self->_emit ('escape');	1811	$self->emit ('escape');
1736	} elsif ($uni) {	1812	} elsif ($uni) {
1737	substr $text, $self->{cursor}++, 0, chr $uni;	1813	substr $text, $self->{cursor}++, 0, chr $uni;
1738	} else {	1814	} else {
1739	return 0;	1815	return 0;
1740	}	1816	}
…		…
1744	$self->realloc;	1820	$self->realloc;
1745		1821
1746	1	1822	1
1747	}	1823	}
1748		1824
1749	sub focus_in {	1825	sub invoke_focus_in {
1750	my ($self) = @_;	1826	my ($self) = @_;
1751		1827
1752	$self->{last_activity} = $::NOW;	1828	$self->{last_activity} = $::NOW;
1753		1829
1754	$self->SUPER::focus_in;	1830	$self->SUPER::invoke_focus_in
1755	}	1831	}
1756		1832
1757	sub button_down {	1833	sub invoke_button_down {
1758	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1759		1835
1760	$self->SUPER::button_down ($ev, $x, $y);	1836	$self->SUPER::invoke_button_down ($ev, $x, $y);
1761		1837
1762	my $idx = $self->{layout}->xy_to_index ($x, $y);	1838	my $idx = $self->{layout}->xy_to_index ($x, $y);
1763		1839
1764	# byte-index to char-index	1840	# byte-index to char-index
1765	my $text = $self->{text};	1841	my $text = $self->{text};
…		…
1770	$self->update;	1846	$self->update;
1771		1847
1772	1	1848	1
1773	}	1849	}
1774		1850
1775	sub mouse_motion {	1851	sub invoke_mouse_motion {
1776	my ($self, $ev, $x, $y) = @_;	1852	my ($self, $ev, $x, $y) = @_;
1777	# 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#
1778		1854
1779	0	1855	1
1780	}	1856	}
1781		1857
1782	sub _draw {	1858	sub _draw {
1783	my ($self) = @_;	1859	my ($self) = @_;
1784		1860
…		…
1825		1901
1826	our @ISA = CFClient::UI::EntryBase::;	1902	our @ISA = CFClient::UI::EntryBase::;
1827		1903
1828	use CFClient::OpenGL;	1904	use CFClient::OpenGL;
1829		1905
1830	sub key_down {	1906	sub invoke_key_down {
1831	my ($self, $ev) = @_;	1907	my ($self, $ev) = @_;
1832		1908
1833	my $sym = $ev->{sym};	1909	my $sym = $ev->{sym};
1834		1910
1835	if ($sym == 13) {	1911	if ($sym == 13) {
1836	unshift @{$self->{history}},	1912	unshift @{$self->{history}},
1837	my $txt = $self->get_text;	1913	my $txt = $self->get_text;
		1914
1838	$self->{history_pointer} = -1;	1915	$self->{history_pointer} = -1;
1839	$self->{history_saveback} = '';	1916	$self->{history_saveback} = '';
1840	$self->_emit (activate => $txt);	1917	$self->emit (activate => $txt);
1841	$self->update;	1918	$self->update;
1842		1919
1843	} elsif ($sym == CFClient::SDLK_UP) {	1920	} elsif ($sym == CFClient::SDLK_UP) {
1844	if ($self->{history_pointer} < 0) {	1921	if ($self->{history_pointer} < 0) {
1845	$self->{history_saveback} = $self->get_text;	1922	$self->{history_saveback} = $self->get_text;
…		…
1861	} else {	1938	} else {
1862	$self->set_text ($self->{history_saveback});	1939	$self->set_text ($self->{history_saveback});
1863	}	1940	}
1864		1941
1865	} else {	1942	} else {
1866	return $self->SUPER::key_down ($ev)	1943	return $self->SUPER::invoke_key_down ($ev)
1867	}	1944	}
1868		1945
1869	1	1946	1
1870	}	1947	}
1871		1948
…		…
1895	can_events => 1,	1972	can_events => 1,
1896	@_	1973	@_
1897	)	1974	)
1898	}	1975	}
1899		1976
1900	sub activate { }
1901
1902	sub button_up {	1977	sub invoke_button_up {
1903	my ($self, $ev, $x, $y) = @_;	1978	my ($self, $ev, $x, $y) = @_;
1904		1979
1905	$self->emit ("activate")	1980	$self->emit ("activate")
1906	if $x >= 0 && $x < $self->{w}	1981	if $x >= 0 && $x < $self->{w}
1907	&& $y >= 0 && $y < $self->{h};	1982	&& $y >= 0 && $y < $self->{h};
…		…
1921	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922		1997
1923	glDisable GL_TEXTURE_2D;	1998	glDisable GL_TEXTURE_2D;
1924		1999
1925	$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
1926	}	2037	}
1927		2038
1928	#############################################################################	2039	#############################################################################
1929		2040
1930	package CFClient::UI::CheckBox;	2041	package CFClient::UI::CheckBox;
…		…
1957	my ($self) = @_;	2068	my ($self) = @_;
1958		2069
1959	(6) x 2	2070	(6) x 2
1960	}	2071	}
1961		2072
		2073	sub toggle {
		2074	my ($self) = @_;
		2075
		2076	$self->{state} = !$self->{state};
		2077	$self->emit (changed => $self->{state});
		2078	$self->update;
		2079	}
		2080
1962	sub button_down {	2081	sub invoke_button_down {
1963	my ($self, $ev, $x, $y) = @_;	2082	my ($self, $ev, $x, $y) = @_;
1964		2083
1965	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2084	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2085	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967	$self->{state} = !$self->{state};	2086	$self->toggle;
1968	$self->_emit (changed => $self->{state});
1969	} else {	2087	} else {
1970	return 0	2088	return 0
1971	}	2089	}
1972		2090
1973	1	2091	1
…		…
1998	package CFClient::UI::Image;	2116	package CFClient::UI::Image;
1999		2117
2000	our @ISA = CFClient::UI::Base::;	2118	our @ISA = CFClient::UI::Base::;
2001		2119
2002	use CFClient::OpenGL;	2120	use CFClient::OpenGL;
2003	use Carp qw/confess/;
2004		2121
2005	our %loaded_images;	2122	our %texture_cache;
2006		2123
2007	sub new {	2124	sub new {
2008	my $class = shift;	2125	my $class = shift;
2009		2126
2010	my $self = $class->SUPER::new (can_events => 0, @_);	2127	my $self = $class->SUPER::new (
		2128	can_events => 0,
		2129	@_,
		2130	);
2011		2131
2012	$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";
2013		2134
2014	$loaded_images{$self->{image}} ||=	2135	$self->{tex} = $texture_cache{$self->{path}} ||=
2015	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;
2016		2137
2017	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2138	Scalar::Util::weaken $texture_cache{$self->{path}};
2018		2139
2019	Scalar::Util::weaken $loaded_images{$self->{image}};	2140	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021	$self->{aspect} = $tex->{w} / $tex->{h};
2022		2141
2023	$self	2142	$self
2024	}	2143	}
2025		2144
2026	sub size_request {	2145	sub size_request {
2027	my ($self) = @_;	2146	my ($self) = @_;
2028		2147
2029	($self->{tex}->{w}, $self->{tex}->{h})	2148	($self->{tex}{w}, $self->{tex}{h})
2030	}	2149	}
2031		2150
2032	sub _draw {	2151	sub _draw {
2033	my ($self) = @_;	2152	my ($self) = @_;
2034		2153
…		…
2143	my $ycut1 = max 0, min 1, $ycut;	2262	my $ycut1 = max 0, min 1, $ycut;
2144	my $ycut2 = max 0, min 1, $ycut - 1;	2263	my $ycut2 = max 0, min 1, $ycut - 1;
2145		2264
2146	my $h1 = $self->{h} * (1 - $ycut1);	2265	my $h1 = $self->{h} * (1 - $ycut1);
2147	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);
2148		2270
2149	glEnable GL_BLEND;	2271	glEnable GL_BLEND;
2150	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2272	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2273	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152	glEnable GL_TEXTURE_2D;	2274	glEnable GL_TEXTURE_2D;
…		…
2171		2293
2172	if ($t3) {	2294	if ($t3) {
2173	glBindTexture GL_TEXTURE_2D, $t3->{name};	2295	glBindTexture GL_TEXTURE_2D, $t3->{name};
2174	glBegin GL_QUADS;	2296	glBegin GL_QUADS;
2175	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2297	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2298	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2299	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2300	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179	glEnd;	2301	glEnd;
2180	}	2302	}
2181		2303
2182	glDisable GL_BLEND;	2304	glDisable GL_BLEND;
…		…
2270	$self->update;	2392	$self->update;
2271		2393
2272	$self	2394	$self
2273	}	2395	}
2274		2396
2275	sub changed { }
2276
2277	sub set_range {	2397	sub set_range {
2278	my ($self, $range) = @_;	2398	my ($self, $range) = @_;
2279		2399
2280	($range, $self->{range}) = ($self->{range}, $range);	2400	($range, $self->{range}) = ($self->{range}, $range);
2281		2401
2282	$self->update
2283	if "@$range" ne "@{$self->{range}}";	2402	if ("@$range" ne "@{$self->{range}}") {
		2403	$self->update;
		2404	$self->set_value ($self->{range}[0]);
		2405	}
2284	}	2406	}
2285		2407
2286	sub set_value {	2408	sub set_value {
2287	my ($self, $value) = @_;	2409	my ($self, $value) = @_;
2288		2410
…		…
2299	if $unit;	2421	if $unit;
2300		2422
2301	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2423	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302		2424
2303	if ($value != $old_value) {	2425	if ($value != $old_value) {
2304	$self->_emit (changed => $value);	2426	$self->emit (changed => $value);
2305	$self->update;	2427	$self->update;
2306	}	2428	}
2307	}	2429	}
2308		2430
2309	sub size_request {	2431	sub size_request {
2310	my ($self) = @_;	2432	my ($self) = @_;
2311		2433
2312	($self->{req_w}, $self->{req_h})	2434	($self->{req_w}, $self->{req_h})
2313	}	2435	}
2314		2436
2315	sub button_down {	2437	sub invoke_button_down {
2316	my ($self, $ev, $x, $y) = @_;	2438	my ($self, $ev, $x, $y) = @_;
2317		2439
2318	$self->SUPER::button_down ($ev, $x, $y);	2440	$self->SUPER::invoke_button_down ($ev, $x, $y);
2319		2441
2320	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2442	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321		2443
2322	$self->mouse_motion ($ev, $x, $y)	2444	$self->invoke_mouse_motion ($ev, $x, $y)
2323	}	2445	}
2324		2446
2325	sub mouse_motion {	2447	sub invoke_mouse_motion {
2326	my ($self, $ev, $x, $y) = @_;	2448	my ($self, $ev, $x, $y) = @_;
2327		2449
2328	if ($GRAB == $self) {	2450	if ($GRAB == $self) {
2329	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2451	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330		2452
…		…
2435	sub set_range { shift->{slider}->set_range (@_) }	2557	sub set_range { shift->{slider}->set_range (@_) }
2436	sub set_value { shift->{slider}->set_value (@_) }	2558	sub set_value { shift->{slider}->set_value (@_) }
2437		2559
2438	#############################################################################	2560	#############################################################################
2439		2561
2440	package CFClient::UI::TextView;	2562	package CFClient::UI::TextScroller;
2441		2563
2442	our @ISA = CFClient::UI::HBox::;	2564	our @ISA = CFClient::UI::HBox::;
2443		2565
2444	use CFClient::OpenGL;	2566	use CFClient::OpenGL;
2445		2567
…		…
2447	my $class = shift;	2569	my $class = shift;
2448		2570
2449	my $self = $class->SUPER::new (	2571	my $self = $class->SUPER::new (
2450	fontsize => 1,	2572	fontsize => 1,
2451	can_events => 0,	2573	can_events => 0,
		2574	indent => 0,
2452	#font => default_font	2575	#font => default_font
2453	@_,	2576	@_,
2454		2577
2455	layout => (new CFClient::Layout 1),	2578	layout => (new CFClient::Layout 1),
2456	par => [],	2579	par => [],
…		…
2471		2594
2472	$self->{fontsize} = $fontsize;	2595	$self->{fontsize} = $fontsize;
2473	$self->reflow;	2596	$self->reflow;
2474	}	2597	}
2475		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
2476	sub size_allocate {	2608	sub invoke_size_allocate {
2477	my ($self, $w, $h) = @_;	2609	my ($self, $w, $h) = @_;
2478		2610
2479	$self->SUPER::size_allocate ($w, $h);	2611	my ($empty, $slider, @other) = @{ $self->{children} };
		2612	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480		2613
2481	$self->{layout}->set_font ($self->{font}) if $self->{font};	2614	$self->{layout}->set_font ($self->{font}) if $self->{font};
2482	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483	$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});
2484		2618
2485	$self->reflow;	2619	$self->reflow;
2486	}
2487		2620
2488	sub text_size {	2621	local $self->{children} = [$empty, $slider];
2489	my ($self, $text, $indent) = @_;	2622	$self->SUPER::invoke_size_allocate ($w, $h)
		2623	}
		2624
		2625	sub get_layout {
		2626	my ($self, $para) = @_;
2490		2627
2491	my $layout = $self->{layout};	2628	my $layout = $self->{layout};
2492		2629
		2630	$layout->set_font ($self->{font}) if $self->{font};
		2631	$layout->set_foreground (@{$para->{fg}});
2493	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2632	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494	$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});
2495	$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}}
2496		2641	);
		2642
2497	$layout->size	2643	$layout
2498	}	2644	}
2499		2645
2500	sub reflow {	2646	sub reflow {
2501	my ($self) = @_;	2647	my ($self) = @_;
2502		2648
…		…
2511	$self->{children}[1]->set_value ($offset);	2657	$self->{children}[1]->set_value ($offset);
2512	}	2658	}
2513		2659
2514	sub clear {	2660	sub clear {
2515	my ($self) = @_;	2661	my ($self) = @_;
		2662
		2663	my (undef, undef, @other) = @{ $self->{children} };
		2664	$self->remove ($_) for @other;
2516		2665
2517	$self->{par} = [];	2666	$self->{par} = [];
2518	$self->{height} = 0;	2667	$self->{height} = 0;
2519	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2668	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520	}	2669	}
2521		2670
2522	sub add_paragraph {	2671	sub add_paragraph {
2523	my ($self, $color, $text, $indent) = @_;	2672	my ($self, $color, $para, $indent) = @_;
2524		2673
2525	for my $line (split /\n/, $text) {	2674	my ($text, @w) = ref $para ? @$para : $para;
2526	my ($w, $h) = $self->text_size ($line);	2675
2527	$self->{height} += $h;	2676	$para = {
2528	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,
2529	}	2683	};
2530		2684
2531	$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;
2532	}	2697	}
2533		2698
2534	sub update {	2699	sub update {
2535	my ($self) = @_;	2700	my ($self) = @_;
2536		2701
…		…
2538		2703
2539	return unless $self->{h} > 0;	2704	return unless $self->{h} > 0;
2540		2705
2541	delete $self->{texture};	2706	delete $self->{texture};
2542		2707
2543	$ROOT->on_post_alloc ($self, sub {	2708	$ROOT->on_post_alloc ($self => sub {
2544	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2709	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545		2710
2546	if (delete $self->{need_reflow}) {	2711	if (delete $self->{need_reflow}) {
2547	my $height = 0;	2712	my $height = 0;
2548		2713
2549	my $layout = $self->{layout};
2550
2551	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553	for (@{$self->{par}}) {	2714	for my $para (@{$self->{par}}) {
2554	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2715	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555	$layout->set_width ($W - $_->[3]);	2716	my $layout = $self->get_layout ($para);
2556	$layout->set_markup ($_->[4]);
2557	my ($w, $h) = $layout->size;	2717	my ($w, $h) = $layout->size;
2558	$_->[0] = $w + $_->[3];	2718
2559	$_->[1] = $h;	2719	$para->{w} = $w + $para->{indent};
		2720	$para->{h} = $h;
		2721	$para->{wrapped} = $layout->has_wrapped;
2560	}	2722	}
2561		2723
2562	$height += $_->[1];	2724	$height += $para->{h};
2563	}	2725	}
2564		2726
2565	$self->{height} = $height;	2727	$self->{height} = $height;
2566		2728
2567	$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]);
2568		2730
2569	delete $self->{texture};	2731	delete $self->{texture};
		2732	}
		2733
		2734	if (delete $self->{scroll_to_bottom}) {
		2735	$self->{children}[1]->set_value (1e10);
2570	}	2736	}
2571		2737
2572	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2738	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573	glClearColor 0, 0, 0, 0;	2739	glClearColor 0, 0, 0, 0;
2574	glClear GL_COLOR_BUFFER_BIT;	2740	glClear GL_COLOR_BUFFER_BIT;
…		…
2578	my $y0 = $top;	2744	my $y0 = $top;
2579	my $y1 = $top + $H;	2745	my $y1 = $top + $H;
2580		2746
2581	my $y = 0;	2747	my $y = 0;
2582		2748
2583	my $layout = $self->{layout};
2584
2585	$layout->set_font ($self->{font}) if $self->{font};
2586
2587	glEnable GL_BLEND;	2749	glEnable GL_BLEND;
2588	#TODO# not correct in windows where rgba is forced off	2750	#TODO# not correct in windows where rgba is forced off
2589	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2751	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590		2752
2591	for my $par (@{$self->{par}}) {	2753	for my $para (@{$self->{par}}) {
2592	my $h = $par->[1];	2754	my $h = $para->{h};
2593		2755
2594	if ($y0 < $y + $h && $y < $y1) {	2756	if ($y0 < $y + $h && $y < $y1) {
2595	$layout->set_foreground (@{ $par->[2] });	2757
2596	$layout->set_width ($W - $par->[3]);	2758	my $layout = $self->get_layout ($para);
2597	$layout->set_markup ($par->[4]);
2598		2759
2599	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2760	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600		2761
2601	glRasterPos $par->[3], $y - $y0;	2762	glRasterPos $para->{indent}, $y - $y0;
2602	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	}
2603	}	2780	}
2604		2781
2605	$y += $h;	2782	$y += $h;
2606	}	2783	}
2607		2784
2608	glDisable GL_BLEND;	2785	glDisable GL_BLEND;
2609	};	2786	};
2610	});	2787	});
		2788	}
		2789
		2790	sub reconfigure {
		2791	my ($self) = @_;
		2792
		2793	$self->SUPER::reconfigure;
		2794
		2795	$_->{w} = 1e10 for @{ $self->{par} };
		2796	$self->reflow;
2611	}	2797	}
2612		2798
2613	sub _draw {	2799	sub _draw {
2614	my ($self) = @_;	2800	my ($self) = @_;
2615		2801
…		…
2618	glColor 0, 0, 0, 1;	2804	glColor 0, 0, 0, 1;
2619	$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});
2620	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2621		2807
2622	$self->{children}[1]->draw;	2808	$self->{children}[1]->draw;
2623
2624	}	2809	}
2625		2810
2626	#############################################################################	2811	#############################################################################
2627		2812
2628	package CFClient::UI::Animator;	2813	package CFClient::UI::Animator;
…		…
2715	$tooltip .= "\n\n" . (ref $widget) . "\n"	2900	$tooltip .= "\n\n" . (ref $widget) . "\n"
2716	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2901	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717	. "req $widget->{req_w} $widget->{req_h}\n"	2902	. "req $widget->{req_w} $widget->{req_h}\n"
2718	. "visible $widget->{visible}";	2903	. "visible $widget->{visible}";
2719	}	2904	}
		2905
		2906	$tooltip =~ s/^\n+//;
		2907	$tooltip =~ s/\n+$//;
2720		2908
2721	$self->add (new CFClient::UI::Label	2909	$self->add (new CFClient::UI::Label
2722	markup => $tooltip,	2910	markup => $tooltip,
2723	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2911	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724	fontsize => 0.8,	2912	fontsize => 0.8,
…		…
2734	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735		2923
2736	($w + 4, $h + 4)	2924	($w + 4, $h + 4)
2737	}	2925	}
2738		2926
2739	sub size_allocate {	2927	sub invoke_size_allocate {
2740	my ($self, $w, $h) = @_;	2928	my ($self, $w, $h) = @_;
2741		2929
2742	$self->SUPER::size_allocate ($w - 4, $h - 4);	2930	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743	}	2931	}
2744		2932
2745	sub visibility_change {	2933	sub invoke_visibility_change {
2746	my ($self, $visible) = @_;	2934	my ($self, $visible) = @_;
2747		2935
2748	return unless $visible;	2936	return unless $visible;
2749		2937
2750	$self->{root}->on_post_alloc ("move_$self" => sub {	2938	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2752	or return;	2940	or return;
2753		2941
2754	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2942	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755		2943
2756	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2944	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757	if $x + $self->{w} > $::WIDTH;	2945	if $x + $self->{w} > $self->{root}{w};
2758		2946
2759	$self->move_abs ($x, $y);	2947	$self->move_abs ($x, $y);
2760	});	2948	});
2761	}	2949	}
2762		2950
…		…
2857	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3045	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858	glDisable GL_TEXTURE_2D;	3046	glDisable GL_TEXTURE_2D;
2859	}	3047	}
2860	}	3048	}
2861		3049
2862	sub DESTROY {	3050	sub destroy {
2863	my ($self) = @_;	3051	my ($self) = @_;
2864		3052
2865	$self->{timer}->cancel	3053	$self->{timer}->cancel
2866	if $self->{timer};	3054	if $self->{timer};
2867		3055
2868	$self->SUPER::DESTROY;	3056	$self->SUPER::destroy;
2869	}	3057	}
2870		3058
2871	#############################################################################	3059	#############################################################################
2872		3060
2873	package CFClient::UI::Buttonbar;	3061	package CFClient::UI::Buttonbar;
…		…
2894	);	3082	);
2895		3083
2896	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3084	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2897		3085
2898	for my $item (@{ $self->{items} }) {	3086	for my $item (@{ $self->{items} }) {
2899	my ($widget, $cb) = @$item;	3087	my ($widget, $cb, $tooltip) = @$item;
2900		3088
2901	# handle various types of items, only text for now	3089	# handle various types of items, only text for now
2902	if (!ref $widget) {	3090	if (!ref $widget) {
2903	$widget = new CFClient::UI::Label	3091	$widget = new CFClient::UI::Label
2904	can_hover => 1,	3092	can_hover => 1,
2905	can_events => 1,	3093	can_events => 1,
2906	text => $widget;	3094	markup => $widget,
		3095	tooltip => $tooltip
2907	}	3096	}
2908		3097
2909	$self->{item}{$widget} = $item;	3098	$self->{item}{$widget} = $item;
2910		3099
2911	$self->{vbox}->add ($widget);	3100	$self->{vbox}->add ($widget);
…		…
2916		3105
2917	# 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)
2918	sub popup {	3107	sub popup {
2919	my ($self, $ev) = @_;	3108	my ($self, $ev) = @_;
2920		3109
2921	$self->_emit ("popdown");	3110	$self->emit ("popdown");
2922		3111
2923	# maybe save $GRAB? must be careful about events...	3112	# maybe save $GRAB? must be careful about events...
2924	$GRAB = $self;	3113	$GRAB = $self;
2925	$self->{button} = $ev->{button};	3114	$self->{button} = $ev->{button};
2926		3115
2927	$self->show;	3116	$self->show;
2928	$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);
2929	}	3118	}
2930		3119
2931	sub mouse_motion {	3120	sub invoke_mouse_motion {
2932	my ($self, $ev, $x, $y) = @_;	3121	my ($self, $ev, $x, $y) = @_;
2933		3122
2934	# TODO: should use vbox->find_widget or so	3123	# TODO: should use vbox->find_widget or so
2935	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3124	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936	$self->{hover} = $self->{item}{$HOVER};	3125	$self->{hover} = $self->{item}{$HOVER};
2937		3126
2938	0	3127	0
2939	}	3128	}
2940		3129
2941	sub button_up {	3130	sub invoke_button_up {
2942	my ($self, $ev, $x, $y) = @_;	3131	my ($self, $ev, $x, $y) = @_;
2943		3132
2944	if ($ev->{button} == $self->{button}) {	3133	if ($ev->{button} == $self->{button}) {
2945	undef $GRAB;	3134	undef $GRAB;
2946	$self->hide;	3135	$self->hide;
2947		3136
2948	$self->_emit ("popdown");	3137	$self->emit ("popdown");
2949	$self->{hover}[1]->() if $self->{hover};	3138	$self->{hover}[1]->() if $self->{hover};
2950	} else {	3139	} else {
2951	return 0	3140	return 0
2952	}	3141	}
2953		3142
…		…
2980		3169
2981	$self->{current} = $self->{children}[0]	3170	$self->{current} = $self->{children}[0]
2982	if @{ $self->{children} };	3171	if @{ $self->{children} };
2983	}	3172	}
2984		3173
		3174	sub get_current_page {
		3175	my ($self) = @_;
		3176
		3177	$self->{current}
		3178	}
		3179
2985	sub set_current_page {	3180	sub set_current_page {
2986	my ($self, $page_or_widget) = @_;	3181	my ($self, $page_or_widget) = @_;
2987		3182
2988	my $widget = ref $page_or_widget	3183	my $widget = ref $page_or_widget
2989	? $page_or_widget	3184	? $page_or_widget
2990	: $self->{children}[$page_or_widget];	3185	: $self->{children}[$page_or_widget];
2991		3186
2992	$self->{current} = $widget;	3187	$self->{current} = $widget;
2993	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3188	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994		3189
2995	$self->_emit (page_changed => $self->{current});	3190	$self->emit (page_changed => $self->{current});
2996		3191
2997	$self->realloc;	3192	$self->realloc;
2998	}	3193	}
2999		3194
3000	sub visible_children {	3195	sub visible_children {
…		…
3005	my ($self) = @_;	3200	my ($self) = @_;
3006		3201
3007	$self->{current}->size_request	3202	$self->{current}->size_request
3008	}	3203	}
3009		3204
3010	sub size_allocate {	3205	sub invoke_size_allocate {
3011	my ($self, $w, $h) = @_;	3206	my ($self, $w, $h) = @_;
3012		3207
3013	$self->{current}->configure (0, 0, $w, $h);	3208	$self->{current}->configure (0, 0, $w, $h);
		3209
		3210	1
3014	}	3211	}
3015		3212
3016	sub _draw {	3213	sub _draw {
3017	my ($self) = @_;	3214	my ($self) = @_;
3018		3215
…		…
3053	);	3250	);
3054		3251
3055	$self->{multiplexer}->add ($widget);	3252	$self->{multiplexer}->add ($widget);
3056	}	3253	}
3057		3254
		3255	sub get_current_page {
		3256	my ($self) = @_;
		3257
		3258	$self->{multiplexer}->get_current_page
		3259	}
		3260
3058	sub set_current_page {	3261	sub set_current_page {
3059	my ($self, $page) = @_;	3262	my ($self, $page) = @_;
3060		3263
3061	$self->{multiplexer}->set_current_page ($page);	3264	$self->{multiplexer}->set_current_page ($page);
3062	$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);
3063	}	3322	}
3064		3323
3065	#############################################################################	3324	#############################################################################
3066		3325
3067	package CFClient::UI::Statusbox;	3326	package CFClient::UI::Statusbox;
…		…
3166	$item->{count}++;	3425	$item->{count}++;
3167	} else {	3426	} else {
3168	$item->{count} = 1;	3427	$item->{count} = 1;
3169	$item->{text} = $item->{tooltip} = $text;	3428	$item->{text} = $item->{tooltip} = $text;
3170	}	3429	}
3171	$item->{id} = ++$self->{id};	3430	$item->{id} += 0.2;#d#
3172	$item->{timeout} = $timeout;	3431	$item->{timeout} = $timeout;
3173	delete $item->{label};	3432	delete $item->{label};
3174	} else {	3433	} else {
3175	$self->{item}{$group} = {	3434	$self->{item}{$group} = {
3176	id => ++$self->{id},	3435	id => ++$self->{id},
…		…
3182	count => 1,	3441	count => 1,
3183	%arg,	3442	%arg,
3184	};	3443	};
3185	}	3444	}
3186		3445
		3446	$ROOT->on_refresh (reorder => sub {
3187	$self->reorder;	3447	$self->reorder;
		3448	});
3188	}	3449	}
3189		3450
3190	sub reconfigure {	3451	sub reconfigure {
3191	my ($self) = @_;	3452	my ($self) = @_;
3192		3453
…		…
3195		3456
3196	$self->reorder;	3457	$self->reorder;
3197	$self->SUPER::reconfigure;	3458	$self->SUPER::reconfigure;
3198	}	3459	}
3199		3460
3200	sub DESTROY {	3461	sub destroy {
3201	my ($self) = @_;	3462	my ($self) = @_;
3202		3463
3203	$self->{timer}->cancel;	3464	$self->{timer}->cancel;
3204		3465
3205	$self->SUPER::DESTROY;	3466	$self->SUPER::destroy;
3206	}	3467	}
3207		3468
3208	#############################################################################	3469	#############################################################################
3209		3470
3210	package CFClient::UI::Inventory;	3471	package CFClient::UI::Inventory;
3211		3472
3212	our @ISA = CFClient::UI::ScrolledWindow::;	3473	our @ISA = CFClient::UI::Table::;
3213		3474
3214	sub new {	3475	sub new {
3215	my $class = shift;	3476	my $class = shift;
3216		3477
3217	my $self = $class->SUPER::new (	3478	my $self = $class->SUPER::new (
3218	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3479	col_expand => [0, 1, 0],
3219	@_,	3480	@_,
3220	);	3481	);
3221		3482
3222	$self	3483	$self
3223	}	3484	}
3224		3485
3225	sub set_items {	3486	sub set_items {
3226	my ($self, $items) = @_;	3487	my ($self, $items) = @_;
3227		3488
3228	$self->{child}->clear;	3489	$self->clear;
3229	return unless $items;	3490	return unless $items;
3230		3491
3231	my @items = sort {	3492	my @items = sort {
3232	($a->{type} <=> $b->{type})	3493	($a->{type} <=> $b->{type})
3233	or ($a->{name} cmp $b->{name})	3494	or ($a->{name} cmp $b->{name})
3234	} @$items;	3495	} values %$items;
3235		3496
3236	$self->{real_items} = \@items;	3497	$self->{real_items} = \@items;
3237		3498
3238	my $row = 0;	3499	my $row = 0;
3239	for my $item (@items) {	3500	for my $item (@items) {
3240	CFClient::Item::update_widgets $item;	3501	CFClient::Item::update_widgets $item;
3241		3502
3242	$self->{child}->add (0, $row, $item->{face_widget});	3503	$self->add (0, $row, $item->{face_widget});
3243	$self->{child}->add (1, $row, $item->{desc_widget});	3504	$self->add (1, $row, $item->{desc_widget});
3244	$self->{child}->add (2, $row, $item->{weight_widget});	3505	$self->add (2, $row, $item->{weight_widget});
3245		3506
3246	$row++;	3507	$row++;
3247	}
3248	}
3249
3250	#############################################################################
3251
3252	package CFClient::UI::BindEditor;
3253
3254	our @ISA = CFClient::UI::FancyFrame::;
3255
3256	sub new {
3257	my $class = shift;
3258
3259	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3260
3261	$self->add (my $vb = new CFClient::UI::VBox);
3262
3263
3264	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3265	text => "start recording",
3266	tooltip => "Start/Stops recording of actions."
3267	."All subsequent actions after the recording started will be captured."
3268	."The actions are displayed after the record was stopped."
3269	."To bind the action you have to click on the 'Bind' button",
3270	on_activate => sub {
3271	unless ($self->{recording}) {
3272	$self->start;
3273	} else {
3274	$self->stop;
3275	}
3276	});
3277
3278	$vb->add (new CFClient::UI::Label text => "Actions:");
3279	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3280
3281	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3282	$vb->add (my $hb = new CFClient::UI::HBox);
3283	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3284	$hb->add (new CFClient::UI::Button
3285	text => "bind",
3286	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3287	on_activate => sub {
3288	$self->ask_for_bind;
3289	});
3290
3291	$vb->add (my $hb = new CFClient::UI::HBox);
3292	$hb->add (new CFClient::UI::Button
3293	text => "ok",
3294	expand => 1,
3295	tooltip => "This closes the binding editor and saves the binding",
3296	on_activate => sub {
3297	$self->hide;
3298	$self->commit;
3299	});
3300
3301	$hb->add (new CFClient::UI::Button
3302	text => "cancel",
3303	expand => 1,
3304	tooltip => "This closes the binding editor without saving",
3305	on_activate => sub {
3306	$self->hide;
3307	$self->{binding_cancel}->()
3308	if $self->{binding_cancel};
3309	});
3310
3311	$self->update_binding_widgets;
3312
3313	$self
3314	}
3315
3316	sub commit {
3317	my ($self) = @_;
3318	my ($mod, $sym, $cmds) = $self->get_binding;
3319	if ($sym != 0 && @$cmds > 0) {
3320	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3321	."'. Don't forget 'Save Config'!");
3322	$self->{binding_change}->($mod, $sym, $cmds)
3323	if $self->{binding_change};
3324	} else {
3325	$::STATUSBOX->add ("No action bound, no key or action specified!");
3326	$self->{binding_cancel}->()
3327	if $self->{binding_cancel};
3328	}
3329	}
3330
3331	sub start {
3332	my ($self) = @_;
3333
3334	$self->{rec_btn}->set_text ("stop recording");
3335	$self->{recording} = 1;
3336	$self->clear_command_list;
3337	$::CONN->start_record if $::CONN;
3338	}
3339
3340	sub stop {
3341	my ($self) = @_;
3342
3343	$self->{rec_btn}->set_text ("start recording");
3344	$self->{recording} = 0;
3345
3346	my $rec;
3347	$rec = $::CONN->stop_record if $::CONN;
3348	return unless ref $rec eq 'ARRAY';
3349	$self->set_command_list ($rec);
3350	}
3351
3352
3353	sub ask_for_bind_and_commit {
3354	my ($self) = @_;
3355	$self->ask_for_bind (1);
3356	}
3357
3358	sub ask_for_bind {
3359	my ($self, $commit) = @_;
3360
3361	CFClient::Binder::open_binding_dialog (sub {
3362	my ($mod, $sym) = @_;
3363	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3364	$self->update_binding_widgets;
3365	$self->commit if $commit;
3366	});
3367	}
3368
3369	# $mod and $sym are the modifiers and key symbol
3370	# $cmds is a array ref of strings (the commands)
3371	# $cb is the callback that is executed on OK
3372	# $ccb is the callback that is executed on CANCEL and
3373	# when the binding was unsuccessful on OK
3374	sub set_binding {
3375	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3376
3377	$self->clear_command_list;
3378	$self->{recording} = 0;
3379	$self->{rec_btn}->set_text ("start recording");
3380
3381	$self->{binding} = [$mod, $sym];
3382	$self->{commands} = $cmds;
3383
3384	$self->{binding_change} = $cb;
3385	$self->{binding_cancel} = $ccb;
3386
3387	$self->update_binding_widgets;
3388	}
3389
3390	# this is a shortcut method that asks for a binding
3391	# and then just binds it.
3392	sub do_quick_binding {
3393	my ($self, $cmds) = @_;
3394	$self->set_binding (undef, undef, $cmds, sub {
3395	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3396	});
3397	$self->ask_for_bind (1);
3398	}
3399
3400	sub update_binding_widgets {
3401	my ($self) = @_;
3402	my ($mod, $sym, $cmds) = $self->get_binding;
3403	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3404	$self->set_command_list ($cmds);
3405	}
3406
3407	sub get_binding {
3408	my ($self) = @_;
3409	return (
3410	$self->{binding}->[0],
3411	$self->{binding}->[1],
3412	[ grep { defined $_ } @{$self->{commands}} ]
3413	);
3414	}
3415
3416	sub clear_command_list {
3417	my ($self) = @_;
3418	$self->{cmdbox}->clear ();
3419	}
3420
3421	sub set_command_list {
3422	my ($self, $cmds) = @_;
3423
3424	$self->{cmdbox}->clear ();
3425	$self->{commands} = $cmds;
3426
3427	my $idx = 0;
3428
3429	for (@$cmds) {
3430	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3431
3432	my $i = $idx;
3433	$hb->add (new CFClient::UI::Label text => $_);
3434	$hb->add (new CFClient::UI::Button
3435	text => "delete",
3436	tooltip => "Deletes the action from the record",
3437	on_activate => sub {
3438	$self->{cmdbox}->remove ($hb);
3439	$cmds->[$i] = undef;
3440	});
3441
3442
3443	$idx++
3444	}	3508	}
3445	}	3509	}
3446		3510
3447	#############################################################################	3511	#############################################################################
3448		3512
…		…
3458	commands => [],	3522	commands => [],
3459	@_,	3523	@_,
3460	)	3524	)
3461	}	3525	}
3462		3526
3463	# 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
3464	sub add_spell {	3612	sub add_spell {
3465	my ($self, $spell) = @_;	3613	my ($self, $spell) = @_;
		3614
3466	$self->{spells}->{$spell->{name}} = $spell;	3615	$self->{spell}->{$spell->{name}} = $spell;
3467		3616	$self->rebuild_spell_list;
3468	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3469	face => $spell->{face},
3470	can_hover => 1,
3471	can_events => 1,
3472	tooltip => $spell->{message});
3473
3474	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3475	text => $spell->{name},
3476	can_hover => 1,
3477	can_events => 1,
3478	tooltip => $spell->{message},
3479	expand => 1);
3480
3481	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3482	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3483	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3484	expand => 1);
3485
3486	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3487	text => "bind to key",
3488	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3489	}
3490
3491	sub rebuild_spell_list {
3492	my ($self) = @_;
3493	$self->{tbl_idx} = 0;
3494	$self->add_spell ($_) for values %{$self->{spells}};
3495	}	3617	}
3496		3618
3497	sub remove_spell {	3619	sub remove_spell {
3498	my ($self, $spell) = @_;	3620	my ($self, $spell) = @_;
		3621
3499	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} = {};
3500	$self->rebuild_spell_list;	3630	$self->rebuild_spell_list;
3501	}	3631	}
3502		3632
3503	#############################################################################	3633	#############################################################################
3504		3634
…		…
3541	$coord = $max - $size if $coord > $max - $size;	3671	$coord = $max - $size if $coord > $max - $size;
3542		3672
3543	int $coord + 0.5	3673	int $coord + 0.5
3544	}	3674	}
3545		3675
3546	sub size_allocate {	3676	sub invoke_size_allocate {
3547	my ($self, $w, $h) = @_;	3677	my ($self, $w, $h) = @_;
3548		3678
3549	for my $child ($self->children) {	3679	for my $child ($self->children) {
3550	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)};
3551		3681
…		…
3555	$X = _to_pixel $X, $W, $self->{w};	3685	$X = _to_pixel $X, $W, $self->{w};
3556	$Y = _to_pixel $Y, $H, $self->{h};	3686	$Y = _to_pixel $Y, $H, $self->{h};
3557		3687
3558	$child->configure ($X, $Y, $W, $H);	3688	$child->configure ($X, $Y, $W, $H);
3559	}	3689	}
		3690
		3691	1
3560	}	3692	}
3561		3693
3562	sub coord2local {	3694	sub coord2local {
3563	my ($self, $x, $y) = @_;	3695	my ($self, $x, $y) = @_;
3564		3696

Diff Legend

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