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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 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
…		…
366		366
367	$self->{root}{size_alloc}{$self+0} = $self;	367	$self->{root}{size_alloc}{$self+0} = $self;
368	}	368	}
369	}	369	}
370		370
371	sub size_allocate {
372	# nothing to be done
373	}
374
375	sub children {	371	sub children {
376	# nop	372	# nop
377	}	373	}
378		374
379	sub visible_children {	375	sub visible_children {
…		…
381	}	377	}
382		378
383	sub set_max_size {	379	sub set_max_size {
384	my ($self, $w, $h) = @_;	380	my ($self, $w, $h) = @_;
385		381
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	382	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	383	$self->{max_h} = int $h if defined $h;
		384
		385	$self->realloc;
388	}	386	}
389		387
390	sub set_tooltip {	388	sub set_tooltip {
391	my ($self, $tooltip) = @_;	389	my ($self, $tooltip) = @_;
392		390
…		…
397		395
398	$self->{tooltip} = $tooltip;	396	$self->{tooltip} = $tooltip;
399		397
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	398	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	399	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	400	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	401	}
404	}	402	}
405		403
406	# translate global coordinates to local coordinate system	404	# translate global coordinates to local coordinate system
407	sub coord2local {	405	sub coord2local {
…		…
415	my ($self, $x, $y) = @_;	413	my ($self, $x, $y) = @_;
416		414
417	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418	}	416	}
419		417
420	sub focus_in {	418	sub invoke_focus_in {
421	my ($self) = @_;	419	my ($self) = @_;
422		420
423	return if $FOCUS == $self;	421	return if $FOCUS == $self;
424	return unless $self->{can_focus};	422	return unless $self->{can_focus};
425		423
426	my $focus = $FOCUS; $FOCUS = $self;	424	my $focus = $FOCUS; $FOCUS = $self;
427		425
428	$self->_emit (focus_in => $focus);
429
430	$focus->update if $focus;	426	$focus->update if $focus;
431	$FOCUS->update;	427	$FOCUS->update;
432	}
433		428
		429	0
		430	}
		431
434	sub focus_out {	432	sub invoke_focus_out {
435	my ($self) = @_;	433	my ($self) = @_;
436		434
437	return unless $FOCUS == $self;	435	return unless $FOCUS == $self;
438		436
439	my $focus = $FOCUS; undef $FOCUS;	437	my $focus = $FOCUS; undef $FOCUS;
440		438
441	$self->_emit (focus_out => $focus);
442
443	$focus->update if $focus; #?	439	$focus->update if $focus; #?
444		440
445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446	unless $FOCUS;	442	unless $FOCUS;
447	}
448		443
		444	0
		445	}
		446
		447	sub grab_focus {
		448	my ($self) = @_;
		449
		450	$self->emit ("focus_in");
		451	}
		452
449	sub mouse_motion { 0 }	453	sub invoke_mouse_motion { 1 }
450	sub button_up { 0 }	454	sub invoke_button_up { 1 }
451	sub key_down { 0 }	455	sub invoke_key_down { 1 }
452	sub key_up { 0 }	456	sub invoke_key_up { 1 }
453		457
454	sub button_down {	458	sub invoke_button_down {
455	my ($self, $ev, $x, $y) = @_;	459	my ($self, $ev, $x, $y) = @_;
456		460
457	$self->focus_in;	461	$self->grab_focus;
458		462
459	0	463	1
		464	}
		465
		466	sub connect {
		467	my ($self, $signal, $cb) = @_;
		468
		469	push @{ $self->{signal_cb}{$signal} }, $cb;
		470	}
		471
		472	sub emit {
		473	my ($self, $signal, @args) = @_;
		474
		475	(List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
		476	($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
		477	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460	}	478	}
461		479
462	sub find_widget {	480	sub find_widget {
463	my ($self, $x, $y) = @_;	481	my ($self, $x, $y) = @_;
464		482
…		…
474	sub set_parent {	492	sub set_parent {
475	my ($self, $parent) = @_;	493	my ($self, $parent) = @_;
476		494
477	Scalar::Util::weaken ($self->{parent} = $parent);	495	Scalar::Util::weaken ($self->{parent} = $parent);
478	$self->set_visible if $parent->{visible};	496	$self->set_visible if $parent->{visible};
479	}
480
481	sub connect {
482	my ($self, $signal, $cb) = @_;
483
484	push @{ $self->{signal_cb}{$signal} }, $cb;
485	}
486
487	sub _emit {
488	my ($self, $signal, @args) = @_;
489
490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491	}
492
493	sub emit {
494	my ($self, $signal, @args) = @_;
495
496	$self->_emit ($signal, @args)
497	|| $self->$signal (@args);
498	}
499
500	sub visibility_change {
501	#my ($self, $visible) = @_;
502	}	497	}
503		498
504	sub realloc {	499	sub realloc {
505	my ($self) = @_;	500	my ($self) = @_;
506		501
…		…
590		585
591	sub DESTROY {	586	sub DESTROY {
592	my ($self) = @_;	587	my ($self) = @_;
593		588
594	delete $WIDGET{$self+0};	589	delete $WIDGET{$self+0};
595	#$self->deactivate;	590
		591	eval { $self->destroy };
		592	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596	}	593	}
597		594
598	#############################################################################	595	#############################################################################
599		596
600	package CFClient::UI::DrawBG;	597	package CFClient::UI::DrawBG;
…		…
765	}	762	}
766		763
767	sub add {	764	sub add {
768	my ($self, $child) = @_;	765	my ($self, $child) = @_;
769		766
770	$self->{children} = [];	767	$self->SUPER::remove ($_) for @{ $self->{children} };
771
772	$self->SUPER::add ($child);	768	$self->SUPER::add ($child);
773	}	769	}
774		770
775	sub remove {	771	sub remove {
776	my ($self, $widget) = @_;	772	my ($self, $widget) = @_;
…		…
785		781
786	sub size_request {	782	sub size_request {
787	$_[0]{children}[0]->size_request	783	$_[0]{children}[0]->size_request
788	}	784	}
789		785
790	sub size_allocate {	786	sub invoke_size_allocate {
791	my ($self, $w, $h) = @_;	787	my ($self, $w, $h) = @_;
792		788
793	$self->{children}[0]->configure (0, 0, $w, $h);	789	$self->{children}[0]->configure (0, 0, $w, $h);
		790
		791	1
794	}	792	}
795		793
796	#############################################################################	794	#############################################################################
797		795
798	# back-buffered drawing area	796	# back-buffered drawing area
…		…
814		812
815	$ROOT->on_post_alloc ($self => sub { $self->render_child });	813	$ROOT->on_post_alloc ($self => sub { $self->render_child });
816	$self->SUPER::update;	814	$self->SUPER::update;
817	}	815	}
818		816
819	sub size_allocate {	817	sub invoke_size_allocate {
820	my ($self, $w, $h) = @_;	818	my ($self, $w, $h) = @_;
821		819
822	$self->SUPER::size_allocate ($w, $h);
823	$self->update;	820	$self->update;
		821
		822	$self->SUPER::invoke_size_allocate ($w, $h)
824	}	823	}
825		824
826	sub _render {	825	sub _render {
827	my ($self) = @_;	826	my ($self) = @_;
828		827
…		…
855	my $tex = $self->{texture}	854	my $tex = $self->{texture}
856	or return;	855	or return;
857		856
858	glEnable GL_TEXTURE_2D;	857	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glEnable GL_BLEND;
861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862	glColor 0, 0, 0, 1;	859	glColor 0, 0, 0, 1;
863		860
864	$tex->draw_quad (0, 0, $w, $h);	861	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865		862
866	glDisable GL_BLEND;
867	glDisable GL_TEXTURE_2D;	863	glDisable GL_TEXTURE_2D;
868	}	864	}
869		865
870	#############################################################################	866	#############################################################################
871		867
…		…
892	$h = 10 if $self->{scroll_y};	888	$h = 10 if $self->{scroll_y};
893		889
894	($w, $h)	890	($w, $h)
895	}	891	}
896		892
897	sub size_allocate {	893	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
899		895
900	my $child = $self->child;	896	my $child = $self->child;
901		897
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	898	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	899	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		900
905	$self->child->configure (0, 0, $w, $h);	901	$self->child->configure (0, 0, $w, $h);
906	$self->update;	902	$self->update;
		903
		904	1
907	}	905	}
908		906
909	sub set_offset {	907	sub set_offset {
910	my ($self, $x, $y) = @_;	908	my ($self, $x, $y) = @_;
911		909
…		…
1001	# todo: overwrite size_allocate of child	999	# todo: overwrite size_allocate of child
1002	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1002	}
1005		1003
1006	sub size_allocate {	1004	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1005	my ($self, $w, $h) = @_;
1008
1009	$self->SUPER::size_allocate ($w, $h);
1010		1006
1011	my $child = $self->{vp}->child;	1007	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1008	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1009
		1010	$self->SUPER::invoke_size_allocate ($w, $h)
1013	}	1011	}
1014		1012
1015	#TODO# update range on size_allocate depending on child	1013	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll	1014	# update viewport offset on scroll
1017		1015
…		…
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1071
1074	sub new {	1072	sub new {
1075	my ($class, %arg) = @_;	1073	my ($class, %arg) = @_;
1076
1077	my $title = delete $arg{title};
1078		1074
1079	my $self = $class->SUPER::new (	1075	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1076	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1077	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1078	border => 0.6,
…		…
1084	min_w => 16,	1080	min_w => 16,
1085	min_h => 16,	1081	min_h => 16,
1086	%arg,	1082	%arg,
1087	);	1083	);
1088		1084
1089	$self->{title} = new CFClient::UI::Label	1085	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1086	align => 0,
1091	valign => 1,	1087	valign => 1,
1092	text => $title,	1088	text => $self->{title},
1093	fontsize => $self->{border}	1089	fontsize => $self->{border},
1094	if defined $title;	1090	if exists $self->{title};
		1091
		1092	if ($self->{has_close_button}) {
		1093	$self->{close_button} =
		1094	new CFClient::UI::ImageButton
		1095	image => 'x1_close.png',
		1096	on_activate => sub { $self->hide };
		1097
		1098	$self->CFClient::UI::Container::add ($self->{close_button});
		1099	}
1095		1100
1096	$self	1101	$self
1097	}	1102	}
1098		1103
1099	sub add {	1104	sub add {
1100	my ($self, @widgets) = @_;	1105	my ($self, @widgets) = @_;
1101		1106
1102	$self->SUPER::add (@widgets);	1107	$self->SUPER::add (@widgets);
		1108	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1109	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1110	}
1105		1111
1106	sub border {	1112	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1113	int $_[0]{border} * $::FONTSIZE
1108	}	1114	}
1109		1115
1110	sub size_request {	1116	sub size_request {
1111	my ($self) = @_;	1117	my ($self) = @_;
1112		1118
1113	$self->{title}->size_request	1119	$self->{title_widget}->size_request
1114	if $self->{title};	1120	if $self->{title_widget};
		1121
		1122	$self->{close_button}->size_request
		1123	if $self->{close_button};
1115		1124
1116	my ($w, $h) = $self->SUPER::size_request;	1125	my ($w, $h) = $self->SUPER::size_request;
1117		1126
1118	(	1127	(
1119	$w + $self->border * 2,	1128	$w + $self->border * 2,
1120	$h + $self->border * 2,	1129	$h + $self->border * 2,
1121	)	1130	)
1122	}	1131	}
1123		1132
1124	sub size_allocate {	1133	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1134	my ($self, $w, $h) = @_;
1126		1135
1127	if ($self->{title}) {	1136	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1137	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1138	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1139	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1140	}
1132		1141
1133	my $border = $self->border;	1142	my $border = $self->border;
1134		1143
1135	$h -= List::Util::max 0, $border * 2;	1144	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1145	$w -= List::Util::max 0, $border * 2;
1137		1146
1138	$self->child->configure ($border, $border, $w, $h);	1147	$self->child->configure ($border, $border, $w, $h);
1139	}
1140		1148
		1149	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1150	if $self->{close_button};
		1151
		1152	1
		1153	}
		1154
1141	sub button_down {	1155	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1156	my ($self, $ev, $x, $y) = @_;
1143		1157
1144	my ($w, $h) = @$self{qw(w h)};	1158	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1159	my $border = $self->border;
1146		1160
…		…
1177		1191
1178	($x, $y) = ($ev->{x}, $ev->{y});	1192	($x, $y) = ($ev->{x}, $ev->{y});
1179		1193
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1194	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1195	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1196	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1197	};
1184	} else {	1198	} else {
1185	return 0;	1199	return 0;
1186	}	1200	}
1187		1201
1188	1	1202	1
1189	}	1203	}
1190		1204
1191	sub button_up {	1205	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1206	my ($self, $ev, $x, $y) = @_;
1193		1207
1194	!!delete $self->{motion}	1208	! ! delete $self->{motion}
1195	}	1209	}
1196		1210
1197	sub mouse_motion {	1211	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1212	my ($self, $ev, $x, $y) = @_;
1199		1213
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1214	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1215
1202	!!$self->{motion}	1216	! ! $self->{motion}
1203	}	1217	}
1204		1218
1205	sub _draw {	1219	sub _draw {
1206	my ($self) = @_;	1220	my ($self) = @_;
1207		1221
…		…
1233		1247
1234	glDisable GL_TEXTURE_2D;	1248	glDisable GL_TEXTURE_2D;
1235		1249
1236	$child->draw;	1250	$child->draw;
1237		1251
1238	if ($self->{title}) {	1252	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1253	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1254	$self->{title_widget}->_draw;
		1255
		1256	glTranslate 0, - ($border - $self->{h});
1241	}	1257	}
		1258
		1259	$self->{close_button}->draw
		1260	if $self->{close_button};
1242	}	1261	}
1243		1262
1244	#############################################################################	1263	#############################################################################
1245		1264
1246	package CFClient::UI::Table;	1265	package CFClient::UI::Table;
…		…
1269		1288
1270	$child->set_parent ($self);	1289	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1290	$self->{children}[$y][$x] = $child;
1272		1291
1273	$self->realloc;	1292	$self->realloc;
		1293	}
		1294
		1295	sub remove {
		1296	my ($self, $child) = @_;
		1297
		1298	# TODO: not yet implemented
1274	}	1299	}
1275		1300
1276	# TODO: move to container class maybe? send children a signal on removal?	1301	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1302	sub clear {
1278	my ($self) = @_;	1303	my ($self) = @_;
…		…
1319	(sum @$ws),	1344	(sum @$ws),
1320	(sum @$hs),	1345	(sum @$hs),
1321	)	1346	)
1322	}	1347	}
1323		1348
1324	sub size_allocate {	1349	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1350	my ($self, $w, $h) = @_;
1326		1351
1327	my ($ws, $hs) = $self->get_wh;	1352	my ($ws, $hs) = $self->get_wh;
1328		1353
1329	my $req_w = (sum @$ws) || 1;	1354	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1386	}
1362		1387
1363	$y += $row_h;	1388	$y += $row_h;
1364	}	1389	}
1365		1390
		1391	1
1366	}	1392	}
1367		1393
1368	sub find_widget {	1394	sub find_widget {
1369	my ($self, $x, $y) = @_;	1395	my ($self, $x, $y) = @_;
1370		1396
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1433	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1434	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1435	)
1410	}	1436	}
1411		1437
1412	sub size_allocate {	1438	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1439	my ($self, $w, $h) = @_;
1414		1440
1415	my $space = $self->{vertical} ? $h : $w;	1441	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1442	my $children = $self->{children};
1417		1443
…		…
1539		1565
1540	delete $self->{texture};	1566	delete $self->{texture};
1541	$self->SUPER::update;	1567	$self->SUPER::update;
1542	}	1568	}
1543		1569
		1570	sub realloc {
		1571	my ($self) = @_;
		1572
		1573	delete $self->{ox};
		1574	$self->SUPER::realloc;
		1575	}
		1576
1544	sub set_text {	1577	sub set_text {
1545	my ($self, $text) = @_;	1578	my ($self, $text) = @_;
1546		1579
1547	return if $self->{text} eq "T$text";	1580	return if $self->{text} eq "T$text";
1548	$self->{text} = "T$text";	1581	$self->{text} = "T$text";
1549		1582
1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1583	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551	$self->{layout}->set_text ($text);	1584	$self->{layout}->set_text ($text);
1552		1585
		1586	delete $self->{size_req};
1553	$self->realloc;	1587	$self->realloc;
1554	$self->update;	1588	$self->update;
1555	}	1589	}
1556		1590
1557	sub set_markup {	1591	sub set_markup {
…		…
1563	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1597	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564		1598
1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1599	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566	$self->{layout}->set_markup ($markup);	1600	$self->{layout}->set_markup ($markup);
1567		1601
		1602	delete $self->{size_req};
1568	$self->realloc;	1603	$self->realloc;
1569	$self->update;	1604	$self->update;
1570	}	1605	}
1571		1606
1572	sub size_request {	1607	sub size_request {
1573	my ($self) = @_;	1608	my ($self) = @_;
1574		1609
		1610	$self->{size_req} ||= do {
1575	$self->{layout}->set_font ($self->{font}) if $self->{font};	1611	$self->{layout}->set_font ($self->{font}) if $self->{font};
1576	$self->{layout}->set_width ($self->{max_w} || -1);	1612	$self->{layout}->set_width ($self->{max_w} || -1);
1577	$self->{layout}->set_ellipsise ($self->{ellipsise});	1613	$self->{layout}->set_ellipsise ($self->{ellipsise});
1578	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1614	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1615	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1616
1581	my ($w, $h) = $self->{layout}->size;	1617	my ($w, $h) = $self->{layout}->size;
1582		1618
1583	if (exists $self->{template}) {	1619	if (exists $self->{template}) {
1584	$self->{template}->set_font ($self->{font}) if $self->{font};	1620	$self->{template}->set_font ($self->{font}) if $self->{font};
1585	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586		1622
1587	my ($w2, $h2) = $self->{template}->size;	1623	my ($w2, $h2) = $self->{template}->size;
1588		1624
1589	$w = List::Util::max $w, $w2;	1625	$w = List::Util::max $w, $w2;
1590	$h = List::Util::max $h, $h2;	1626	$h = List::Util::max $h, $h2;
		1627	}
		1628
		1629	[$w, $h]
1591	}	1630	};
1592		1631
1593	($w, $h)	1632	@{ $self->{size_req} }
1594	}	1633	}
1595		1634
1596	sub size_allocate {	1635	sub invoke_size_allocate {
1597	my ($self, $w, $h) = @_;	1636	my ($self, $w, $h) = @_;
1598		1637
1599	delete $self->{ox};	1638	delete $self->{ox};
1600		1639
1601	delete $self->{texture}	1640	delete $self->{texture}
1602	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1641	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1642
		1643	1
1603	}	1644	}
1604		1645
1605	sub set_fontsize {	1646	sub set_fontsize {
1606	my ($self, $fontsize) = @_;	1647	my ($self, $fontsize) = @_;
1607		1648
1608	$self->{fontsize} = $fontsize;	1649	$self->{fontsize} = $fontsize;
1609	delete $self->{texture};	1650	delete $self->{texture};
1610		1651
1611	$self->realloc;	1652	$self->realloc;
		1653	}
		1654
		1655	sub reconfigure {
		1656	my ($self) = @_;
		1657
		1658	delete $self->{size_req};
		1659
		1660	$self->SUPER::reconfigure;
1612	}	1661	}
1613		1662
1614	sub _draw {	1663	sub _draw {
1615	my ($self) = @_;	1664	my ($self) = @_;
1616		1665
…		…
1636	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1685	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637	: ($self->{h} - $tex->{h}) * 0.5);	1686	: ($self->{h} - $tex->{h}) * 0.5);
1638	};	1687	};
1639		1688
1640	glEnable GL_TEXTURE_2D;	1689	glEnable GL_TEXTURE_2D;
1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1690
		1691	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1692	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642		1693
1643	if ($tex->{format} == GL_ALPHA) {	1694	if ($tex->{format} == GL_ALPHA) {
		1695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644	glColor @{$self->{fg}};	1696	glColor @{$self->{fg}};
1645	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1697	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646	} else {	1698	} else {
		1699	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1700	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648	}	1701	}
1649		1702
1650	glDisable GL_TEXTURE_2D;	1703	glDisable GL_TEXTURE_2D;
1651	}	1704	}
1652		1705
…		…
1669	can_hover => 1,	1722	can_hover => 1,
1670	can_focus => 1,	1723	can_focus => 1,
1671	valign => 0,	1724	valign => 0,
1672	can_events => 1,	1725	can_events => 1,
1673	#text => ...	1726	#text => ...
		1727	#hidden => "*",
1674	@_	1728	@_
1675	)	1729	)
1676	}	1730	}
1677		1731
1678	sub _set_text {	1732	sub _set_text {
…		…
1685	$self->{last_activity} = $::NOW;	1739	$self->{last_activity} = $::NOW;
1686	$self->{text} = $text;	1740	$self->{text} = $text;
1687		1741
1688	$text =~ s/./*/g if $self->{hidden};	1742	$text =~ s/./*/g if $self->{hidden};
1689	$self->{layout}->set_text ("$text ");	1743	$self->{layout}->set_text ("$text ");
		1744	delete $self->{size_req};
1690		1745
1691	$self->_emit (changed => $self->{text});	1746	$self->emit (changed => $self->{text});
		1747
		1748	$self->realloc;
1692	$self->update;	1749	$self->update;
1693	}	1750	}
1694		1751
1695	sub set_text {	1752	sub set_text {
1696	my ($self, $text) = @_;	1753	my ($self, $text) = @_;
1697		1754
1698	$self->{cursor} = length $text;	1755	$self->{cursor} = length $text;
1699	$self->_set_text ($text);	1756	$self->_set_text ($text);
1700
1701	$self->realloc;
1702	}	1757	}
1703		1758
1704	sub get_text {	1759	sub get_text {
1705	$_[0]{text}	1760	$_[0]{text}
1706	}	1761	}
…		…
1711	my ($w, $h) = $self->SUPER::size_request;	1766	my ($w, $h) = $self->SUPER::size_request;
1712		1767
1713	($w + 1, $h) # add 1 for cursor	1768	($w + 1, $h) # add 1 for cursor
1714	}	1769	}
1715		1770
1716	sub key_down {	1771	sub invoke_key_down {
1717	my ($self, $ev) = @_;	1772	my ($self, $ev) = @_;
1718		1773
1719	my $mod = $ev->{mod};	1774	my $mod = $ev->{mod};
1720	my $sym = $ev->{sym};	1775	my $sym = $ev->{sym};
1721	my $uni = $ev->{unicode};	1776	my $uni = $ev->{unicode};
…		…
1733	} elsif ($sym == CFClient::SDLK_HOME) {	1788	} elsif ($sym == CFClient::SDLK_HOME) {
1734	$self->{cursor} = 0;	1789	$self->{cursor} = 0;
1735	} elsif ($sym == CFClient::SDLK_END) {	1790	} elsif ($sym == CFClient::SDLK_END) {
1736	$self->{cursor} = length $text;	1791	$self->{cursor} = length $text;
1737	} elsif ($uni == 27) {	1792	} elsif ($uni == 27) {
1738	$self->_emit ('escape');	1793	$self->emit ('escape');
1739	} elsif ($uni) {	1794	} elsif ($uni) {
1740	substr $text, $self->{cursor}++, 0, chr $uni;	1795	substr $text, $self->{cursor}++, 0, chr $uni;
1741	} else {	1796	} else {
1742	return 0;	1797	return 0;
1743	}	1798	}
…		…
1747	$self->realloc;	1802	$self->realloc;
1748		1803
1749	1	1804	1
1750	}	1805	}
1751		1806
1752	sub focus_in {	1807	sub invoke_focus_in {
1753	my ($self) = @_;	1808	my ($self) = @_;
1754		1809
1755	$self->{last_activity} = $::NOW;	1810	$self->{last_activity} = $::NOW;
1756		1811
1757	$self->SUPER::focus_in;	1812	$self->SUPER::invoke_focus_in
1758	}	1813	}
1759		1814
1760	sub button_down {	1815	sub invoke_button_down {
1761	my ($self, $ev, $x, $y) = @_;	1816	my ($self, $ev, $x, $y) = @_;
1762		1817
1763	$self->SUPER::button_down ($ev, $x, $y);	1818	$self->SUPER::invoke_button_down ($ev, $x, $y);
1764		1819
1765	my $idx = $self->{layout}->xy_to_index ($x, $y);	1820	my $idx = $self->{layout}->xy_to_index ($x, $y);
1766		1821
1767	# byte-index to char-index	1822	# byte-index to char-index
1768	my $text = $self->{text};	1823	my $text = $self->{text};
…		…
1773	$self->update;	1828	$self->update;
1774		1829
1775	1	1830	1
1776	}	1831	}
1777		1832
1778	sub mouse_motion {	1833	sub invoke_mouse_motion {
1779	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1780	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1835	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781		1836
1782	0	1837	1
1783	}	1838	}
1784		1839
1785	sub _draw {	1840	sub _draw {
1786	my ($self) = @_;	1841	my ($self) = @_;
1787		1842
…		…
1828		1883
1829	our @ISA = CFClient::UI::EntryBase::;	1884	our @ISA = CFClient::UI::EntryBase::;
1830		1885
1831	use CFClient::OpenGL;	1886	use CFClient::OpenGL;
1832		1887
1833	sub key_down {	1888	sub invoke_key_down {
1834	my ($self, $ev) = @_;	1889	my ($self, $ev) = @_;
1835		1890
1836	my $sym = $ev->{sym};	1891	my $sym = $ev->{sym};
1837		1892
1838	if ($sym == 13) {	1893	if ($sym == 13) {
1839	unshift @{$self->{history}},	1894	unshift @{$self->{history}},
1840	my $txt = $self->get_text;	1895	my $txt = $self->get_text;
		1896
1841	$self->{history_pointer} = -1;	1897	$self->{history_pointer} = -1;
1842	$self->{history_saveback} = '';	1898	$self->{history_saveback} = '';
1843	$self->_emit (activate => $txt);	1899	$self->emit (activate => $txt);
1844	$self->update;	1900	$self->update;
1845		1901
1846	} elsif ($sym == CFClient::SDLK_UP) {	1902	} elsif ($sym == CFClient::SDLK_UP) {
1847	if ($self->{history_pointer} < 0) {	1903	if ($self->{history_pointer} < 0) {
1848	$self->{history_saveback} = $self->get_text;	1904	$self->{history_saveback} = $self->get_text;
…		…
1864	} else {	1920	} else {
1865	$self->set_text ($self->{history_saveback});	1921	$self->set_text ($self->{history_saveback});
1866	}	1922	}
1867		1923
1868	} else {	1924	} else {
1869	return $self->SUPER::key_down ($ev)	1925	return $self->SUPER::invoke_key_down ($ev)
1870	}	1926	}
1871		1927
1872	1	1928	1
1873	}	1929	}
1874		1930
…		…
1898	can_events => 1,	1954	can_events => 1,
1899	@_	1955	@_
1900	)	1956	)
1901	}	1957	}
1902		1958
1903	sub activate { }
1904
1905	sub button_up {	1959	sub invoke_button_up {
1906	my ($self, $ev, $x, $y) = @_;	1960	my ($self, $ev, $x, $y) = @_;
1907		1961
1908	$self->emit ("activate")	1962	$self->emit ("activate")
1909	if $x >= 0 && $x < $self->{w}	1963	if $x >= 0 && $x < $self->{w}
1910	&& $y >= 0 && $y < $self->{h};	1964	&& $y >= 0 && $y < $self->{h};
…		…
1913	}	1967	}
1914		1968
1915	sub _draw {	1969	sub _draw {
1916	my ($self) = @_;	1970	my ($self) = @_;
1917		1971
1918	local $self->{fg} = $self->{fg};	1972	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920	if ($GRAB == $self) {
1921	$self->{fg} = $self->{active_fg};
1922	}
1923		1973
1924	glEnable GL_TEXTURE_2D;	1974	glEnable GL_TEXTURE_2D;
1925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1975	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926	glColor 0, 0, 0, 1;	1976	glColor 0, 0, 0, 1;
1927		1977
1928	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1978	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929		1979
1930	glDisable GL_TEXTURE_2D;	1980	glDisable GL_TEXTURE_2D;
1931		1981
1932	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
		1983	}
		1984
		1985	#############################################################################
		1986
		1987	package CFClient::UI::ImageButton;
		1988
		1989	our @ISA = CFClient::UI::Image::;
		1990
		1991	use CFClient::OpenGL;
		1992
		1993	my %textures;
		1994
		1995	sub new {
		1996	my $class = shift;
		1997
		1998	my $self = $class->SUPER::new (
		1999	padding_x => 4,
		2000	padding_y => 4,
		2001	fg => [1, 1, 1],
		2002	active_fg => [0, 0, 1],
		2003	can_hover => 1,
		2004	align => 0,
		2005	valign => 0,
		2006	can_events => 1,
		2007	@_
		2008	);
		2009	}
		2010
		2011	sub invoke_button_up {
		2012	my ($self, $ev, $x, $y) = @_;
		2013
		2014	$self->emit ("activate")
		2015	if $x >= 0 && $x < $self->{w}
		2016	&& $y >= 0 && $y < $self->{h};
		2017
		2018	1
1933	}	2019	}
1934		2020
1935	#############################################################################	2021	#############################################################################
1936		2022
1937	package CFClient::UI::CheckBox;	2023	package CFClient::UI::CheckBox;
…		…
1964	my ($self) = @_;	2050	my ($self) = @_;
1965		2051
1966	(6) x 2	2052	(6) x 2
1967	}	2053	}
1968		2054
1969	sub button_down {	2055	sub invoke_button_down {
1970	my ($self, $ev, $x, $y) = @_;	2056	my ($self, $ev, $x, $y) = @_;
1971		2057
1972	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2058	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2059	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974	$self->{state} = !$self->{state};	2060	$self->{state} = !$self->{state};
1975	$self->_emit (changed => $self->{state});	2061	$self->emit (changed => $self->{state});
1976	} else {	2062	} else {
1977	return 0	2063	return 0
1978	}	2064	}
1979		2065
1980	1	2066	1
…		…
2277	$self->update;	2363	$self->update;
2278		2364
2279	$self	2365	$self
2280	}	2366	}
2281		2367
2282	sub changed { }
2283
2284	sub set_range {	2368	sub set_range {
2285	my ($self, $range) = @_;	2369	my ($self, $range) = @_;
2286		2370
2287	($range, $self->{range}) = ($self->{range}, $range);	2371	($range, $self->{range}) = ($self->{range}, $range);
2288		2372
2289	$self->update
2290	if "@$range" ne "@{$self->{range}}";	2373	if ("@$range" ne "@{$self->{range}}") {
		2374	$self->update;
		2375	$self->set_value ($self->{range}[0]);
		2376	}
2291	}	2377	}
2292		2378
2293	sub set_value {	2379	sub set_value {
2294	my ($self, $value) = @_;	2380	my ($self, $value) = @_;
2295		2381
…		…
2306	if $unit;	2392	if $unit;
2307		2393
2308	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2394	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309		2395
2310	if ($value != $old_value) {	2396	if ($value != $old_value) {
2311	$self->_emit (changed => $value);	2397	$self->emit (changed => $value);
2312	$self->update;	2398	$self->update;
2313	}	2399	}
2314	}	2400	}
2315		2401
2316	sub size_request {	2402	sub size_request {
2317	my ($self) = @_;	2403	my ($self) = @_;
2318		2404
2319	($self->{req_w}, $self->{req_h})	2405	($self->{req_w}, $self->{req_h})
2320	}	2406	}
2321		2407
2322	sub button_down {	2408	sub invoke_button_down {
2323	my ($self, $ev, $x, $y) = @_;	2409	my ($self, $ev, $x, $y) = @_;
2324		2410
2325	$self->SUPER::button_down ($ev, $x, $y);	2411	$self->SUPER::invoke_button_down ($ev, $x, $y);
2326		2412
2327	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2413	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328		2414
2329	$self->mouse_motion ($ev, $x, $y)	2415	$self->mouse_motion ($ev, $x, $y)
2330	}	2416	}
2331		2417
2332	sub mouse_motion {	2418	sub invoke_mouse_motion {
2333	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2334		2420
2335	if ($GRAB == $self) {	2421	if ($GRAB == $self) {
2336	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2422	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337		2423
…		…
2442	sub set_range { shift->{slider}->set_range (@_) }	2528	sub set_range { shift->{slider}->set_range (@_) }
2443	sub set_value { shift->{slider}->set_value (@_) }	2529	sub set_value { shift->{slider}->set_value (@_) }
2444		2530
2445	#############################################################################	2531	#############################################################################
2446		2532
2447	package CFClient::UI::TextView;	2533	package CFClient::UI::TextScroller;
2448		2534
2449	our @ISA = CFClient::UI::HBox::;	2535	our @ISA = CFClient::UI::HBox::;
2450		2536
2451	use CFClient::OpenGL;	2537	use CFClient::OpenGL;
2452		2538
…		…
2454	my $class = shift;	2540	my $class = shift;
2455		2541
2456	my $self = $class->SUPER::new (	2542	my $self = $class->SUPER::new (
2457	fontsize => 1,	2543	fontsize => 1,
2458	can_events => 0,	2544	can_events => 0,
		2545	indent => 0,
2459	#font => default_font	2546	#font => default_font
2460	@_,	2547	@_,
2461		2548
2462	layout => (new CFClient::Layout 1),	2549	layout => (new CFClient::Layout 1),
2463	par => [],	2550	par => [],
…		…
2478		2565
2479	$self->{fontsize} = $fontsize;	2566	$self->{fontsize} = $fontsize;
2480	$self->reflow;	2567	$self->reflow;
2481	}	2568	}
2482		2569
2483	sub size_allocate {	2570	sub invoke_size_allocate {
2484	my ($self, $w, $h) = @_;	2571	my ($self, $w, $h) = @_;
2485
2486	$self->SUPER::size_allocate ($w, $h);
2487		2572
2488	$self->{layout}->set_font ($self->{font}) if $self->{font};	2573	$self->{layout}->set_font ($self->{font}) if $self->{font};
2489	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2574	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490	$self->{layout}->set_width ($self->{children}[0]{w});	2575	$self->{layout}->set_width ($self->{children}[0]{w});
		2576	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491		2577
2492	$self->reflow;	2578	$self->reflow;
		2579
		2580	$self->SUPER::invoke_size_allocate ($w, $h)
2493	}	2581	}
2494		2582
2495	sub text_size {	2583	sub text_size {
2496	my ($self, $text, $indent) = @_;	2584	my ($self, $text, $indent) = @_;
2497		2585
2498	my $layout = $self->{layout};	2586	my $layout = $self->{layout};
2499		2587
2500	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2588	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501	$layout->set_width ($self->{children}[0]{w} - $indent);	2589	$layout->set_width ($self->{children}[0]{w} - $indent);
		2590	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502	$layout->set_markup ($text);	2591	$layout->set_markup ($text);
2503		2592
2504	$layout->size	2593	$layout->size
2505	}	2594	}
2506		2595
…		…
2545		2634
2546	return unless $self->{h} > 0;	2635	return unless $self->{h} > 0;
2547		2636
2548	delete $self->{texture};	2637	delete $self->{texture};
2549		2638
2550	$ROOT->on_post_alloc ($self, sub {	2639	$ROOT->on_post_alloc ($self => sub {
2551	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2640	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552		2641
2553	if (delete $self->{need_reflow}) {	2642	if (delete $self->{need_reflow}) {
2554	my $height = 0;	2643	my $height = 0;
2555		2644
…		…
2558	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2647	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559		2648
2560	for (@{$self->{par}}) {	2649	for (@{$self->{par}}) {
2561	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2650	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2562	$layout->set_width ($W - $_->[3]);	2651	$layout->set_width ($W - $_->[3]);
		2652	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2563	$layout->set_markup ($_->[4]);	2653	$layout->set_markup ($_->[4]);
2564	my ($w, $h) = $layout->size;	2654	my ($w, $h) = $layout->size;
2565	$_->[0] = $w + $_->[3];	2655	$_->[0] = $w + $_->[3];
2566	$_->[1] = $h;	2656	$_->[1] = $h;
2567	}	2657	}
…		…
2570	}	2660	}
2571		2661
2572	$self->{height} = $height;	2662	$self->{height} = $height;
2573		2663
2574	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2664	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2575		2665
2576	delete $self->{texture};	2666	delete $self->{texture};
2577	}	2667	}
2578		2668
2579	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2669	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580	glClearColor 0.5, 0.5, 0.5, 0;	2670	glClearColor 0, 0, 0, 0;
2581	glClear GL_COLOR_BUFFER_BIT;	2671	glClear GL_COLOR_BUFFER_BIT;
2582		2672
2583	my $top = int $self->{children}[1]{range}[0];	2673	my $top = int $self->{children}[1]{range}[0];
2584		2674
2585	my $y0 = $top;	2675	my $y0 = $top;
…		…
2599	my $h = $par->[1];	2689	my $h = $par->[1];
2600		2690
2601	if ($y0 < $y + $h && $y < $y1) {	2691	if ($y0 < $y + $h && $y < $y1) {
2602	$layout->set_foreground (@{ $par->[2] });	2692	$layout->set_foreground (@{ $par->[2] });
2603	$layout->set_width ($W - $par->[3]);	2693	$layout->set_width ($W - $par->[3]);
		2694	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2604	$layout->set_markup ($par->[4]);	2695	$layout->set_markup ($par->[4]);
2605		2696
2606	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2697	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607		2698
2608	glRasterPos $par->[3], $y - $y0;	2699	glRasterPos $par->[3], $y - $y0;
…		…
2620	sub _draw {	2711	sub _draw {
2621	my ($self) = @_;	2712	my ($self) = @_;
2622		2713
2623	glEnable GL_TEXTURE_2D;	2714	glEnable GL_TEXTURE_2D;
2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625	glColor 1, 1, 1, 1;	2716	glColor 0, 0, 0, 1;
2626	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2717	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627	glDisable GL_TEXTURE_2D;	2718	glDisable GL_TEXTURE_2D;
2628		2719
2629	$self->{children}[1]->draw;	2720	$self->{children}[1]->draw;
2630		2721
2631	}	2722	}
…		…
2722	$tooltip .= "\n\n" . (ref $widget) . "\n"	2813	$tooltip .= "\n\n" . (ref $widget) . "\n"
2723	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2814	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724	. "req $widget->{req_w} $widget->{req_h}\n"	2815	. "req $widget->{req_w} $widget->{req_h}\n"
2725	. "visible $widget->{visible}";	2816	. "visible $widget->{visible}";
2726	}	2817	}
		2818
		2819	$tooltip =~ s/^\n+//;
		2820	$tooltip =~ s/\n+$//;
2727		2821
2728	$self->add (new CFClient::UI::Label	2822	$self->add (new CFClient::UI::Label
2729	markup => $tooltip,	2823	markup => $tooltip,
2730	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2824	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731	fontsize => 0.8,	2825	fontsize => 0.8,
…		…
2741	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2835	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742		2836
2743	($w + 4, $h + 4)	2837	($w + 4, $h + 4)
2744	}	2838	}
2745		2839
2746	sub size_allocate {	2840	sub invoke_size_allocate {
2747	my ($self, $w, $h) = @_;	2841	my ($self, $w, $h) = @_;
2748		2842
2749	$self->SUPER::size_allocate ($w - 4, $h - 4);	2843	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750	}	2844	}
2751		2845
2752	sub visibility_change {	2846	sub invoke_visibility_change {
2753	my ($self, $visible) = @_;	2847	my ($self, $visible) = @_;
2754		2848
2755	return unless $visible;	2849	return unless $visible;
2756		2850
2757	$self->{root}->on_post_alloc ("move_$self" => sub {	2851	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2759	or return;	2853	or return;
2760		2854
2761	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2855	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762		2856
2763	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2857	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764	if $x + $self->{w} > $::WIDTH;	2858	if $x + $self->{w} > $self->{root}{w};
2765		2859
2766	$self->move_abs ($x, $y);	2860	$self->move_abs ($x, $y);
2767	});	2861	});
2768	}	2862	}
2769		2863
…		…
2858	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2952	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859		2953
2860	if ($tex) {	2954	if ($tex) {
2861	glEnable GL_TEXTURE_2D;	2955	glEnable GL_TEXTURE_2D;
2862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2956	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863	glColor 1, 1, 1, 1;	2957	glColor 0, 0, 0, 1;
2864	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2958	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865	glDisable GL_TEXTURE_2D;	2959	glDisable GL_TEXTURE_2D;
2866	}	2960	}
2867	}	2961	}
2868		2962
2869	sub DESTROY {	2963	sub destroy {
2870	my ($self) = @_;	2964	my ($self) = @_;
2871		2965
2872	$self->{timer}->cancel	2966	$self->{timer}->cancel
2873	if $self->{timer};	2967	if $self->{timer};
2874		2968
2875	$self->SUPER::DESTROY;	2969	$self->SUPER::destroy;
2876	}	2970	}
2877		2971
2878	#############################################################################	2972	#############################################################################
2879		2973
2880	package CFClient::UI::Buttonbar;	2974	package CFClient::UI::Buttonbar;
…		…
2901	);	2995	);
2902		2996
2903	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2997	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2904		2998
2905	for my $item (@{ $self->{items} }) {	2999	for my $item (@{ $self->{items} }) {
2906	my ($widget, $cb) = @$item;	3000	my ($widget, $cb, $tooltip) = @$item;
2907		3001
2908	# handle various types of items, only text for now	3002	# handle various types of items, only text for now
2909	if (!ref $widget) {	3003	if (!ref $widget) {
2910	$widget = new CFClient::UI::Label	3004	$widget = new CFClient::UI::Label
2911	can_hover => 1,	3005	can_hover => 1,
2912	can_events => 1,	3006	can_events => 1,
2913	text => $widget;	3007	markup => $widget,
		3008	tooltip => $tooltip
2914	}	3009	}
2915		3010
2916	$self->{item}{$widget} = $item;	3011	$self->{item}{$widget} = $item;
2917		3012
2918	$self->{vbox}->add ($widget);	3013	$self->{vbox}->add ($widget);
…		…
2923		3018
2924	# popup given the event (must be a mouse button down event currently)	3019	# popup given the event (must be a mouse button down event currently)
2925	sub popup {	3020	sub popup {
2926	my ($self, $ev) = @_;	3021	my ($self, $ev) = @_;
2927		3022
2928	$self->_emit ("popdown");	3023	$self->emit ("popdown");
2929		3024
2930	# maybe save $GRAB? must be careful about events...	3025	# maybe save $GRAB? must be careful about events...
2931	$GRAB = $self;	3026	$GRAB = $self;
2932	$self->{button} = $ev->{button};	3027	$self->{button} = $ev->{button};
2933		3028
2934	$self->show;	3029	$self->show;
2935	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3030	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936	}	3031	}
2937		3032
2938	sub mouse_motion {	3033	sub invoke_mouse_motion {
2939	my ($self, $ev, $x, $y) = @_;	3034	my ($self, $ev, $x, $y) = @_;
2940		3035
2941	# TODO: should use vbox->find_widget or so	3036	# TODO: should use vbox->find_widget or so
2942	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3037	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943	$self->{hover} = $self->{item}{$HOVER};	3038	$self->{hover} = $self->{item}{$HOVER};
2944		3039
2945	0	3040	0
2946	}	3041	}
2947		3042
2948	sub button_up {	3043	sub invoke_button_up {
2949	my ($self, $ev, $x, $y) = @_;	3044	my ($self, $ev, $x, $y) = @_;
2950		3045
2951	if ($ev->{button} == $self->{button}) {	3046	if ($ev->{button} == $self->{button}) {
2952	undef $GRAB;	3047	undef $GRAB;
2953	$self->hide;	3048	$self->hide;
2954		3049
2955	$self->_emit ("popdown");	3050	$self->emit ("popdown");
2956	$self->{hover}[1]->() if $self->{hover};	3051	$self->{hover}[1]->() if $self->{hover};
2957	} else {	3052	} else {
2958	return 0	3053	return 0
2959	}	3054	}
2960		3055
…		…
2997	: $self->{children}[$page_or_widget];	3092	: $self->{children}[$page_or_widget];
2998		3093
2999	$self->{current} = $widget;	3094	$self->{current} = $widget;
3000	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3095	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001		3096
3002	$self->_emit (page_changed => $self->{current});	3097	$self->emit (page_changed => $self->{current});
3003		3098
3004	$self->realloc;	3099	$self->realloc;
3005	}	3100	}
3006		3101
3007	sub visible_children {	3102	sub visible_children {
…		…
3012	my ($self) = @_;	3107	my ($self) = @_;
3013		3108
3014	$self->{current}->size_request	3109	$self->{current}->size_request
3015	}	3110	}
3016		3111
3017	sub size_allocate {	3112	sub invoke_size_allocate {
3018	my ($self, $w, $h) = @_;	3113	my ($self, $w, $h) = @_;
3019		3114
3020	$self->{current}->configure (0, 0, $w, $h);	3115	$self->{current}->configure (0, 0, $w, $h);
		3116
		3117	1
3021	}	3118	}
3022		3119
3023	sub _draw {	3120	sub _draw {
3024	my ($self) = @_;	3121	my ($self) = @_;
3025		3122
…		…
3064		3161
3065	sub set_current_page {	3162	sub set_current_page {
3066	my ($self, $page) = @_;	3163	my ($self, $page) = @_;
3067		3164
3068	$self->{multiplexer}->set_current_page ($page);	3165	$self->{multiplexer}->set_current_page ($page);
3069	$self->_emit (page_changed => $self->{multiplexer}{current});	3166	$self->emit (page_changed => $self->{multiplexer}{current});
3070	}	3167	}
3071		3168
3072	#############################################################################	3169	#############################################################################
3073		3170
3074	package CFClient::UI::Statusbox;	3171	package CFClient::UI::Combobox;
3075		3172
		3173	use utf8;
		3174
3076	our @ISA = CFClient::UI::VBox::;	3175	our @ISA = CFClient::UI::Button::;
3077		3176
3078	sub new {	3177	sub new {
3079	my $class = shift;	3178	my $class = shift;
3080		3179
3081	$class->SUPER::new (	3180	my $self = $class->SUPER::new (
		3181	options => [], # [value, title, longdesc], ...
		3182	value => undef,
		3183	@_,
		3184	);
		3185
		3186	$self->_set_value ($self->{value});
		3187
		3188	$self
		3189	}
		3190
		3191	sub invoke_button_down {
		3192	my ($self, $ev) = @_;
		3193
		3194	my @menu_items;
		3195
		3196	for (@{ $self->{options} }) {
		3197	my ($value, $title, $tooltip) = @$_;
		3198
		3199	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3200	}
		3201
		3202	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3203	}
		3204
		3205	sub _set_value {
		3206	my ($self, $value) = @_;
		3207
		3208	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3209	or return;
		3210
		3211	$self->{value} = $item->[0];
		3212	$self->set_markup ("$item->[1] ⇓");
		3213	$self->set_tooltip ($item->[2]);
		3214	}
		3215
		3216	sub set_value {
		3217	my ($self, $value) = @_;
		3218
		3219	return unless $self->{value} ne $value;
		3220
		3221	$self->_set_value ($value);
		3222	$self->emit (changed => $value);
		3223	}
		3224
		3225	#############################################################################
		3226
		3227	package CFClient::UI::Statusbox;
		3228
		3229	our @ISA = CFClient::UI::VBox::;
		3230
		3231	sub new {
		3232	my $class = shift;
		3233
		3234	my $self = $class->SUPER::new (
3082	fontsize => 0.8,	3235	fontsize => 0.8,
3083	@_,	3236	@_,
3084	)	3237	);
		3238
		3239	Scalar::Util::weaken (my $this = $self);
		3240
		3241	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3242
		3243	$self
3085	}	3244	}
3086		3245
3087	sub reorder {	3246	sub reorder {
3088	my ($self) = @_;	3247	my ($self) = @_;
3089	my $NOW = time;	3248	my $NOW = Time::HiRes::time;
		3249
		3250	# freeze display when hovering over any label
		3251	return if $CFClient::UI::TOOLTIP->{owner}
		3252	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3253	values %{ $self->{item} };
3090		3254
3091	while (my ($k, $v) = each %{ $self->{item} }) {	3255	while (my ($k, $v) = each %{ $self->{item} }) {
3092	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3256	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093	}	3257	}
3094		3258
…		…
3097	my @items = sort {	3261	my @items = sort {
3098	$a->{pri} <=> $b->{pri}	3262	$a->{pri} <=> $b->{pri}
3099	or $b->{id} <=> $a->{id}	3263	or $b->{id} <=> $a->{id}
3100	} values %{ $self->{item} };	3264	} values %{ $self->{item} };
3101		3265
		3266	$self->{timer}->interval (1);
		3267
3102	my $count = 10 + 1;	3268	my $count = 10 + 1;
3103	for my $item (@items) {	3269	for my $item (@items) {
3104	last unless --$count;	3270	last unless --$count;
3105		3271
3106	push @widgets, $item->{label} ||= do {	3272	my $label = $item->{label} ||= do {
3107	# TODO: doesn't handle markup well (read as: at all)	3273	# TODO: doesn't handle markup well (read as: at all)
3108	my $short = $item->{count} > 1	3274	my $short = $item->{count} > 1
3109	? "<b>$item->{count} ×</b> $item->{text}"	3275	? "<b>$item->{count} ×</b> $item->{text}"
3110	: $item->{text};	3276	: $item->{text};
3111		3277
…		…
3119	tooltip => $item->{tooltip},	3285	tooltip => $item->{tooltip},
3120	tooltip_font => $::FONT_PROP,	3286	tooltip_font => $::FONT_PROP,
3121	tooltip_width => 0.67,	3287	tooltip_width => 0.67,
3122	fontsize => $item->{fontsize} || $self->{fontsize},	3288	fontsize => $item->{fontsize} || $self->{fontsize},
3123	max_w => $::WIDTH * 0.44,	3289	max_w => $::WIDTH * 0.44,
3124	fg => $item->{fg},	3290	fg => [@{ $item->{fg} }],
3125	can_events => 1,	3291	can_events => 1,
3126	can_hover => 1	3292	can_hover => 1
3127	};	3293	};
		3294
		3295	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3296	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3297	$label->update;
		3298	$label->set_max_size (undef, $label->{req_h} * $diff)
		3299	if $diff < 1;
		3300	$self->{timer}->interval (1/30);
		3301	} else {
		3302	$label->{fg}[3] = $item->{fg}[3] || 1;
		3303	}
		3304
		3305	push @widgets, $label;
3128	}	3306	}
3129		3307
3130	$self->clear;	3308	$self->clear;
3131	$self->SUPER::add (reverse @widgets);	3309	$self->SUPER::add (reverse @widgets);
3132	}	3310	}
…		…
3137	$text =~ s/^\s+//;	3315	$text =~ s/^\s+//;
3138	$text =~ s/\s+$//;	3316	$text =~ s/\s+$//;
3139		3317
3140	return unless $text;	3318	return unless $text;
3141		3319
3142	my $timeout = time + ((delete $arg{timeout}) || 60);	3320	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143		3321
3144	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3322	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145		3323
3146	if (my $item = $self->{item}{$group}) {	3324	if (my $item = $self->{item}{$group}) {
3147	if ($item->{text} eq $text) {	3325	if ($item->{text} eq $text) {
3148	$item->{count}++;	3326	$item->{count}++;
3149	} else {	3327	} else {
3150	$item->{count} = 1;	3328	$item->{count} = 1;
3151	$item->{text} = $item->{tooltip} = $text;	3329	$item->{text} = $item->{tooltip} = $text;
3152	}	3330	}
3153	$item->{id} = ++$self->{id};	3331	$item->{id} += 0.2;#d#
3154	$item->{timeout} = $timeout;	3332	$item->{timeout} = $timeout;
3155	delete $item->{label};	3333	delete $item->{label};
3156	} else {	3334	} else {
3157	$self->{item}{$group} = {	3335	$self->{item}{$group} = {
3158	id => ++$self->{id},	3336	id => ++$self->{id},
…		…
3177		3355
3178	$self->reorder;	3356	$self->reorder;
3179	$self->SUPER::reconfigure;	3357	$self->SUPER::reconfigure;
3180	}	3358	}
3181		3359
		3360	sub destroy {
		3361	my ($self) = @_;
		3362
		3363	$self->{timer}->cancel;
		3364
		3365	$self->SUPER::destroy;
		3366	}
		3367
3182	#############################################################################	3368	#############################################################################
3183		3369
3184	package CFClient::UI::Inventory;	3370	package CFClient::UI::Inventory;
3185		3371
3186	our @ISA = CFClient::UI::ScrolledWindow::;	3372	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3328	my ($self) = @_;	3514	my ($self) = @_;
3329	$self->ask_for_bind (1);	3515	$self->ask_for_bind (1);
3330	}	3516	}
3331		3517
3332	sub ask_for_bind {	3518	sub ask_for_bind {
3333	my ($self, $commit) = @_;	3519	my ($self, $commit, $end_cb) = @_;
3334		3520
3335	CFClient::Binder::open_binding_dialog (sub {	3521	CFClient::Binder::open_binding_dialog (sub {
3336	my ($mod, $sym) = @_;	3522	my ($mod, $sym) = @_;
3337	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3523	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338	$self->update_binding_widgets;	3524	$self->update_binding_widgets;
3339	$self->commit if $commit;	3525	$self->commit if $commit;
		3526	$end_cb->() if $end_cb;
3340	});	3527	});
3341	}	3528	}
3342		3529
3343	# $mod and $sym are the modifiers and key symbol	3530	# $mod and $sym are the modifiers and key symbol
3344	# $cmds is a array ref of strings (the commands)	3531	# $cmds is a array ref of strings (the commands)
…		…
3362	}	3549	}
3363		3550
3364	# this is a shortcut method that asks for a binding	3551	# this is a shortcut method that asks for a binding
3365	# and then just binds it.	3552	# and then just binds it.
3366	sub do_quick_binding {	3553	sub do_quick_binding {
3367	my ($self, $cmds) = @_;	3554	my ($self, $cmds, $end_cb) = @_;
3368	$self->set_binding (undef, undef, $cmds, sub {	3555	$self->set_binding (undef, undef, $cmds, sub {
3369	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];	3556	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370	});	3557	});
3371	$self->ask_for_bind (1);	3558	$self->ask_for_bind (1, $end_cb);
3372	}	3559	}
3373		3560
3374	sub update_binding_widgets {	3561	sub update_binding_widgets {
3375	my ($self) = @_;	3562	my ($self) = @_;
3376	my ($mod, $sym, $cmds) = $self->get_binding;	3563	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3432	commands => [],	3619	commands => [],
3433	@_,	3620	@_,
3434	)	3621	)
3435	}	3622	}
3436		3623
3437	# XXX: Do sorting? Argl...	3624	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3625
		3626	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3627	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3628	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3629	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3630	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3631	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3632	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3633	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3634	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3635	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3636
		3637	sub rebuild_spell_list {
		3638	my ($self) = @_;
		3639
		3640	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3641	$self->clear;
		3642
		3643	return unless $::CONN;
		3644
		3645	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3646	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3647	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3648	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3649	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3650
		3651	my $row = 0;
		3652
		3653	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3654	my $spell = $self->{spell}{$_};
		3655
		3656	$row++;
		3657
		3658	my $spell_cb = sub {
		3659	my ($widget, $ev) = @_;
		3660
		3661	if ($ev->{button} == 1) {
		3662	$::CONN->user_send ("cast $spell->{name}");
		3663	} elsif ($ev->{button} == 2) {
		3664	$::CONN->user_send ("invoke $spell->{name}");
		3665	} elsif ($ev->{button} == 3) {
		3666	(new CFClient::UI::Menu
		3667	items => [
		3668	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3669	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3670	],
		3671	)->popup ($ev);
		3672	} else {
		3673	return 0;
		3674	}
		3675
		3676	1
		3677	};
		3678
		3679	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3680
		3681	#TODO: add path info to tooltip
		3682	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3683
		3684	$self->add (0, $row, new CFClient::UI::Face
		3685	face => $spell->{face},
		3686	can_hover => 1,
		3687	can_events => 1,
		3688	tooltip => $tooltip,
		3689	on_button_down => $spell_cb,
		3690	);
		3691
		3692	$self->add (1, $row, new CFClient::UI::Label
		3693	expand => 1,
		3694	text => $spell->{name},
		3695	can_hover => 1,
		3696	can_events => 1,
		3697	tooltip => $tooltip,
		3698	on_button_down => $spell_cb,
		3699	);
		3700
		3701	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3702	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3703	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3704	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3705	}
		3706	});
		3707	}
		3708
3438	sub add_spell {	3709	sub add_spell {
3439	my ($self, $spell) = @_;	3710	my ($self, $spell) = @_;
		3711
3440	$self->{spells}->{$spell->{name}} = $spell;	3712	$self->{spell}->{$spell->{name}} = $spell;
3441		3713	$self->rebuild_spell_list;
3442	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443	face => $spell->{face},
3444	can_hover => 1,
3445	can_events => 1,
3446	tooltip => $spell->{message});
3447
3448	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449	text => $spell->{name},
3450	can_hover => 1,
3451	can_events => 1,
3452	tooltip => $spell->{message},
3453	expand => 1);
3454
3455	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458	expand => 1);
3459
3460	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461	text => "bind to key",
3462	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463	}
3464
3465	sub rebuild_spell_list {
3466	my ($self) = @_;
3467	$self->{tbl_idx} = 0;
3468	$self->add_spell ($_) for values %{$self->{spells}};
3469	}	3714	}
3470		3715
3471	sub remove_spell {	3716	sub remove_spell {
3472	my ($self, $spell) = @_;	3717	my ($self, $spell) = @_;
		3718
3473	delete $self->{spells}->{$spell->{name}};	3719	delete $self->{spell}->{$spell->{name}};
3474	$self->rebuild_spell_list;	3720	$self->rebuild_spell_list;
3475	}	3721	}
3476		3722
		3723	sub clear_spells {
		3724	my ($self) = @_;
		3725
		3726	$self->{spell} = {};
		3727	$self->rebuild_spell_list;
		3728	}
		3729
3477	#############################################################################	3730	#############################################################################
3478		3731
3479	package CFClient::UI::Root;	3732	package CFClient::UI::Root;
3480		3733
3481	our @ISA = CFClient::UI::Container::;	3734	our @ISA = CFClient::UI::Container::;
		3735
		3736	use List::Util qw(min max);
3482		3737
3483	use CFClient::OpenGL;	3738	use CFClient::OpenGL;
3484		3739
3485	sub new {	3740	sub new {
3486	my $class = shift;	3741	my $class = shift;
…		…
3513	$coord = $max - $size if $coord > $max - $size;	3768	$coord = $max - $size if $coord > $max - $size;
3514		3769
3515	int $coord + 0.5	3770	int $coord + 0.5
3516	}	3771	}
3517		3772
3518	sub size_allocate {	3773	sub invoke_size_allocate {
3519	my ($self, $w, $h) = @_;	3774	my ($self, $w, $h) = @_;
3520		3775
3521	for my $child ($self->children) {	3776	for my $child ($self->children) {
3522	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3777	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523		3778
…		…
3527	$X = _to_pixel $X, $W, $self->{w};	3782	$X = _to_pixel $X, $W, $self->{w};
3528	$Y = _to_pixel $Y, $H, $self->{h};	3783	$Y = _to_pixel $Y, $H, $self->{h};
3529		3784
3530	$child->configure ($X, $Y, $W, $H);	3785	$child->configure ($X, $Y, $W, $H);
3531	}	3786	}
		3787
		3788	1
3532	}	3789	}
3533		3790
3534	sub coord2local {	3791	sub coord2local {
3535	my ($self, $x, $y) = @_;	3792	my ($self, $x, $y) = @_;
3536		3793
…		…
3621		3878
3622	delete $queue{$widget+0};	3879	delete $queue{$widget+0};
3623		3880
3624	my ($w, $h) = $widget->size_request;	3881	my ($w, $h) = $widget->size_request;
3625		3882
3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3883	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3884	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3885
		3886	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3887	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628		3888
3629	$w = $widget->{force_w} if exists $widget->{force_w};	3889	$w = $widget->{force_w} if exists $widget->{force_w};
3630	$h = $widget->{force_h} if exists $widget->{force_h};	3890	$h = $widget->{force_h} if exists $widget->{force_h};
3631		3891
3632	if ($widget->{req_w} != $w || $widget->{req_h} != $h	3892	if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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