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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.315 by root, Wed Jun 28 21:17:01 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	my $focus = $FOCUS; $FOCUS = $self;
429		429
430	$self->_emit (focus_in => $focus);
431
432	$focus->update if $focus;	430	$focus->update if $focus;
433	$FOCUS->update;	431	$FOCUS->update;
434	}
435		432
		433	0
		434	}
		435
436	sub focus_out {	436	sub invoke_focus_out {
437	my ($self) = @_;	437	my ($self) = @_;
438		438
439	return unless $FOCUS == $self;	439	return unless $FOCUS == $self;
440		440
441	my $focus = $FOCUS; undef $FOCUS;	441	my $focus = $FOCUS; undef $FOCUS;
442		442
443	$self->_emit (focus_out => $focus);
444
445	$focus->update if $focus; #?	443	$focus->update if $focus; #?
446		444
447	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448	unless $FOCUS;	446	unless $FOCUS;
449	}
450		447
		448	0
		449	}
		450
		451	sub grab_focus {
		452	my ($self) = @_;
		453
		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->hide };
		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;
1136		1151
1137	$self->child->configure ($border, $border, $w, $h);	1152	$self->child->configure ($border, $border, $w, $h);
1138	}
1139		1153
		1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1155	if $self->{close_button};
		1156
		1157	1
		1158	}
		1159
1140	sub button_down {	1160	sub invoke_button_down {
1141	my ($self, $ev, $x, $y) = @_;	1161	my ($self, $ev, $x, $y) = @_;
1142		1162
1143	my ($w, $h) = @$self{qw(w h)};	1163	my ($w, $h) = @$self{qw(w h)};
1144	my $border = $self->border;	1164	my $border = $self->border;
1145		1165
…		…
1176		1196
1177	($x, $y) = ($ev->{x}, $ev->{y});	1197	($x, $y) = ($ev->{x}, $ev->{y});
1178		1198
1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1199	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180	# HACK: the next line is required to enforce placement	1200	# HACK: the next line is required to enforce placement
1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1201	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182	};	1202	};
1183	} else {	1203	} else {
1184	return 0;	1204	return 0;
1185	}	1205	}
1186		1206
1187	1	1207	1
1188	}	1208	}
1189		1209
1190	sub button_up {	1210	sub invoke_button_up {
1191	my ($self, $ev, $x, $y) = @_;	1211	my ($self, $ev, $x, $y) = @_;
1192		1212
1193	!!delete $self->{motion}	1213	! ! delete $self->{motion}
1194	}	1214	}
1195		1215
1196	sub mouse_motion {	1216	sub invoke_mouse_motion {
1197	my ($self, $ev, $x, $y) = @_;	1217	my ($self, $ev, $x, $y) = @_;
1198		1218
1199	$self->{motion}->($ev, $x, $y) if $self->{motion};	1219	$self->{motion}->($ev, $x, $y) if $self->{motion};
1200		1220
1201	!!$self->{motion}	1221	! ! $self->{motion}
1202	}	1222	}
1203		1223
1204	sub _draw {	1224	sub _draw {
1205	my ($self) = @_;	1225	my ($self) = @_;
1206		1226
…		…
1232		1252
1233	glDisable GL_TEXTURE_2D;	1253	glDisable GL_TEXTURE_2D;
1234		1254
1235	$child->draw;	1255	$child->draw;
1236		1256
1237	if ($self->{title}) {	1257	if ($self->{title_widget}) {
1238	glTranslate 0, $border - $self->{h};	1258	glTranslate 0, $border - $self->{h};
1239	$self->{title}->_draw;	1259	$self->{title_widget}->_draw;
		1260
		1261	glTranslate 0, - ($border - $self->{h});
1240	}	1262	}
		1263
		1264	$self->{close_button}->draw
		1265	if $self->{close_button};
1241	}	1266	}
1242		1267
1243	#############################################################################	1268	#############################################################################
1244		1269
1245	package CFClient::UI::Table;	1270	package CFClient::UI::Table;
…		…
1268		1293
1269	$child->set_parent ($self);	1294	$child->set_parent ($self);
1270	$self->{children}[$y][$x] = $child;	1295	$self->{children}[$y][$x] = $child;
1271		1296
1272	$self->realloc;	1297	$self->realloc;
		1298	}
		1299
		1300	sub remove {
		1301	my ($self, $child) = @_;
		1302
		1303	# TODO: not yet implemented
1273	}	1304	}
1274		1305
1275	# TODO: move to container class maybe? send children a signal on removal?	1306	# TODO: move to container class maybe? send children a signal on removal?
1276	sub clear {	1307	sub clear {
1277	my ($self) = @_;	1308	my ($self) = @_;
…		…
1318	(sum @$ws),	1349	(sum @$ws),
1319	(sum @$hs),	1350	(sum @$hs),
1320	)	1351	)
1321	}	1352	}
1322		1353
1323	sub size_allocate {	1354	sub invoke_size_allocate {
1324	my ($self, $w, $h) = @_;	1355	my ($self, $w, $h) = @_;
1325		1356
1326	my ($ws, $hs) = $self->get_wh;	1357	my ($ws, $hs) = $self->get_wh;
1327		1358
1328	my $req_w = (sum @$ws) || 1;	1359	my $req_w = (sum @$ws) || 1;
…		…
1360	}	1391	}
1361		1392
1362	$y += $row_h;	1393	$y += $row_h;
1363	}	1394	}
1364		1395
		1396	1
1365	}	1397	}
1366		1398
1367	sub find_widget {	1399	sub find_widget {
1368	my ($self, $x, $y) = @_;	1400	my ($self, $x, $y) = @_;
1369		1401
…		…
1406	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1438	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1439	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1408	)	1440	)
1409	}	1441	}
1410		1442
1411	sub size_allocate {	1443	sub invoke_size_allocate {
1412	my ($self, $w, $h) = @_;	1444	my ($self, $w, $h) = @_;
1413		1445
1414	my $space = $self->{vertical} ? $h : $w;	1446	my $space = $self->{vertical} ? $h : $w;
1415	my $children = $self->{children};	1447	my @children = $self->visible_children;
1416		1448
1417	my @req;	1449	my @req;
1418		1450
1419	if ($self->{homogeneous}) {	1451	if ($self->{homogeneous}) {
1420	@req = ($space / (@$children || 1)) x @$children;	1452	@req = ($space / (@children || 1)) x @children;
1421	} else {	1453	} else {
1422	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1454	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423	my $req = List::Util::sum @req;	1455	my $req = List::Util::sum @req;
1424		1456
1425	if ($req > $space) {	1457	if ($req > $space) {
1426	# ah well, not enough space	1458	# ah well, not enough space
1427	$_ *= $space / $req for @req;	1459	$_ *= $space / $req for @req;
1428	} else {	1460	} else {
1429	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1461	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430		1462
1431	$space = ($space - $req) / $expand; # remaining space to give away	1463	$space = ($space - $req) / $expand; # remaining space to give away
1432		1464
1433	$req[$_] += $space * $children->[$_]{expand}	1465	$req[$_] += $space * $children[$_]{expand}
1434	for 0 .. $#$children;	1466	for 0 .. $#children;
1435	}	1467	}
1436	}	1468	}
1437		1469
1438	CFClient::UI::harmonize \@req;	1470	CFClient::UI::harmonize \@req;
1439		1471
1440	my $pos = 0;	1472	my $pos = 0;
1441	for (0 .. $#$children) {	1473	for (0 .. $#children) {
1442	my $alloc = $req[$_];	1474	my $alloc = $req[$_];
1443	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444		1476
1445	$pos += $alloc;	1477	$pos += $alloc;
1446	}	1478	}
1447		1479
1448	1	1480	1
…		…
1553	return if $self->{text} eq "T$text";	1585	return if $self->{text} eq "T$text";
1554	$self->{text} = "T$text";	1586	$self->{text} = "T$text";
1555		1587
1556	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557	$self->{layout}->set_text ($text);	1589	$self->{layout}->set_text ($text);
		1590
1558	delete $self->{req_h};	1591	delete $self->{size_req};
1559
1560	$self->realloc;	1592	$self->realloc;
1561	$self->update;	1593	$self->update;
1562	}	1594	}
1563		1595
1564	sub set_markup {	1596	sub set_markup {
…		…
1569		1601
1570	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571		1603
1572	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573	$self->{layout}->set_markup ($markup);	1605	$self->{layout}->set_markup ($markup);
		1606
1574	delete $self->{req_h};	1607	delete $self->{size_req};
1575
1576	$self->realloc;	1608	$self->realloc;
1577	$self->update;	1609	$self->update;
1578	}	1610	}
1579		1611
1580	sub size_request {	1612	sub size_request {
1581	my ($self) = @_;	1613	my ($self) = @_;
1582		1614
1583	if (exists $self->{req_h}) {	1615	$self->{size_req} ||= do {
1584	@$self{qw(req_w req_h)}
1585	} else {
1586	$self->{layout}->set_font ($self->{font}) if $self->{font};	1616	$self->{layout}->set_font ($self->{font}) if $self->{font};
1587	$self->{layout}->set_width ($self->{max_w} || -1);	1617	$self->{layout}->set_width ($self->{max_w} || -1);
1588	$self->{layout}->set_ellipsise ($self->{ellipsise});	1618	$self->{layout}->set_ellipsise ($self->{ellipsise});
1589	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1619	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1620	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1599		1629
1600	$w = List::Util::max $w, $w2;	1630	$w = List::Util::max $w, $w2;
1601	$h = List::Util::max $h, $h2;	1631	$h = List::Util::max $h, $h2;
1602	}	1632	}
1603		1633
1604	($w, $h)	1634	[$w, $h]
1605	}	1635	};
1606	}
1607		1636
		1637	@{ $self->{size_req} }
		1638	}
		1639
		1640	sub baseline_shift {
		1641	$_[0]{layout}->descent
		1642	}
		1643
1608	sub size_allocate {	1644	sub invoke_size_allocate {
1609	my ($self, $w, $h) = @_;	1645	my ($self, $w, $h) = @_;
1610		1646
1611	delete $self->{ox};	1647	delete $self->{ox};
1612		1648
1613	delete $self->{texture}	1649	delete $self->{texture}
1614	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1650	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1651
		1652	1
1615	}	1653	}
1616		1654
1617	sub set_fontsize {	1655	sub set_fontsize {
1618	my ($self, $fontsize) = @_;	1656	my ($self, $fontsize) = @_;
1619		1657
1620	$self->{fontsize} = $fontsize;	1658	$self->{fontsize} = $fontsize;
1621	delete $self->{texture};	1659	delete $self->{texture};
1622		1660
1623	$self->realloc;	1661	$self->realloc;
		1662	}
		1663
		1664	sub reconfigure {
		1665	my ($self) = @_;
		1666
		1667	delete $self->{size_req};
		1668
		1669	$self->SUPER::reconfigure;
1624	}	1670	}
1625		1671
1626	sub _draw {	1672	sub _draw {
1627	my ($self) = @_;	1673	my ($self) = @_;
1628		1674
…		…
1648	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649	: ($self->{h} - $tex->{h}) * 0.5);	1695	: ($self->{h} - $tex->{h}) * 0.5);
1650	};	1696	};
1651		1697
1652	glEnable GL_TEXTURE_2D;	1698	glEnable GL_TEXTURE_2D;
		1699
		1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1702
		1703	if ($tex->{format} == GL_ALPHA) {
		1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		1705	glColor @{$self->{fg}};
		1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
		1707	} else {
1653	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655	glColor_premultiply @{$self->{fg}}
1656	if $tex->{format} == GL_ALPHA;
1657
1658	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
		1710	}
1659		1711
1660	glDisable GL_TEXTURE_2D;	1712	glDisable GL_TEXTURE_2D;
1661	}	1713	}
1662		1714
1663	#############################################################################	1715	#############################################################################
…		…
1679	can_hover => 1,	1731	can_hover => 1,
1680	can_focus => 1,	1732	can_focus => 1,
1681	valign => 0,	1733	valign => 0,
1682	can_events => 1,	1734	can_events => 1,
1683	#text => ...	1735	#text => ...
		1736	#hidden => "*",
1684	@_	1737	@_
1685	)	1738	)
1686	}	1739	}
1687		1740
1688	sub _set_text {	1741	sub _set_text {
…		…
1695	$self->{last_activity} = $::NOW;	1748	$self->{last_activity} = $::NOW;
1696	$self->{text} = $text;	1749	$self->{text} = $text;
1697		1750
1698	$text =~ s/./*/g if $self->{hidden};	1751	$text =~ s/./*/g if $self->{hidden};
1699	$self->{layout}->set_text ("$text ");	1752	$self->{layout}->set_text ("$text ");
1700	delete $self->{req_h};	1753	delete $self->{size_req};
1701		1754
1702	$self->_emit (changed => $self->{text});	1755	$self->emit (changed => $self->{text});
1703		1756
1704	$self->realloc;	1757	$self->realloc;
1705	$self->update;	1758	$self->update;
1706	}	1759	}
1707		1760
…		…
1722	my ($w, $h) = $self->SUPER::size_request;	1775	my ($w, $h) = $self->SUPER::size_request;
1723		1776
1724	($w + 1, $h) # add 1 for cursor	1777	($w + 1, $h) # add 1 for cursor
1725	}	1778	}
1726		1779
1727	sub key_down {	1780	sub invoke_key_down {
1728	my ($self, $ev) = @_;	1781	my ($self, $ev) = @_;
1729		1782
1730	my $mod = $ev->{mod};	1783	my $mod = $ev->{mod};
1731	my $sym = $ev->{sym};	1784	my $sym = $ev->{sym};
1732	my $uni = $ev->{unicode};	1785	my $uni = $ev->{unicode};
…		…
1744	} elsif ($sym == CFClient::SDLK_HOME) {	1797	} elsif ($sym == CFClient::SDLK_HOME) {
1745	$self->{cursor} = 0;	1798	$self->{cursor} = 0;
1746	} elsif ($sym == CFClient::SDLK_END) {	1799	} elsif ($sym == CFClient::SDLK_END) {
1747	$self->{cursor} = length $text;	1800	$self->{cursor} = length $text;
1748	} elsif ($uni == 27) {	1801	} elsif ($uni == 27) {
1749	$self->_emit ('escape');	1802	$self->emit ('escape');
1750	} elsif ($uni) {	1803	} elsif ($uni) {
1751	substr $text, $self->{cursor}++, 0, chr $uni;	1804	substr $text, $self->{cursor}++, 0, chr $uni;
1752	} else {	1805	} else {
1753	return 0;	1806	return 0;
1754	}	1807	}
…		…
1758	$self->realloc;	1811	$self->realloc;
1759		1812
1760	1	1813	1
1761	}	1814	}
1762		1815
1763	sub focus_in {	1816	sub invoke_focus_in {
1764	my ($self) = @_;	1817	my ($self) = @_;
1765		1818
1766	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1767		1820
1768	$self->SUPER::focus_in;	1821	$self->SUPER::invoke_focus_in
1769	}	1822	}
1770		1823
1771	sub button_down {	1824	sub invoke_button_down {
1772	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1773		1826
1774	$self->SUPER::button_down ($ev, $x, $y);	1827	$self->SUPER::invoke_button_down ($ev, $x, $y);
1775		1828
1776	my $idx = $self->{layout}->xy_to_index ($x, $y);	1829	my $idx = $self->{layout}->xy_to_index ($x, $y);
1777		1830
1778	# byte-index to char-index	1831	# byte-index to char-index
1779	my $text = $self->{text};	1832	my $text = $self->{text};
…		…
1784	$self->update;	1837	$self->update;
1785		1838
1786	1	1839	1
1787	}	1840	}
1788		1841
1789	sub mouse_motion {	1842	sub invoke_mouse_motion {
1790	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1791	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1844	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792		1845
1793	0	1846	1
1794	}	1847	}
1795		1848
1796	sub _draw {	1849	sub _draw {
1797	my ($self) = @_;	1850	my ($self) = @_;
1798		1851
…		…
1839		1892
1840	our @ISA = CFClient::UI::EntryBase::;	1893	our @ISA = CFClient::UI::EntryBase::;
1841		1894
1842	use CFClient::OpenGL;	1895	use CFClient::OpenGL;
1843		1896
1844	sub key_down {	1897	sub invoke_key_down {
1845	my ($self, $ev) = @_;	1898	my ($self, $ev) = @_;
1846		1899
1847	my $sym = $ev->{sym};	1900	my $sym = $ev->{sym};
1848		1901
1849	if ($sym == 13) {	1902	if ($sym == 13) {
1850	unshift @{$self->{history}},	1903	unshift @{$self->{history}},
1851	my $txt = $self->get_text;	1904	my $txt = $self->get_text;
		1905
1852	$self->{history_pointer} = -1;	1906	$self->{history_pointer} = -1;
1853	$self->{history_saveback} = '';	1907	$self->{history_saveback} = '';
1854	$self->_emit (activate => $txt);	1908	$self->emit (activate => $txt);
1855	$self->update;	1909	$self->update;
1856		1910
1857	} elsif ($sym == CFClient::SDLK_UP) {	1911	} elsif ($sym == CFClient::SDLK_UP) {
1858	if ($self->{history_pointer} < 0) {	1912	if ($self->{history_pointer} < 0) {
1859	$self->{history_saveback} = $self->get_text;	1913	$self->{history_saveback} = $self->get_text;
…		…
1875	} else {	1929	} else {
1876	$self->set_text ($self->{history_saveback});	1930	$self->set_text ($self->{history_saveback});
1877	}	1931	}
1878		1932
1879	} else {	1933	} else {
1880	return $self->SUPER::key_down ($ev)	1934	return $self->SUPER::invoke_key_down ($ev)
1881	}	1935	}
1882		1936
1883	1	1937	1
1884	}	1938	}
1885		1939
…		…
1909	can_events => 1,	1963	can_events => 1,
1910	@_	1964	@_
1911	)	1965	)
1912	}	1966	}
1913		1967
1914	sub activate { }
1915
1916	sub button_up {	1968	sub invoke_button_up {
1917	my ($self, $ev, $x, $y) = @_;	1969	my ($self, $ev, $x, $y) = @_;
1918		1970
1919	$self->emit ("activate")	1971	$self->emit ("activate")
1920	if $x >= 0 && $x < $self->{w}	1972	if $x >= 0 && $x < $self->{w}
1921	&& $y >= 0 && $y < $self->{h};	1973	&& $y >= 0 && $y < $self->{h};
…		…
1935	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936		1988
1937	glDisable GL_TEXTURE_2D;	1989	glDisable GL_TEXTURE_2D;
1938		1990
1939	$self->SUPER::_draw;	1991	$self->SUPER::_draw;
		1992	}
		1993
		1994	#############################################################################
		1995
		1996	package CFClient::UI::ImageButton;
		1997
		1998	our @ISA = CFClient::UI::Image::;
		1999
		2000	use CFClient::OpenGL;
		2001
		2002	my %textures;
		2003
		2004	sub new {
		2005	my $class = shift;
		2006
		2007	my $self = $class->SUPER::new (
		2008	padding_x => 4,
		2009	padding_y => 4,
		2010	fg => [1, 1, 1],
		2011	active_fg => [0, 0, 1],
		2012	can_hover => 1,
		2013	align => 0,
		2014	valign => 0,
		2015	can_events => 1,
		2016	@_
		2017	);
		2018	}
		2019
		2020	sub invoke_button_up {
		2021	my ($self, $ev, $x, $y) = @_;
		2022
		2023	$self->emit ("activate")
		2024	if $x >= 0 && $x < $self->{w}
		2025	&& $y >= 0 && $y < $self->{h};
		2026
		2027	1
1940	}	2028	}
1941		2029
1942	#############################################################################	2030	#############################################################################
1943		2031
1944	package CFClient::UI::CheckBox;	2032	package CFClient::UI::CheckBox;
…		…
1971	my ($self) = @_;	2059	my ($self) = @_;
1972		2060
1973	(6) x 2	2061	(6) x 2
1974	}	2062	}
1975		2063
1976	sub button_down {	2064	sub invoke_button_down {
1977	my ($self, $ev, $x, $y) = @_;	2065	my ($self, $ev, $x, $y) = @_;
1978		2066
1979	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981	$self->{state} = !$self->{state};	2069	$self->{state} = !$self->{state};
1982	$self->_emit (changed => $self->{state});	2070	$self->emit (changed => $self->{state});
1983	} else {	2071	} else {
1984	return 0	2072	return 0
1985	}	2073	}
1986		2074
1987	1	2075	1
…		…
2012	package CFClient::UI::Image;	2100	package CFClient::UI::Image;
2013		2101
2014	our @ISA = CFClient::UI::Base::;	2102	our @ISA = CFClient::UI::Base::;
2015		2103
2016	use CFClient::OpenGL;	2104	use CFClient::OpenGL;
2017	use Carp qw/confess/;
2018		2105
2019	our %loaded_images;	2106	our %texture_cache;
2020		2107
2021	sub new {	2108	sub new {
2022	my $class = shift;	2109	my $class = shift;
2023		2110
2024	my $self = $class->SUPER::new (can_events => 0, @_);	2111	my $self = $class->SUPER::new (
		2112	can_events => 0,
		2113	@_,
		2114	);
2025		2115
2026	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2116	$self->{path}
		2117	or Carp::croak "required attribute 'path' not set";
2027		2118
2028	$loaded_images{$self->{image}} ||=	2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2029	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2030		2121
2031	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2032		2123
2033	Scalar::Util::weaken $loaded_images{$self->{image}};	2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035	$self->{aspect} = $tex->{w} / $tex->{h};
2036		2125
2037	$self	2126	$self
2038	}	2127	}
2039		2128
2040	sub size_request {	2129	sub size_request {
2041	my ($self) = @_;	2130	my ($self) = @_;
2042		2131
2043	($self->{tex}->{w}, $self->{tex}->{h})	2132	($self->{tex}{w}, $self->{tex}{h})
2044	}	2133	}
2045		2134
2046	sub _draw {	2135	sub _draw {
2047	my ($self) = @_;	2136	my ($self) = @_;
2048		2137
…		…
2284	$self->update;	2373	$self->update;
2285		2374
2286	$self	2375	$self
2287	}	2376	}
2288		2377
2289	sub changed { }
2290
2291	sub set_range {	2378	sub set_range {
2292	my ($self, $range) = @_;	2379	my ($self, $range) = @_;
2293		2380
2294	($range, $self->{range}) = ($self->{range}, $range);	2381	($range, $self->{range}) = ($self->{range}, $range);
2295		2382
2296	$self->update
2297	if "@$range" ne "@{$self->{range}}";	2383	if ("@$range" ne "@{$self->{range}}") {
		2384	$self->update;
		2385	$self->set_value ($self->{range}[0]);
		2386	}
2298	}	2387	}
2299		2388
2300	sub set_value {	2389	sub set_value {
2301	my ($self, $value) = @_;	2390	my ($self, $value) = @_;
2302		2391
…		…
2313	if $unit;	2402	if $unit;
2314		2403
2315	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2404	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316		2405
2317	if ($value != $old_value) {	2406	if ($value != $old_value) {
2318	$self->_emit (changed => $value);	2407	$self->emit (changed => $value);
2319	$self->update;	2408	$self->update;
2320	}	2409	}
2321	}	2410	}
2322		2411
2323	sub size_request {	2412	sub size_request {
2324	my ($self) = @_;	2413	my ($self) = @_;
2325		2414
2326	($self->{req_w}, $self->{req_h})	2415	($self->{req_w}, $self->{req_h})
2327	}	2416	}
2328		2417
2329	sub button_down {	2418	sub invoke_button_down {
2330	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2331		2420
2332	$self->SUPER::button_down ($ev, $x, $y);	2421	$self->SUPER::invoke_button_down ($ev, $x, $y);
2333		2422
2334	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335		2424
2336	$self->mouse_motion ($ev, $x, $y)	2425	$self->invoke_mouse_motion ($ev, $x, $y)
2337	}	2426	}
2338		2427
2339	sub mouse_motion {	2428	sub invoke_mouse_motion {
2340	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
2341		2430
2342	if ($GRAB == $self) {	2431	if ($GRAB == $self) {
2343	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344		2433
…		…
2449	sub set_range { shift->{slider}->set_range (@_) }	2538	sub set_range { shift->{slider}->set_range (@_) }
2450	sub set_value { shift->{slider}->set_value (@_) }	2539	sub set_value { shift->{slider}->set_value (@_) }
2451		2540
2452	#############################################################################	2541	#############################################################################
2453		2542
2454	package CFClient::UI::TextView;	2543	package CFClient::UI::TextScroller;
2455		2544
2456	our @ISA = CFClient::UI::HBox::;	2545	our @ISA = CFClient::UI::HBox::;
2457		2546
2458	use CFClient::OpenGL;	2547	use CFClient::OpenGL;
2459		2548
…		…
2461	my $class = shift;	2550	my $class = shift;
2462		2551
2463	my $self = $class->SUPER::new (	2552	my $self = $class->SUPER::new (
2464	fontsize => 1,	2553	fontsize => 1,
2465	can_events => 0,	2554	can_events => 0,
		2555	indent => 0,
2466	#font => default_font	2556	#font => default_font
2467	@_,	2557	@_,
2468		2558
2469	layout => (new CFClient::Layout 1),	2559	layout => (new CFClient::Layout 1),
2470	par => [],	2560	par => [],
…		…
2485		2575
2486	$self->{fontsize} = $fontsize;	2576	$self->{fontsize} = $fontsize;
2487	$self->reflow;	2577	$self->reflow;
2488	}	2578	}
2489		2579
		2580	sub size_request {
		2581	my ($self) = @_;
		2582
		2583	my ($empty, $slider) = @{ $self->{children} };
		2584
		2585	local $self->{children} = [$empty, $slider];
		2586	$self->SUPER::size_request
		2587	}
		2588
2490	sub size_allocate {	2589	sub invoke_size_allocate {
2491	my ($self, $w, $h) = @_;	2590	my ($self, $w, $h) = @_;
2492		2591
2493	$self->SUPER::size_allocate ($w, $h);	2592	my ($empty, $slider, @other) = @{ $self->{children} };
		2593	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494		2594
2495	$self->{layout}->set_font ($self->{font}) if $self->{font};	2595	$self->{layout}->set_font ($self->{font}) if $self->{font};
2496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2596	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497	$self->{layout}->set_width ($self->{children}[0]{w});	2597	$self->{layout}->set_width ($empty->{w});
		2598	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498		2599
2499	$self->reflow;	2600	$self->reflow;
2500	}
2501		2601
2502	sub text_size {	2602	local $self->{children} = [$empty, $slider];
2503	my ($self, $text, $indent) = @_;	2603	$self->SUPER::invoke_size_allocate ($w, $h)
		2604	}
		2605
		2606	sub get_layout {
		2607	my ($self, $para) = @_;
2504		2608
2505	my $layout = $self->{layout};	2609	my $layout = $self->{layout};
2506		2610
		2611	$layout->set_font ($self->{font}) if $self->{font};
		2612	$layout->set_foreground (@{$para->{fg}});
2507	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2613	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508	$layout->set_width ($self->{children}[0]{w} - $indent);	2614	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2615	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509	$layout->set_markup ($text);	2616	$layout->set_markup ($para->{markup});
		2617
		2618	$layout->set_shapes (
		2619	map
		2620	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2621	@{$para->{widget}}
2510		2622	);
		2623
2511	$layout->size	2624	$layout
2512	}	2625	}
2513		2626
2514	sub reflow {	2627	sub reflow {
2515	my ($self) = @_;	2628	my ($self) = @_;
2516		2629
…		…
2525	$self->{children}[1]->set_value ($offset);	2638	$self->{children}[1]->set_value ($offset);
2526	}	2639	}
2527		2640
2528	sub clear {	2641	sub clear {
2529	my ($self) = @_;	2642	my ($self) = @_;
		2643
		2644	my (undef, undef, @other) = @{ $self->{children} };
		2645	$self->remove ($_) for @other;
2530		2646
2531	$self->{par} = [];	2647	$self->{par} = [];
2532	$self->{height} = 0;	2648	$self->{height} = 0;
2533	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2649	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534	}	2650	}
2535		2651
2536	sub add_paragraph {	2652	sub add_paragraph {
2537	my ($self, $color, $text, $indent) = @_;	2653	my ($self, $color, $para, $indent) = @_;
2538		2654
2539	for my $line (split /\n/, $text) {	2655	my ($text, @w) = ref $para ? @$para : $para;
2540	my ($w, $h) = $self->text_size ($line);	2656
2541	$self->{height} += $h;	2657	$para = {
2542	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2658	w => 1e10,
		2659	wrapped => 1,
		2660	fg => $color,
		2661	indent => $indent,
		2662	markup => $text,
		2663	widget => \@w,
2543	}	2664	};
2544		2665
2545	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2666	$self->add (@w) if @w;
		2667	push @{$self->{par}}, $para;
		2668
		2669	$self->{need_reflow}++;
		2670	$self->update;
		2671	}
		2672
		2673	sub scroll_to_bottom {
		2674	my ($self) = @_;
		2675
		2676	$self->{scroll_to_bottom} = 1;
		2677	$self->update;
2546	}	2678	}
2547		2679
2548	sub update {	2680	sub update {
2549	my ($self) = @_;	2681	my ($self) = @_;
2550		2682
…		…
2552		2684
2553	return unless $self->{h} > 0;	2685	return unless $self->{h} > 0;
2554		2686
2555	delete $self->{texture};	2687	delete $self->{texture};
2556		2688
2557	$ROOT->on_post_alloc ($self, sub {	2689	$ROOT->on_post_alloc ($self => sub {
2558	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2690	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559		2691
2560	if (delete $self->{need_reflow}) {	2692	if (delete $self->{need_reflow}) {
2561	my $height = 0;	2693	my $height = 0;
2562		2694
2563	my $layout = $self->{layout};
2564
2565	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567	for (@{$self->{par}}) {	2695	for my $para (@{$self->{par}}) {
2568	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2696	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569	$layout->set_width ($W - $_->[3]);	2697	my $layout = $self->get_layout ($para);
2570	$layout->set_markup ($_->[4]);
2571	my ($w, $h) = $layout->size;	2698	my ($w, $h) = $layout->size;
2572	$_->[0] = $w + $_->[3];	2699
2573	$_->[1] = $h;	2700	$para->{w} = $w + $para->{indent};
		2701	$para->{h} = $h;
		2702	$para->{wrapped} = $layout->has_wrapped;
2574	}	2703	}
2575		2704
2576	$height += $_->[1];	2705	$height += $para->{h};
2577	}	2706	}
2578		2707
2579	$self->{height} = $height;	2708	$self->{height} = $height;
2580		2709
2581	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2710	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582		2711
2583	delete $self->{texture};	2712	delete $self->{texture};
		2713	}
		2714
		2715	if (delete $self->{scroll_to_bottom}) {
		2716	$self->{children}[1]->set_value (1e10);
2584	}	2717	}
2585		2718
2586	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2719	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587	glClearColor 0, 0, 0, 0;	2720	glClearColor 0, 0, 0, 0;
2588	glClear GL_COLOR_BUFFER_BIT;	2721	glClear GL_COLOR_BUFFER_BIT;
…		…
2592	my $y0 = $top;	2725	my $y0 = $top;
2593	my $y1 = $top + $H;	2726	my $y1 = $top + $H;
2594		2727
2595	my $y = 0;	2728	my $y = 0;
2596		2729
2597	my $layout = $self->{layout};
2598
2599	$layout->set_font ($self->{font}) if $self->{font};
2600
2601	glEnable GL_BLEND;	2730	glEnable GL_BLEND;
2602	#TODO# not correct in windows where rgba is forced off	2731	#TODO# not correct in windows where rgba is forced off
2603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2732	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604		2733
2605	for my $par (@{$self->{par}}) {	2734	for my $para (@{$self->{par}}) {
2606	my $h = $par->[1];	2735	my $h = $para->{h};
2607		2736
2608	if ($y0 < $y + $h && $y < $y1) {	2737	if ($y0 < $y + $h && $y < $y1) {
2609	$layout->set_foreground (@{ $par->[2] });	2738
2610	$layout->set_width ($W - $par->[3]);	2739	my $layout = $self->get_layout ($para);
2611	$layout->set_markup ($par->[4]);
2612		2740
2613	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2741	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614		2742
2615	glRasterPos $par->[3], $y - $y0;	2743	glRasterPos $para->{indent}, $y - $y0;
2616	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2744	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2745
		2746	if (my @w = @{ $para->{widget} }) {
		2747	my @s = $layout->get_shapes;
		2748
		2749	glDisable GL_BLEND;
		2750	for (@w) {
		2751	my ($dx, $dy) = splice @s, 0, 2, ();
		2752
		2753	$_->{x} = $dx + $para->{indent};
		2754	$_->{y} = $dy + $y - $y0;
		2755
		2756	$_->draw;
		2757	}
		2758	glEnable GL_BLEND;
		2759	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2760	}
2617	}	2761	}
2618		2762
2619	$y += $h;	2763	$y += $h;
2620	}	2764	}
2621		2765
2622	glDisable GL_BLEND;	2766	glDisable GL_BLEND;
2623	};	2767	};
2624	});	2768	});
		2769	}
		2770
		2771	sub reconfigure {
		2772	my ($self) = @_;
		2773
		2774	$self->SUPER::reconfigure;
		2775
		2776	$_->{w} = 1e10 for @{ $self->{par} };
		2777	$self->reflow;
2625	}	2778	}
2626		2779
2627	sub _draw {	2780	sub _draw {
2628	my ($self) = @_;	2781	my ($self) = @_;
2629		2782
…		…
2632	glColor 0, 0, 0, 1;	2785	glColor 0, 0, 0, 1;
2633	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2786	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634	glDisable GL_TEXTURE_2D;	2787	glDisable GL_TEXTURE_2D;
2635		2788
2636	$self->{children}[1]->draw;	2789	$self->{children}[1]->draw;
2637
2638	}	2790	}
2639		2791
2640	#############################################################################	2792	#############################################################################
2641		2793
2642	package CFClient::UI::Animator;	2794	package CFClient::UI::Animator;
…		…
2729	$tooltip .= "\n\n" . (ref $widget) . "\n"	2881	$tooltip .= "\n\n" . (ref $widget) . "\n"
2730	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2882	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731	. "req $widget->{req_w} $widget->{req_h}\n"	2883	. "req $widget->{req_w} $widget->{req_h}\n"
2732	. "visible $widget->{visible}";	2884	. "visible $widget->{visible}";
2733	}	2885	}
		2886
		2887	$tooltip =~ s/^\n+//;
		2888	$tooltip =~ s/\n+$//;
2734		2889
2735	$self->add (new CFClient::UI::Label	2890	$self->add (new CFClient::UI::Label
2736	markup => $tooltip,	2891	markup => $tooltip,
2737	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2892	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738	fontsize => 0.8,	2893	fontsize => 0.8,
…		…
2748	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2903	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749		2904
2750	($w + 4, $h + 4)	2905	($w + 4, $h + 4)
2751	}	2906	}
2752		2907
2753	sub size_allocate {	2908	sub invoke_size_allocate {
2754	my ($self, $w, $h) = @_;	2909	my ($self, $w, $h) = @_;
2755		2910
2756	$self->SUPER::size_allocate ($w - 4, $h - 4);	2911	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757	}	2912	}
2758		2913
2759	sub visibility_change {	2914	sub invoke_visibility_change {
2760	my ($self, $visible) = @_;	2915	my ($self, $visible) = @_;
2761		2916
2762	return unless $visible;	2917	return unless $visible;
2763		2918
2764	$self->{root}->on_post_alloc ("move_$self" => sub {	2919	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2766	or return;	2921	or return;
2767		2922
2768	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2923	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769		2924
2770	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2925	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771	if $x + $self->{w} > $::WIDTH;	2926	if $x + $self->{w} > $self->{root}{w};
2772		2927
2773	$self->move_abs ($x, $y);	2928	$self->move_abs ($x, $y);
2774	});	2929	});
2775	}	2930	}
2776		2931
…		…
2871	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3026	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872	glDisable GL_TEXTURE_2D;	3027	glDisable GL_TEXTURE_2D;
2873	}	3028	}
2874	}	3029	}
2875		3030
2876	sub DESTROY {	3031	sub destroy {
2877	my ($self) = @_;	3032	my ($self) = @_;
2878		3033
2879	$self->{timer}->cancel	3034	$self->{timer}->cancel
2880	if $self->{timer};	3035	if $self->{timer};
2881		3036
2882	$self->SUPER::DESTROY;	3037	$self->SUPER::destroy;
2883	}	3038	}
2884		3039
2885	#############################################################################	3040	#############################################################################
2886		3041
2887	package CFClient::UI::Buttonbar;	3042	package CFClient::UI::Buttonbar;
…		…
2908	);	3063	);
2909		3064
2910	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3065	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2911		3066
2912	for my $item (@{ $self->{items} }) {	3067	for my $item (@{ $self->{items} }) {
2913	my ($widget, $cb) = @$item;	3068	my ($widget, $cb, $tooltip) = @$item;
2914		3069
2915	# handle various types of items, only text for now	3070	# handle various types of items, only text for now
2916	if (!ref $widget) {	3071	if (!ref $widget) {
2917	$widget = new CFClient::UI::Label	3072	$widget = new CFClient::UI::Label
2918	can_hover => 1,	3073	can_hover => 1,
2919	can_events => 1,	3074	can_events => 1,
2920	text => $widget;	3075	markup => $widget,
		3076	tooltip => $tooltip
2921	}	3077	}
2922		3078
2923	$self->{item}{$widget} = $item;	3079	$self->{item}{$widget} = $item;
2924		3080
2925	$self->{vbox}->add ($widget);	3081	$self->{vbox}->add ($widget);
…		…
2930		3086
2931	# popup given the event (must be a mouse button down event currently)	3087	# popup given the event (must be a mouse button down event currently)
2932	sub popup {	3088	sub popup {
2933	my ($self, $ev) = @_;	3089	my ($self, $ev) = @_;
2934		3090
2935	$self->_emit ("popdown");	3091	$self->emit ("popdown");
2936		3092
2937	# maybe save $GRAB? must be careful about events...	3093	# maybe save $GRAB? must be careful about events...
2938	$GRAB = $self;	3094	$GRAB = $self;
2939	$self->{button} = $ev->{button};	3095	$self->{button} = $ev->{button};
2940		3096
2941	$self->show;	3097	$self->show;
2942	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3098	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943	}	3099	}
2944		3100
2945	sub mouse_motion {	3101	sub invoke_mouse_motion {
2946	my ($self, $ev, $x, $y) = @_;	3102	my ($self, $ev, $x, $y) = @_;
2947		3103
2948	# TODO: should use vbox->find_widget or so	3104	# TODO: should use vbox->find_widget or so
2949	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3105	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950	$self->{hover} = $self->{item}{$HOVER};	3106	$self->{hover} = $self->{item}{$HOVER};
2951		3107
2952	0	3108	0
2953	}	3109	}
2954		3110
2955	sub button_up {	3111	sub invoke_button_up {
2956	my ($self, $ev, $x, $y) = @_;	3112	my ($self, $ev, $x, $y) = @_;
2957		3113
2958	if ($ev->{button} == $self->{button}) {	3114	if ($ev->{button} == $self->{button}) {
2959	undef $GRAB;	3115	undef $GRAB;
2960	$self->hide;	3116	$self->hide;
2961		3117
2962	$self->_emit ("popdown");	3118	$self->emit ("popdown");
2963	$self->{hover}[1]->() if $self->{hover};	3119	$self->{hover}[1]->() if $self->{hover};
2964	} else {	3120	} else {
2965	return 0	3121	return 0
2966	}	3122	}
2967		3123
…		…
3004	: $self->{children}[$page_or_widget];	3160	: $self->{children}[$page_or_widget];
3005		3161
3006	$self->{current} = $widget;	3162	$self->{current} = $widget;
3007	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3163	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008		3164
3009	$self->_emit (page_changed => $self->{current});	3165	$self->emit (page_changed => $self->{current});
3010		3166
3011	$self->realloc;	3167	$self->realloc;
3012	}	3168	}
3013		3169
3014	sub visible_children {	3170	sub visible_children {
…		…
3019	my ($self) = @_;	3175	my ($self) = @_;
3020		3176
3021	$self->{current}->size_request	3177	$self->{current}->size_request
3022	}	3178	}
3023		3179
3024	sub size_allocate {	3180	sub invoke_size_allocate {
3025	my ($self, $w, $h) = @_;	3181	my ($self, $w, $h) = @_;
3026		3182
3027	$self->{current}->configure (0, 0, $w, $h);	3183	$self->{current}->configure (0, 0, $w, $h);
		3184
		3185	1
3028	}	3186	}
3029		3187
3030	sub _draw {	3188	sub _draw {
3031	my ($self) = @_;	3189	my ($self) = @_;
3032		3190
…		…
3071		3229
3072	sub set_current_page {	3230	sub set_current_page {
3073	my ($self, $page) = @_;	3231	my ($self, $page) = @_;
3074		3232
3075	$self->{multiplexer}->set_current_page ($page);	3233	$self->{multiplexer}->set_current_page ($page);
3076	$self->_emit (page_changed => $self->{multiplexer}{current});	3234	$self->emit (page_changed => $self->{multiplexer}{current});
		3235	}
		3236
		3237	#############################################################################
		3238
		3239	package CFClient::UI::Combobox;
		3240
		3241	use utf8;
		3242
		3243	our @ISA = CFClient::UI::Button::;
		3244
		3245	sub new {
		3246	my $class = shift;
		3247
		3248	my $self = $class->SUPER::new (
		3249	options => [], # [value, title, longdesc], ...
		3250	value => undef,
		3251	@_,
		3252	);
		3253
		3254	$self->_set_value ($self->{value});
		3255
		3256	$self
		3257	}
		3258
		3259	sub invoke_button_down {
		3260	my ($self, $ev) = @_;
		3261
		3262	my @menu_items;
		3263
		3264	for (@{ $self->{options} }) {
		3265	my ($value, $title, $tooltip) = @$_;
		3266
		3267	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3268	}
		3269
		3270	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3271	}
		3272
		3273	sub _set_value {
		3274	my ($self, $value) = @_;
		3275
		3276	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3277	or return;
		3278
		3279	$self->{value} = $item->[0];
		3280	$self->set_markup ("$item->[1] ⇓");
		3281	$self->set_tooltip ($item->[2]);
		3282	}
		3283
		3284	sub set_value {
		3285	my ($self, $value) = @_;
		3286
		3287	return unless $self->{value} ne $value;
		3288
		3289	$self->_set_value ($value);
		3290	$self->emit (changed => $value);
3077	}	3291	}
3078		3292
3079	#############################################################################	3293	#############################################################################
3080		3294
3081	package CFClient::UI::Statusbox;	3295	package CFClient::UI::Statusbox;
…		…
3180	$item->{count}++;	3394	$item->{count}++;
3181	} else {	3395	} else {
3182	$item->{count} = 1;	3396	$item->{count} = 1;
3183	$item->{text} = $item->{tooltip} = $text;	3397	$item->{text} = $item->{tooltip} = $text;
3184	}	3398	}
3185	$item->{id} = ++$self->{id};	3399	$item->{id} += 0.2;#d#
3186	$item->{timeout} = $timeout;	3400	$item->{timeout} = $timeout;
3187	delete $item->{label};	3401	delete $item->{label};
3188	} else {	3402	} else {
3189	$self->{item}{$group} = {	3403	$self->{item}{$group} = {
3190	id => ++$self->{id},	3404	id => ++$self->{id},
…		…
3196	count => 1,	3410	count => 1,
3197	%arg,	3411	%arg,
3198	};	3412	};
3199	}	3413	}
3200		3414
		3415	$ROOT->on_refresh (reorder => sub {
3201	$self->reorder;	3416	$self->reorder;
		3417	});
3202	}	3418	}
3203		3419
3204	sub reconfigure {	3420	sub reconfigure {
3205	my ($self) = @_;	3421	my ($self) = @_;
3206		3422
…		…
3209		3425
3210	$self->reorder;	3426	$self->reorder;
3211	$self->SUPER::reconfigure;	3427	$self->SUPER::reconfigure;
3212	}	3428	}
3213		3429
3214	sub DESTROY {	3430	sub destroy {
3215	my ($self) = @_;	3431	my ($self) = @_;
3216		3432
3217	$self->{timer}->cancel;	3433	$self->{timer}->cancel;
3218		3434
3219	$self->SUPER::DESTROY;	3435	$self->SUPER::destroy;
3220	}	3436	}
3221		3437
3222	#############################################################################	3438	#############################################################################
3223		3439
3224	package CFClient::UI::Inventory;	3440	package CFClient::UI::Inventory;
…		…
3243	return unless $items;	3459	return unless $items;
3244		3460
3245	my @items = sort {	3461	my @items = sort {
3246	($a->{type} <=> $b->{type})	3462	($a->{type} <=> $b->{type})
3247	or ($a->{name} cmp $b->{name})	3463	or ($a->{name} cmp $b->{name})
3248	} @$items;	3464	} values %$items;
3249		3465
3250	$self->{real_items} = \@items;	3466	$self->{real_items} = \@items;
3251		3467
3252	my $row = 0;	3468	my $row = 0;
3253	for my $item (@items) {	3469	for my $item (@items) {
…		…
3256	$self->{child}->add (0, $row, $item->{face_widget});	3472	$self->{child}->add (0, $row, $item->{face_widget});
3257	$self->{child}->add (1, $row, $item->{desc_widget});	3473	$self->{child}->add (1, $row, $item->{desc_widget});
3258	$self->{child}->add (2, $row, $item->{weight_widget});	3474	$self->{child}->add (2, $row, $item->{weight_widget});
3259		3475
3260	$row++;	3476	$row++;
3261	}
3262	}
3263
3264	#############################################################################
3265
3266	package CFClient::UI::BindEditor;
3267
3268	our @ISA = CFClient::UI::FancyFrame::;
3269
3270	sub new {
3271	my $class = shift;
3272
3273	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275	$self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279	text => "start recording",
3280	tooltip => "Start/Stops recording of actions."
3281	."All subsequent actions after the recording started will be captured."
3282	."The actions are displayed after the record was stopped."
3283	."To bind the action you have to click on the 'Bind' button",
3284	on_activate => sub {
3285	unless ($self->{recording}) {
3286	$self->start;
3287	} else {
3288	$self->stop;
3289	}
3290	});
3291
3292	$vb->add (new CFClient::UI::Label text => "Actions:");
3293	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3296	$vb->add (my $hb = new CFClient::UI::HBox);
3297	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298	$hb->add (new CFClient::UI::Button
3299	text => "bind",
3300	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301	on_activate => sub {
3302	$self->ask_for_bind;
3303	});
3304
3305	$vb->add (my $hb = new CFClient::UI::HBox);
3306	$hb->add (new CFClient::UI::Button
3307	text => "ok",
3308	expand => 1,
3309	tooltip => "This closes the binding editor and saves the binding",
3310	on_activate => sub {
3311	$self->hide;
3312	$self->commit;
3313	});
3314
3315	$hb->add (new CFClient::UI::Button
3316	text => "cancel",
3317	expand => 1,
3318	tooltip => "This closes the binding editor without saving",
3319	on_activate => sub {
3320	$self->hide;
3321	$self->{binding_cancel}->()
3322	if $self->{binding_cancel};
3323	});
3324
3325	$self->update_binding_widgets;
3326
3327	$self
3328	}
3329
3330	sub commit {
3331	my ($self) = @_;
3332	my ($mod, $sym, $cmds) = $self->get_binding;
3333	if ($sym != 0 && @$cmds > 0) {
3334	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335	."'. Don't forget 'Save Config'!");
3336	$self->{binding_change}->($mod, $sym, $cmds)
3337	if $self->{binding_change};
3338	} else {
3339	$::STATUSBOX->add ("No action bound, no key or action specified!");
3340	$self->{binding_cancel}->()
3341	if $self->{binding_cancel};
3342	}
3343	}
3344
3345	sub start {
3346	my ($self) = @_;
3347
3348	$self->{rec_btn}->set_text ("stop recording");
3349	$self->{recording} = 1;
3350	$self->clear_command_list;
3351	$::CONN->start_record if $::CONN;
3352	}
3353
3354	sub stop {
3355	my ($self) = @_;
3356
3357	$self->{rec_btn}->set_text ("start recording");
3358	$self->{recording} = 0;
3359
3360	my $rec;
3361	$rec = $::CONN->stop_record if $::CONN;
3362	return unless ref $rec eq 'ARRAY';
3363	$self->set_command_list ($rec);
3364	}
3365
3366
3367	sub ask_for_bind_and_commit {
3368	my ($self) = @_;
3369	$self->ask_for_bind (1);
3370	}
3371
3372	sub ask_for_bind {
3373	my ($self, $commit) = @_;
3374
3375	CFClient::Binder::open_binding_dialog (sub {
3376	my ($mod, $sym) = @_;
3377	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378	$self->update_binding_widgets;
3379	$self->commit if $commit;
3380	});
3381	}
3382
3383	# $mod and $sym are the modifiers and key symbol
3384	# $cmds is a array ref of strings (the commands)
3385	# $cb is the callback that is executed on OK
3386	# $ccb is the callback that is executed on CANCEL and
3387	# when the binding was unsuccessful on OK
3388	sub set_binding {
3389	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391	$self->clear_command_list;
3392	$self->{recording} = 0;
3393	$self->{rec_btn}->set_text ("start recording");
3394
3395	$self->{binding} = [$mod, $sym];
3396	$self->{commands} = $cmds;
3397
3398	$self->{binding_change} = $cb;
3399	$self->{binding_cancel} = $ccb;
3400
3401	$self->update_binding_widgets;
3402	}
3403
3404	# this is a shortcut method that asks for a binding
3405	# and then just binds it.
3406	sub do_quick_binding {
3407	my ($self, $cmds) = @_;
3408	$self->set_binding (undef, undef, $cmds, sub {
3409	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410	});
3411	$self->ask_for_bind (1);
3412	}
3413
3414	sub update_binding_widgets {
3415	my ($self) = @_;
3416	my ($mod, $sym, $cmds) = $self->get_binding;
3417	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418	$self->set_command_list ($cmds);
3419	}
3420
3421	sub get_binding {
3422	my ($self) = @_;
3423	return (
3424	$self->{binding}->[0],
3425	$self->{binding}->[1],
3426	[ grep { defined $_ } @{$self->{commands}} ]
3427	);
3428	}
3429
3430	sub clear_command_list {
3431	my ($self) = @_;
3432	$self->{cmdbox}->clear ();
3433	}
3434
3435	sub set_command_list {
3436	my ($self, $cmds) = @_;
3437
3438	$self->{cmdbox}->clear ();
3439	$self->{commands} = $cmds;
3440
3441	my $idx = 0;
3442
3443	for (@$cmds) {
3444	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446	my $i = $idx;
3447	$hb->add (new CFClient::UI::Label text => $_);
3448	$hb->add (new CFClient::UI::Button
3449	text => "delete",
3450	tooltip => "Deletes the action from the record",
3451	on_activate => sub {
3452	$self->{cmdbox}->remove ($hb);
3453	$cmds->[$i] = undef;
3454	});
3455
3456
3457	$idx++
3458	}	3477	}
3459	}	3478	}
3460		3479
3461	#############################################################################	3480	#############################################################################
3462		3481
…		…
3472	commands => [],	3491	commands => [],
3473	@_,	3492	@_,
3474	)	3493	)
3475	}	3494	}
3476		3495
3477	# XXX: Do sorting? Argl...	3496	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3497
		3498	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3499	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3500	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3501	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3502	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3503	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3504	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3505	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3506	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3507	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3508
		3509	sub rebuild_spell_list {
		3510	my ($self) = @_;
		3511
		3512	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3513	$self->clear;
		3514
		3515	return unless $::CONN;
		3516
		3517	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3518	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3519	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3520	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3521	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3522
		3523	my $row = 0;
		3524
		3525	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3526	my $spell = $self->{spell}{$_};
		3527
		3528	$row++;
		3529
		3530	my $spell_cb = sub {
		3531	my ($widget, $ev) = @_;
		3532
		3533	if ($ev->{button} == 1) {
		3534	$::CONN->user_send ("cast $spell->{name}");
		3535	} elsif ($ev->{button} == 2) {
		3536	$::CONN->user_send ("invoke $spell->{name}");
		3537	} elsif ($ev->{button} == 3) {
		3538	(new CFClient::UI::Menu
		3539	items => [
		3540	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3541	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3542	],
		3543	)->popup ($ev);
		3544	} else {
		3545	return 0;
		3546	}
		3547
		3548	1
		3549	};
		3550
		3551	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3552
		3553	#TODO: add path info to tooltip
		3554	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3555
		3556	$self->add (0, $row, new CFClient::UI::Face
		3557	face => $spell->{face},
		3558	can_hover => 1,
		3559	can_events => 1,
		3560	tooltip => $tooltip,
		3561	on_button_down => $spell_cb,
		3562	);
		3563
		3564	$self->add (1, $row, new CFClient::UI::Label
		3565	expand => 1,
		3566	text => $spell->{name},
		3567	can_hover => 1,
		3568	can_events => 1,
		3569	tooltip => $tooltip,
		3570	on_button_down => $spell_cb,
		3571	);
		3572
		3573	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3574	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3575	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3576	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3577	}
		3578	});
		3579	}
		3580
3478	sub add_spell {	3581	sub add_spell {
3479	my ($self, $spell) = @_;	3582	my ($self, $spell) = @_;
		3583
3480	$self->{spells}->{$spell->{name}} = $spell;	3584	$self->{spell}->{$spell->{name}} = $spell;
3481		3585	$self->rebuild_spell_list;
3482	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483	face => $spell->{face},
3484	can_hover => 1,
3485	can_events => 1,
3486	tooltip => $spell->{message});
3487
3488	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489	text => $spell->{name},
3490	can_hover => 1,
3491	can_events => 1,
3492	tooltip => $spell->{message},
3493	expand => 1);
3494
3495	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498	expand => 1);
3499
3500	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501	text => "bind to key",
3502	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503	}
3504
3505	sub rebuild_spell_list {
3506	my ($self) = @_;
3507	$self->{tbl_idx} = 0;
3508	$self->add_spell ($_) for values %{$self->{spells}};
3509	}	3586	}
3510		3587
3511	sub remove_spell {	3588	sub remove_spell {
3512	my ($self, $spell) = @_;	3589	my ($self, $spell) = @_;
		3590
3513	delete $self->{spells}->{$spell->{name}};	3591	delete $self->{spell}->{$spell->{name}};
		3592	$self->rebuild_spell_list;
		3593	}
		3594
		3595	sub clear_spells {
		3596	my ($self) = @_;
		3597
		3598	$self->{spell} = {};
3514	$self->rebuild_spell_list;	3599	$self->rebuild_spell_list;
3515	}	3600	}
3516		3601
3517	#############################################################################	3602	#############################################################################
3518		3603
…		…
3555	$coord = $max - $size if $coord > $max - $size;	3640	$coord = $max - $size if $coord > $max - $size;
3556		3641
3557	int $coord + 0.5	3642	int $coord + 0.5
3558	}	3643	}
3559		3644
3560	sub size_allocate {	3645	sub invoke_size_allocate {
3561	my ($self, $w, $h) = @_;	3646	my ($self, $w, $h) = @_;
3562		3647
3563	for my $child ($self->children) {	3648	for my $child ($self->children) {
3564	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3649	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565		3650
…		…
3569	$X = _to_pixel $X, $W, $self->{w};	3654	$X = _to_pixel $X, $W, $self->{w};
3570	$Y = _to_pixel $Y, $H, $self->{h};	3655	$Y = _to_pixel $Y, $H, $self->{h};
3571		3656
3572	$child->configure ($X, $Y, $W, $H);	3657	$child->configure ($X, $Y, $W, $H);
3573	}	3658	}
		3659
		3660	1
3574	}	3661	}
3575		3662
3576	sub coord2local {	3663	sub coord2local {
3577	my ($self, $x, $y) = @_;	3664	my ($self, $x, $y) = @_;
3578		3665

Diff Legend

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