ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC vs.
Revision 1.225 by root, Sat Nov 10 18:29:32 2012 UTC

1	package CFPlus::Protocol;	1	package DC::Protocol;
2		2
3	use utf8;	3	use common::sense;
4	use strict;
5		4
		5	use Guard ();
		6
6	use Crossfire::Protocol::Constants;	7	use Deliantra::Protocol::Constants;
7		8
8	use CFPlus;	9	use DC;
9	use CFPlus::DB;	10	use DC::DB;
10	use CFPlus::UI;	11	use DC::UI;
11	use CFPlus::Pod;	12	use DC::Pod;
12	use CFPlus::Macro;	13	use DC::Macro;
13	use CFPlus::Item;	14	use DC::Item;
14		15
15	use Crossfire::Protocol::Base 0.95;
16
17	use base 'Crossfire::Protocol::Base';	16	use base 'Deliantra::Protocol::Base';
		17
		18	our $TEX_DIALOGUE = new_from_resource DC::Texture
		19	"dialogue.png", minify => 1, mipmap => 1;
		20
		21	our $TEX_NOFACE = new_from_resource DC::Texture
		22	"noface.png", minify => 1, mipmap => 1, wrap => 1;
		23
		24	sub MIN_TEXTURE_UNUSED() { 1 }#d#
18		25
19	sub new {	26	sub new {
20	my ($class, %arg) = @_;	27	my ($class, %arg) = @_;
21		28
22	my $self = $class->SUPER::new (%arg,	29	my $self = $class->SUPER::new (%arg,
23	setup_req => {	30	setup_req => {
24	extmap => 1,	31	extmap => 1,
25	excmd => 1,
26	ywidget => 1,#d#	32	widget => 2,
27	%{$arg{setup_req} || {}},	33	%{$arg{setup_req} || {}},
28	},	34	},
29	);	35	);
30		36
		37	$self->update_fx_want;
		38
		39	my $exp_guard = $self->addme_guard;
		40	my $skl_guard = $self->addme_guard;
		41	my $spl_guard = $self->addme_guard;
		42	$self->send_exti_req (resource => qw(exp_table skill_info spell_paths), sub {
		43	my ($exp, $skl, $spl) = @_;
		44
		45	$self->register_face_handler ($exp, sub {
		46	my ($face) = @_;
		47
		48	undef $exp_guard;
		49	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		50	$_->() for values %{ $self->{on_exp_update} };
		51	});
		52
		53	$self->register_face_handler ($skl, sub {
		54	my ($face) = @_;
		55
		56	undef $skl_guard;
		57	my $info = $self->{json_coder}->decode (delete $face->{data});
		58	$self->{skill_info} = { map { CS_STAT_SKILLINFO + $_ => $info->[$_][0] } 0 .. $#$info };
		59	});
		60
		61	$self->register_face_handler ($spl, sub {
		62	my ($face) = @_;
		63
		64	undef $spl_guard;
		65	my $info = $self->{json_coder}->decode (delete $face->{data});
		66	$self->{spell_paths} = { map { (1 << $_) => $info->[$_][0] } 0 .. $#$info };
		67	});
		68
		69	()
		70	});
		71
31	$self->{map_widget}->clr_commands;	72	$self->{map_widget}->clr_commands;
32		73
33	my @cmd_help = map {	74	my @cmd_help = map {
34	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	75	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35	or die "unparseable command help: $_->{kw}[0]";	76	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36		77
37	my $cmd = $1;	78	my $cmd = $1;
38	my @args = split /\|/, $2;	79	my @args = split /\|/, $2;
39	@args = (".*") unless @args;	80	@args = (".*") unless @args;
40		81
41	my (undef, @par) = CFPlus::Pod::section_of $_;	82	my (undef, @par) = DC::Pod::section_of $_;
42	my $text = CFPlus::Pod::as_label @par;	83	my $text = DC::Pod::as_label @par;
43		84
44	$_ = $_ eq ".*" ? "" : " $_"	85	$_ = $_ eq ".*" ? "" : " $_"
45	for @args;	86	for @args;
46		87
47	map ["$cmd$_", $text],	88	map ["$cmd$_", $text],
48	sort { (length $a) <=> (length $b) }	89	sort { (length $a) <=> (length $b) }
49	@args	90	@args
50	} sort { $a->{par} <=> $b->{par} }	91	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51	CFPlus::Pod::find command => "*";	92	DC::Pod::find command => "*";
52
53	$self->connect_ext (ambient_music => sub {
54	my ($songs) = @_;
55	&::audio_music_set_ambient ($songs);
56	});
57
58	$self->connect_ext (capabilities => sub {
59	my (%cap) = @_;
60
61	#$self->send ("setup sound 0"); # we use a different protocol
62
63	$self->send_exti_msg (fx_want => {
64	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65	5 => !!$::CFG->{audio_enable}, # FT_SOUND
66	});
67
68	if (my $ts = $cap{tileset}) {
69	if (my ($default) = grep $_->[2] & 1, @$ts) {
70	$self->{tileset} = $default;
71	$self->{tilesize} = $default->[3];
72	$self->setup_req (tileset => $default->[0]);
73
74	my $w = int $self->{mapw} * 32 / $self->{tilesize};
75	my $h = int $self->{maph} * 32 / $self->{tilesize};
76
77	$self->setup_req (mapsize => "${w}x${h}");
78	}
79	}
80	});
81		93
82	$self->{json_coder}	94	$self->{json_coder}
83	->convert_blessed	95	->convert_blessed
84	->filter_json_single_key_object (__w_ => sub {	96	->filter_json_single_key_object ("\fw" => sub {
85	$self->{widget}{$_[0]}	97	$self->{widget}{$_[0]}
		98	})
		99	->filter_json_single_key_object ("\fc" => sub {
		100	my ($id) = @_;
		101	sub {
		102	$self->send_exti_msg (w_e => $id, @_);
		103	}
86	});	104	});
87
88	# widgetset new
89	$self->connect_ext (ws_n => sub {
90	my ($id) = @_;
91
92	$self->{widgetset}{$id} = {
93	w => {},
94	};
95	});
96
97	# widgetset destroy
98	$self->connect_ext (ws_d => sub {
99	my ($id) = @_;
100
101	my $ws = delete $self->{widgetset}{$id}
102	or return;
103
104	$_->destroy
105	for values %{$ws->{w}};
106	});
107
108	# widgetset create
109	$self->connect_ext (ws_c => sub {
110	my ($ws, $id, $class, $args) = @_;
111
112	for my $ev (grep /^on_/, keys %$args) {
113	$args->{$ev} = sub {
114	my $id = shift->{s_id};
115	$self->send_exti_msg (w_e => $id, $ev, \@_);
116
117	1
118	};
119	}
120
121	if (my $widget = eval {
122	local $SIG{__DIE__};
123	"CFPlus::UI::$class"->new (
124	%$args,
125	s_ws => $ws,
126	s_id => $id,
127	)
128	}
129	) {
130	$self->{widget}{$id}
131	= $self->{widgetset}{$ws}{w}{$id}
132	= $widget;
133
134	$widget->connect (on_destroy => sub {
135	my ($widget) = @_;
136
137	delete $self->{widget}{$widget->{s_id}};
138	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139	});
140	} else {
141	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142	$self->send_exti_msg (w_e => $id, "destroy");
143	}
144	});
145
146	# widget call
147	$self->connect_ext (w_c => sub {
148	my ($id, $rid, $method, $args) = @_;
149
150	my $w = $self->{widget}{$id}
151	or return;
152
153	$args ||= [];
154
155	if ($rid) {
156	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157	} else {
158	$w->$method (@$args);
159	}
160	});
161
162	# widget set
163	$self->connect_ext (w_s => sub {
164	my ($id, $attr) = @_;
165
166	my $w = $self->{widget}{$id}
167	or return;
168
169	for (my $i = 0; $i < $#$attr; $i += 2) {
170	my ($member, $value) = @$attr[$i, $i+1];
171	if (defined $value) {
172	$w->{$member} = $value;
173	} else {
174	delete $w->{$member};
175	}
176	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177	}
178	});
179
180	# widget get
181	$self->connect_ext (w_g => sub {
182	my ($id, $rid, $attr) = @_;
183
184	my $w = $self->{widget}{$id}
185	or return;
186
187	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188	});
189
190	# message window
191	$self->connect_ext (channel_info => sub {
192	my ($info) = @_;
193	$self->{channels}->{$info->{id}} = $info;
194	$::MESSAGE_WINDOW->add_channel ($info);
195	});
196		105
197	# destroy widgets on logout	106	# destroy widgets on logout
198	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	107	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199	for my $ws (values %{delete $self->{widgetset} || {}}) {	108	for my $ws (values %{delete $self->{widgetset} || {}}) {
200	$_->destroy	109	$_->destroy
201	for values %{delete $ws->{w} || {}};	110	for values %{delete $ws->{w} || {}};
202	}	111	}
		112
		113	delete $self->{items};
		114	$::INV->clear;
		115	$::INVR->clear;
		116	$::INVR_HB->clear;
		117	$::FLOORBOX->clear;
203	});	118	});
204		119
205	$self->{map_widget}->add_command (@$_)	120	$self->{map_widget}->add_command (@$_)
206	for @cmd_help;	121	for @cmd_help;
207		122
208	{	123	{
209	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	124	$self->{dialogue} = my $tex = $TEX_DIALOGUE;
210	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
211	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	125	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
212	}	126	}
213		127
214	{	128	{
215	$self->{noface} = my $tex = new_from_file CFPlus::Texture	129	$self->{noface} = my $tex = $TEX_NOFACE;
216	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
217	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});	130	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
218	}	131	}
		132
		133	# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
		134	# $self->{expire_w} = AE::timer 1, 1, sub {
		135	# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
		136	#
		137	# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
		138	# warn DC::SvREFCNT $self->{texture}[$_];
		139	# $self->{texture}[$_]->unload;
		140	# warn "expire texture $_\n";#d#
		141	# }
		142	#
		143	# ($self->{expire_count} += $count) < @{ $self->{texture} }
		144	# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
		145	# warn "count is $count\n";#d#
		146	# };
219		147
220	$self->{open_container} = 0;	148	$self->{open_container} = 0;
221		149
222	# per server	150	# per server
223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	151	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224		152
225	$self	153	$self
226	}	154	}
227		155
		156	#$self->send_exti_req (nickmon => 1, sub { use Data::Dump; ddx \@_ });#d#
		157	#sub ext_nicklist { shift; use Data::Dump; ddx \@_; } #d#
		158
		159	sub update_fx_want {
		160	my ($self) = @_;
		161
		162	$self->send_exti_msg (fx_want => {
		163	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		164	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		165	6 => 1, # FT_RSRC
		166	});
		167	}
		168
		169	sub ext_capabilities {
		170	my ($self, %cap) = @_;
		171
		172	if (my $ts = $cap{tileset}) {
		173	if (my ($default) = grep $_->[2] & 1, @$ts) {
		174	$self->{tileset} = $default;
		175	$self->{tilesize} = $default->[3];
		176	$self->setup_req (tileset => $default->[0]);
		177
		178	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		179	my $h = int $self->{maph} * 32 / $self->{tilesize};
		180
		181	$self->setup_req (mapsize => "${w}x${h}");
		182	}
		183	}
		184	}
		185
		186	sub ext_ambient_music {
		187	my ($self, $songs) = @_;
		188	&::audio_music_set_ambient ($songs);
		189	}
		190
		191	#############################################################################
		192
		193	sub widget_associate {
		194	my ($self, $ws, $id, $widget) = @_;
		195
		196	$widget ||= new DC::UI::Bin;
		197
		198	$widget->{s_id} = $id;
		199	$self->{widget}{$id} = $widget;
		200
		201	if ($ws) {
		202	$widget->{s_ws} = $ws;
		203	$self->{widgetset}{$ws}{w}{$id} = $widget;
		204	}
		205
		206	$widget->connect (on_destroy => sub {
		207	my ($widget) = @_;
		208
		209	delete $self->{widget}{$widget->{s_id}};
		210	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		211	if exists $widget->{s_ws};
		212	});
		213	}
		214
		215	# widgetset new
		216	sub ext_ws_n {
		217	my ($self, $id) = @_;
		218
		219	$self->{widgetset}{$id} = {
		220	w => {},
		221	};
		222	}
		223
		224	# widgetset destroy
		225	sub ext_ws_d {
		226	my ($self, $id) = @_;
		227
		228	my $ws = delete $self->{widgetset}{$id}
		229	or return;
		230
		231	$_->destroy
		232	for values %{$ws->{w}};
		233	}
		234
		235	# widgetset create
		236	sub ext_ws_c {
		237	my ($self, $ws, $id, $class, $args) = @_;
		238
		239	$self->widget_associate (
		240	$ws, $id => scalar eval {
		241	local $SIG{__DIE__};
		242	"DC::UI::$class"->new (%$args)
		243	}
		244	);
		245	}
		246
		247	# widgetset create template
		248	sub ext_ws_ct {
		249	my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
		250
		251	$done_cb ||= sub { };
		252
		253	my $parse_list; $parse_list = sub {
		254	my ($list) = @_;
		255	my @w;
		256
		257	while (@$list) {
		258	my ($class, $args) = splice @$list, 0, 2;
		259	my $name = delete $args->{s_id};
		260	my $cl = delete $args->{s_cl};
		261	my $cfg = delete $cfg->{$name};
		262	my $id = delete $cfg->{id};
		263	my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
		264	or next;
		265
		266	$self->widget_associate ($ws, $id, $w)
		267	if $id;
		268
		269	$w->add ($parse_list->($cl))
		270	if $cl;
		271
		272	push @w, $w;
		273	}
		274
		275	@w
		276	};
		277
		278	# either array reference, or face #
		279	if ($type eq "inline") {
		280	$done_cb->();
		281	$parse_list->($template);
		282	} elsif ($type eq "face") {
		283	my $handler; $handler = $self->register_face_handler ($template, sub {
		284	my ($face) = @_;
		285
		286	undef $handler;
		287	$done_cb->();
		288	$parse_list->($self->{json_coder}->decode ($face->{data}));
		289	});
		290	} else {
		291	$done_cb->(0);
		292	}
		293	}
		294
		295	# widgetset associate
		296	sub ext_ws_a {
		297	my ($self, %ass) = @_;
		298
		299	# everything that has a name, wether conceivably useful or not
		300	my %wkw = (
		301	root => $DC::UI::ROOT,
		302	tooltip => $DC::UI::TOOLTIP,
		303
		304	mapwidget => $::MAPWIDGET,
		305	menubar => $::MENUBAR,
		306	menupopup => $::MENUPOPUP,
		307	pickup_enable => $::PICKUP_ENABLE,
		308	buttonbar => $::BUTTONBAR,
		309	metaserver => $::METASERVER,
		310	buttonbar => $::BUTTONBAR,
		311	login_button => $::LOGIN_BUTTON,
		312	quit_dialog => $::QUIT_DIALOG,
		313	host_entry => $::HOST_ENTRY,
		314	metaserver => $::METASERVER,
		315	server_info => $::SERVER_INFO,
		316
		317	setup_dialog => $::SETUP_DIALOG,
		318	setup_notebook => $::SETUP_NOTEBOOK,
		319	setup_server => $::SETUP_SERVER,
		320	setup_keyboard => $::SETUP_KEYBOARD,
		321
		322	pl_notebook => $::PL_NOTEBOOK,
		323	pl_window => $::PL_WINDOW,
		324	inventory_page => $::INVENTORY_PAGE,
		325	stats_page => $::STATS_PAGE,
		326	skill_page => $::SKILL_PAGE,
		327	spell_page => $::SPELL_PAGE,
		328	spell_list => $::SPELL_LIST,
		329
		330	floorbox => $::FLOORBOX,
		331	help_window => $::HELP_WINDOW,
		332	message_window => $::MESSAGE_WINDOW,
		333	message_dist => $::MESSAGE_DIST,
		334	statusbox => $::STATUSBOX,
		335
		336	inv => $::INV,
		337	invr => $::INVR,
		338	invr_hb => $::INVR_HB,
		339	);
		340
		341	while (my ($id, $name) = each %ass) {
		342	$self->widget_associate (undef, $id => $wkw{$name});
		343	}
		344	}
		345
		346	# widget call
		347	sub ext_w_c {
		348	my ($self, $id, $rcb, $method, @args) = @_;
		349
		350	my $w = $self->{widget}{$id}
		351	or return;
		352
		353	if ($rcb) {
		354	$rcb->($w->$method (@args));
		355	} else {
		356	$w->$method (@args);
		357	}
		358	}
		359
		360	# widget set
		361	sub ext_w_s {
		362	my ($self, $id, $attr) = @_;
		363
		364	my $w = $self->{widget}{$id}
		365	or return;
		366
		367	for (my $i = 0; $i < $#$attr; $i += 2) {
		368	my ($member, $value) = @$attr[$i, $i+1];
		369	if (defined $value) {
		370	$w->{$member} = $value;
		371	} else {
		372	delete $w->{$member};
		373	}
		374	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		375	}
		376	}
		377
		378	# widget get
		379	sub ext_w_g {
		380	my ($self, $id, $rid, @attr) = @_;
		381
		382	my $w = $self->{widget}{$id}
		383	or return;
		384
		385	$self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
		386	}
		387
		388	# message window
		389	sub ext_channel_info {
		390	my ($self, $info) = @_;
		391	$self->{channels}->{$info->{id}} = $info;
		392	$::MESSAGE_DIST->add_channel ($info);
		393	}
		394
		395	#############################################################################
		396
228	sub logprint {	397	sub logprint {
229	my ($self, @a) = @_;	398	my ($self, @a) = @_;
230		399
231	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };	400	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232	}	401	}
233		402
234	sub _stat_numdiff {	403	sub _stat_numdiff {
235	my ($self, $name, $old, $new) = @_;	404	my ($self, $name, $old, $new) = @_;
236		405
…		…
254	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})	423	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
255	: ()	424	: ()
256	}	425	}
257	sort { $a <=> $b } keys %{$self->{spell_paths}};	426	sort { $a <=> $b } keys %{$self->{spell_paths}};
258		427
259	join "", @diff	428	"\u$name: " . (join ", ", @diff)
260	}	429	}
261		430
262	# all stats that are chacked against changes	431	# all stats that are chacked against changes
263	my @statchange = (	432	my @statchange = (
264	[&CS_STAT_STR => \&_stat_numdiff, "Str"],	433	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
…		…
307		476
308	if (my @diffs =	477	if (my @diffs =
309	(	478	(
310	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),	479	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
311	map {	480	map {
312	$stats->{$_} && $prev->{$_}	481	$stats->{$_} && $prev->{$_}
313	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()	482	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
314	} sort { $a <=> $b } keys %{$self->{skill_info}}	483	} sort { $a <=> $b } keys %{$self->{skill_info}}
315	)	484	)
316	) {	485	) {
317	my $msg = join " ", @diffs;	486	my $msg = join " ", @diffs;
…		…
319	}	488	}
320		489
321	if (	490	if (
322	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	491	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
323	) {	492	) {
324	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	493	my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
325	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);	494	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
326	}	495	}
327		496
328	$self->update_stats_window ($stats, $prev);	497	$self->update_stats_window ($stats, $prev);
329		498
330	$self->{prev_stats} = { %$stats };	499	$self->{prev_stats} = { %$stats };
…		…
367		536
368	$::GAUGES->{hp} ->set_value ($hp, $hp_m);	537	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
369	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	538	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
370	$::GAUGES->{food} ->set_value ($fo, $fo_m);	539	$::GAUGES->{food} ->set_value ($fo, $fo_m);
371	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	540	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
372	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	541	$::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
373	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	542	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		543	$::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
374	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	544	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
375	my $title = $stats->{+CS_STAT_TITLE};	545	my $title = $stats->{+CS_STAT_TITLE};
376	$title =~ s/^Player: //;	546	$title =~ s/^Player: //;
377	$::STATWIDS->{title} ->set_text ("Title: " . $title);	547	$::STATWIDS->{title} ->set_text ("Title: " . $title);
378		548
…		…
390	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	560	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
391	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});	561	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
392		562
393	$self->update_weight;	563	$self->update_weight;
394		564
395	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})	565	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
396	for keys %RES_TBL;	566	for keys %RES_TBL;
397		567
398	my $sktbl = $::STATWIDS->{skill_tbl};	568	my $sktbl = $::STATWIDS->{skill_tbl};
399	my @skills = keys %{ $self->{skill_info} };	569	my @skills = keys %{ $self->{skill_info} };
400		570
401	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	571	my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		572	map [$_, $self->{skill_info}{$_}],
		573	grep exists $stats->{$_},
		574	@skills;
		575
		576	if ($self->{stat_order} ne join ",", map $_->[0], @order) {
		577	$self->{stat_order} = join ",", map $_->[0], @order;
		578
402	$sktbl->clear;	579	$sktbl->clear;
403		580
404	my @add;	581	my $sw = $self->{skillwid}{""} ||= [
405
406	push @add,
407	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	582	0, 0, (new DC::UI::Label text => "Experience", align => 1),
408	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),	583	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
		584	2, 0, (new DC::UI::Label text => "Progress"),
409	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	585	3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
410	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),	586	4, 0, (new DC::UI::Label text => "Experience", align => 1),
411	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),	587	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
		588	6, 0, (new DC::UI::Label text => "Progress"),
412	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),	589	7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
413	;	590	];
414		591
		592	my @add = @$sw;
		593
415	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	594	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
416		595
417	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	596	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
418	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	597	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
419		598
420	my ($x, $y) = (0, 1);	599	my ($x, $y) = (0, 1);
421	for (	600	for (@order) {
422	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
423	map [$_, $self->{skill_info}{$_}],
424	grep exists $stats->{$_},
425	@skills
426	) {
427	my ($idx, $name) = @$_;	601	my ($idx, $name) = @$_;
428		602
429	my $spell_cb = sub {	603	my $spell_cb = sub {
430	my ($widget, $ev) = @_;	604	my ($widget, $ev) = @_;
431		605
432	if ($ev->{button} == 1) {	606	if ($ev->{button} == 1) {
433	$::CONN->user_send ("ready_skill $name");	607	$::CONN->user_send ("ready_skill $name");
434	} elsif ($ev->{button} == 2) {	608	} elsif ($ev->{button} == 2) {
435	$::CONN->user_send ("use_skill $name");	609	$::CONN->user_send ("use_skill $name");
436	} elsif ($ev->{button} == 3) {	610	} elsif ($ev->{button} == 3) {
437	my $shortname = CFPlus::shorten $name, 14;	611	my $shortname = DC::shorten $name, 14;
438	(new CFPlus::UI::Menu	612	(new DC::UI::Menu
439	items => [	613	items => [
440	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],	614	["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
441	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],	615	["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
442	],	616	],
443	)->popup ($ev);	617	)->popup ($ev);
444	} else {	618	} else {
445	return 0;	619	return 0;
446	}	620	}
447		621
448	1	622	1
449	};	623	};
450		624
		625	my $sw = $self->{skillwid}{$idx} ||= [
		626	# exp
		627	(new DC::UI::Label
		628	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
		629
		630	# level
		631	(new DC::UI::Label
		632	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		633
		634	# progress
		635	(new DC::UI::ExperienceProgress),
		636
		637	# label
		638	(new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
		639	can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		640	];
		641
451	push @add,	642	push @add,
452	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	643	$x * 4 + 0, $y, $sw->[0],
453	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),	644	$x * 4 + 1, $y, $sw->[1],
454	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	645	$x * 4 + 2, $y, $sw->[2],
455	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),	646	$x * 4 + 3, $y, $sw->[3],
456	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
457	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458	;	647	;
459		648
460	$x++ and ($x, $y) = (0, $y + 1);	649	$x++ and ($x, $y) = (0, $y + 1);
461	}	650	}
462		651
463	$sktbl->add_at (@add);	652	$sktbl->add_at (@add);
464	}	653	}
465		654
466	for (grep exists $stats->{$_}, @skills) {	655	for (@order) {
467	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	656	my ($idx, $name) = @$_;
468	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	657	my $val = $stats->{$idx};
469	}
470	}
471		658
472	sub macro_send {	659	next if $prev->{$idx}[1] eq $val->[1];
473	my ($self, $macro) = @_;
474		660
475	for my $cmd (@{ $macro->{action} }) {	661	my $sw = $self->{skillwid}{$idx};
476	$self->send_command ($cmd);	662	$sw->[0]->set_text (::formsep ($val->[1]));
		663	$sw->[1]->set_text ($val->[0] * 1);
		664	$sw->[2]->set_value (@$val);
		665
		666	$::GAUGES->{skillexp}->set_label ("$name %d%%");
		667	$::GAUGES->{skillexp}->set_value (@$val);
477	}	668	}
478	}	669	}
479		670
480	sub user_send {	671	sub user_send {
481	my ($self, $command) = @_;	672	my ($self, $command) = @_;
…		…
483	$self->{record}->($command)	674	$self->{record}->($command)
484	if $self->{record};	675	if $self->{record};
485		676
486	$self->logprint ("send: ", $command);	677	$self->logprint ("send: ", $command);
487	$self->send_command ($command);	678	$self->send_command ($command);
488	::status ($command);
489	}	679	}
490		680
491	sub record {	681	sub record {
492	my ($self, $cb) = @_;	682	my ($self, $cb) = @_;
493		683
…		…
495	}	685	}
496		686
497	sub map_scroll {	687	sub map_scroll {
498	my ($self, $dx, $dy) = @_;	688	my ($self, $dx, $dy) = @_;
499		689
500	$self->{map}->scroll ($dx, $dy);	690	$self->{map_widget}->scroll ($dx, $dy);
501	}	691	}
502		692
503	sub feed_map1a {	693	sub feed_map1a {
504	my ($self, $data) = @_;	694	my ($self, $data) = @_;
505		695
506	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	696	my $missing = $self->{map}->map1a_update ($data);
		697	my $delay;
		698
		699	for my $tile (@$missing) {
		700	next if $self->{delay}{$tile};
		701
		702	$delay = 1;
		703
		704	if (my $tex = $self->{texture}[$tile]) {
		705	$tex->upload;
		706	} else {
		707	$self->{delay}{$tile} = 1;
		708
		709	# we assume the face is in-flight and will eventually arrive
		710	push @{$self->{tile_cb}{$tile}}, sub {
		711	delete $self->{delay}{$tile};
		712	$_[0]->upload;
		713	};
		714	}
		715	}
		716
		717	if ($delay) {
		718	# delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
		719	EV::once undef, 0, 0.03, sub {
		720	$self->{map_widget}->update
		721	if $self->{map_widget};
		722	};
		723	} else {
507	$self->{map_widget}->update;	724	$self->{map_widget}->update;
		725	}
508	}	726	}
509		727
510	sub magicmap {	728	sub magicmap {
511	my ($self, $w, $h, $x, $y, $data) = @_;	729	my ($self, $w, $h, $x, $y, $data) = @_;
512		730
…		…
514	}	732	}
515		733
516	sub flush_map {	734	sub flush_map {
517	my ($self) = @_;	735	my ($self) = @_;
518		736
519	my $map_info = delete $self->{map_info}	737	return unless $self->{map_info};
520	or return;
521		738
		739	for my $map_info (values %{ $self->{map_cache} || {} }) {
522	my ($hash, $x, $y, $w, $h) = @$map_info;	740	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
523		741
524	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	742	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
		743
		744	if ($data ne $$rdata) {
		745	$map_info->[1] = \$data;
		746	my $cdata = Compress::LZF::compress $data;
525	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	747	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
526	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	748	}
		749	}
527	}	750	}
528		751
529	sub map_clear {	752	sub map_clear {
530	my ($self) = @_;	753	my ($self) = @_;
531		754
532	$self->flush_map;	755	$self->flush_map;
		756	delete $self->{map_info};
533	delete $self->{neigh_map};	757	delete $self->{neigh_map};
534		758
535	$self->{map}->clear;	759	$self->{map}->clear;
536	delete $self->{map_widget}{magicmap};	760	delete $self->{map_widget}{magicmap};
537	}	761	}
538		762
539	sub bg_fetch {	763	sub bg_fetch {
540	my ($self) = @_;	764	my ($self) = @_;
541		765
542	my $id;	766	my $tile;
543		767
544	do {	768	do {
545	$id = pop @{$self->{bg_fetch}}	769	$tile = pop @{$self->{bg_fetch}}
546	or return;	770	or return;
547	} while $self->{texture}[$id];	771	} while $self->{texture}[$tile];
548		772
549	CFPlus::DB::exists tilecache => $id, sub {	773	DC::DB::get tilecache => $tile, sub {
550	my ($exists) = @_;	774	my ($data) = @_;
551		775
552	return unless $self->{map}; # stop when destroyed	776	return unless $self->{map}; # stop when destroyed
553		777
		778	if (defined $data) {
554	$self->have_tile ($id)	779	$self->have_tile ($tile, $data);
555	if $exists;	780	$self->{texture}[$tile]->upload;
		781	}
556		782
557	$self->bg_fetch;	783	$self->bg_fetch;
558	};	784	};
559	}	785	}
560		786
561	sub load_map($$$) {	787	sub load_map($$$$$$) {
562	my ($self, $hash, $x, $y) = @_;	788	my ($self, $hash, $x, $y, $w, $h) = @_;
563		789
564	my $gen = $self->{map_change_gen};	790	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
565		791
566	CFPlus::DB::get $self->{mapcache} => $hash, sub {	792	my $cb = sub {
567	return unless $gen == $self->{map_change_gen};	793	$map_info->[1] = \$_[0];
568		794
569	my ($data) = @_;
570
571	if (defined $data) {
572	$data = Compress::LZF::decompress $data;
573	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
574
575	my $inprogress = @{ $self->{bg_fetch} || [] };	795	my $inprogress = @{ $self->{bg_fetch} || [] };
576	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	796	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
577	$self->bg_fetch unless $inprogress;	797	$self->bg_fetch unless $inprogress;
578	}
579	};	798	};
		799
		800	if (my $map_info = $self->{map_cache_old}{$hash}) {
		801	$cb->(${ $map_info->[1] });
		802	} else {
		803	my $gen = $self->{map_change_gen};
		804
		805	DC::DB::get $self->{mapcache} => $hash, sub {
		806	return unless $gen == $self->{map_change_gen};
		807	return unless defined $_[0];
		808	$cb->(Compress::LZF::decompress $_[0]);
		809	};
		810	}
580	}	811	}
581		812
582	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	813	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
583	# (server resource,s latency, bandwidth), so this hack is warranted.	814	# (server resources, latency, bandwidth), so this hack is warranted.
584	# the right fix is to make real tiled maps with an overview file	815	# the right fix is to make real tiled maps with an overview file
585	sub send_mapinfo {	816	sub send_mapinfo {
586	my ($self, $data, $cb) = @_;	817	my ($self, $data, $cb) = @_;
587		818
588	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {	819	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
…		…
613	}	844	}
614		845
615	# this method does a "flood fill" into every tile direction	846	# this method does a "flood fill" into every tile direction
616	# it assumes that tiles are arranged in a rectangular grid,	847	# it assumes that tiles are arranged in a rectangular grid,
617	# i.e. a map is the same as the left of the right map etc.	848	# i.e. a map is the same as the left of the right map etc.
618	# failure to comply are harmless and result in display errors	849	# failure to comply is harmless and results in display errors
619	# at worst.	850	# at worst.
620	sub flood_fill {	851	sub flood_fill {
621	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	852	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
622		853
623	# the server does not allow map paths > 6	854	# the server does not allow map paths > 6
…		…
659	return if $mode ne "spatial";	890	return if $mode ne "spatial";
660		891
661	$x += $self->{map}->ox;	892	$x += $self->{map}->ox;
662	$y += $self->{map}->oy;	893	$y += $self->{map}->oy;
663		894
664	$self->load_map ($hash, $x, $y)	895	$self->load_map ($hash, $x, $y, $w, $h)
665	unless $self->{neigh_map}{$hash}[5]++;#d#	896	unless $self->{neigh_map}{$hash}[5]++;#d#
666		897
667	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	898	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
668		899
669	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	900	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
677	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	908	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
678		909
679	$self->flush_map;	910	$self->flush_map;
680		911
681	++$self->{map_change_gen};	912	++$self->{map_change_gen};
		913	$self->{map_cache_old} = delete $self->{map_cache};
682		914
683	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	915	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
684		916
685	my $mapmapw = $self->{mapmap}->{w};	917	my $mapmapw = $self->{mapmap}->{w};
686	my $mapmaph = $self->{mapmap}->{h};	918	my $mapmaph = $self->{mapmap}->{h};
…		…
698	$self->{map_info} = [$hash, $x, $y, $w, $h];	930	$self->{map_info} = [$hash, $x, $y, $w, $h];
699		931
700	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	932	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
701	$::STATWIDS->{map}->set_text ("Map: " . $map);	933	$::STATWIDS->{map}->set_text ("Map: " . $map);
702		934
703	$self->load_map ($hash, $x, $y);	935	$self->load_map ($hash, $x, $y, $w, $h);
704	$self->flood_fill (0, 0, 0, "", $hash, $flags);	936	$self->flood_fill (0, 0, 0, "", $hash, $flags);
705	}	937	}
706		938
707	sub face_find {	939	sub face_find {
708	my ($self, $facenum, $face, $cb) = @_;	940	my ($self, $facenum, $face, $cb) = @_;
709		941
710	if ($face->{type} == 0) { # FT_FACE	942	if ($face->{type} == 0) { # FT_FACE
711	my $id = CFPlus::DB::get_tile_id_sync $face->{name};	943	my $id = DC::DB::get_tile_id_sync $face->{name};
712		944
713	$face->{id} = $id;	945	$face->{id} = $id;
714	$self->{faceid}[$facenum] = $id;
715
716	$self->{map}->set_tileid ($facenum => $id);	946	$self->{map}->set_tileid ($facenum => $id);
717		947
718	CFPlus::DB::get tilecache => $id, $cb;	948	DC::DB::get tilecache => $id, $cb;
719		949
720	} elsif ($face->{type} & 1) { # with metadata	950	} elsif ($face->{type} & 1) { # with metadata
721	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722	CFPlus::DB::get res_meta => $face->{name}, $cb;	951	DC::DB::get res_meta => $face->{name}, $cb;
		952
		953	} else { # no metadata
		954	DC::DB::get res_data => $face->{name}, $cb;
723	}	955	}
724	}	956	}
725		957
726	sub face_update {	958	sub face_update {
727	my ($self, $facenum, $face, $changed) = @_;	959	my ($self, $facenum, $face, $changed) = @_;
728		960
729	if ($face->{type} == 0) { # FT_FACE	961	if ($face->{type} == 0) {
		962	# image, FT_FACE
730	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }	963	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
731	if $changed;	964	if $changed;
732		965
733	$self->have_tile ($face->{id});	966	$self->have_tile ($face->{id}, delete $face->{data});
734		967
735	} elsif ($face->{type} & 1) { # split metadata	968	} elsif ($face->{type} & 1) {
736	my $cb = sub { };	969	# split metadata case, FT_MUSIC, FT_SOUND
		970	if ($changed) { # new data
		971	my ($meta, $data) = unpack "(w/a*)*", $face->{data};
		972	$face->{data} = $meta;
		973
		974	# rely on strict ordering here and also on later fetch
		975	DC::DB::put res_data => $face->{name} => $data, sub { };
		976	DC::DB::put res_meta => $face->{name} => $meta, sub { };
		977	}
		978
		979	$face->{data} = $self->{json_coder}->decode ($face->{data});
		980	::add_license ($face);
		981	::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
		982	if $changed;
737		983
738	if ($face->{type} == 3) { # FT_MUSIC	984	if ($face->{type} == 3) { # FT_MUSIC
739	$cb = sub {
740	$self->{music_meta}{$facenum} = $face;
741
742	::message ({ markup => "downloaded song #$facenum" })
743	if $changed;
744
745	&::audio_music_push ($facenum);	985	&::audio_music_push ($facenum);
746	};
747	} elsif ($face->{type} == 5) { # FT_SOUND	986	} elsif ($face->{type} == 5) { # FT_SOUND
748	$cb = sub {
749	$self->{sound_meta}{$facenum} = $face;
750
751	::message ({ markup => "downloaded sound #$facenum" })
752	if $changed;
753
754	&::audio_sound_push ($facenum);	987	&::audio_sound_push ($facenum);
755	};	988	}
756	}
757		989
758	if ($changed) { # new data
759	my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763	$face->{meta} = $self->{json_coder}->decode ($meta_json);
764	::add_license ($face);
765	$cb->();
766	};
767
768	} else {	990	} else {
769	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});	991	# flat resource case, FT_RSRC
770	::add_license ($face);	992	DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
771	$cb->();	993	if $changed;
772	}	994	}
		995
		996	if (my $cbs = $self->{face_cb}{$facenum}) {
		997	$_->($face, $changed) for @$cbs;
773	}	998	}
774	}	999	}
775		1000
776	sub smooth_update {	1001	sub smooth_update {
777	my ($self, $facenum, $face) = @_;	1002	my ($self, $facenum, $face) = @_;
778		1003
779	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	1004	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
780	}	1005	}
781		1006
782	sub have_tile {	1007	sub have_tile {
783	my ($self, $tile) = @_;	1008	my ($self, $tile, $data) = @_;
784		1009
785	return unless $self->{map};	1010	return unless $self->{map};
786		1011
787	$self->{texture}[$tile] ||= my $tex =	1012	my $tex = $self->{texture}[$tile] ||=
788	new CFPlus::Texture	1013	new DC::Texture
789	tile => $tile, minify => 1, mipmap => 1, delay => 1;	1014	tile => $tile,
		1015	image => $data, delete_image => 1,
		1016	minify => 1;
790		1017
791	$_->() for @{(delete $self->{face_cb}{$tile}) || []};	1018	if (my $cbs = delete $self->{tile_cb}{$tile}) {
		1019	$_->($tex) for @$cbs;
		1020	}
792	}	1021	}
793		1022
794	sub connect_face_update {	1023	# call in non-void context registers a temporary
		1024	# hook with handle, otherwise its permanent
		1025	sub on_face_change {
795	my ($self, $id, $cb) = @_;	1026	my ($self, $num, $cb) = @_;
796		1027
797	push @{$self->{face_cb}{$id}}, $cb;	1028	push @{$self->{face_cb}{$num}}, $cb;
798		1029
799	CFPlus::guard {	1030	defined wantarray
		1031	? Guard::guard {
800	@{$self->{face_cb}{$id}}	1032	@{$self->{face_cb}{$num}}
801	= grep $_ != $cb,	1033	= grep $_ != $cb,
802	@{$self->{face_cb}{$id}};	1034	@{$self->{face_cb}{$num}};
803	}	1035	}
		1036	: ()
		1037	}
		1038
		1039	# call in non-void context registers a temporary
		1040	# hook with handle, otherwise its permanent
		1041	sub register_face_handler {
		1042	my ($self, $num, $cb) = @_;
		1043
		1044	return unless $num;
		1045
		1046	# invoke if available right now
		1047	$cb->($self->{face}[$num], 0)
		1048	unless exists $self->{face}[$num]{loading};
		1049
		1050	# future changes
		1051	$self->on_face_change ($num => $cb)
804	}	1052	}
805		1053
806	sub sound_play {	1054	sub sound_play {
807	my ($self, $type, $face, $dx, $dy, $vol) = @_;	1055	my ($self, $type, $face, $dx, $dy, $vol) = @_;
808		1056
…		…
816	my ($self, $flags, $prompt) = @_;	1064	my ($self, $flags, $prompt) = @_;
817		1065
818	$prompt = $LAST_QUERY unless length $prompt;	1066	$prompt = $LAST_QUERY unless length $prompt;
819	$LAST_QUERY = $prompt;	1067	$LAST_QUERY = $prompt;
820		1068
821	$self->{query}-> ($self, $flags, $prompt);	1069	$self->{query}->($self, $flags, $prompt);
822	}	1070	}
823		1071
824	sub sanitise_xml($) {	1072	sub sanitise_xml($) {
825	local $_ = shift;	1073	local $_ = shift;
826		1074
827	# we now weed out all tags we do not support	1075	# we now weed out all tags we do not support
828	s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;	1076	s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
		1077	}{
		1078	"&lt;"
		1079	}gex;
		1080
829	# now all entities	1081	# now all entities
830	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;	1082	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
831		1083
832	# handle some elements	1084	# handle some elements
833	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;	1085	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
834	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;	1086	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		1087
		1088	s/\s+$//;
835		1089
836	$_	1090	$_
837	}	1091	}
838		1092
839	our %NAME_TO_COLOR = (	1093	our %NAME_TO_COLOR = (
…		…
852	tan => 12,	1106	tan => 12,
853	);	1107	);
854		1108
855	our @CF_COLOR = (	1109	our @CF_COLOR = (
856	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1110	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
857	[1.00, 1.00, 1.00],	1111	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
858	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1112	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55],
859	[1.00, 0.00, 0.00],	1113	[1.00, 0.00, 0.00],
860	[1.00, 0.54, 0.00],	1114	[1.00, 0.54, 0.00],
861	[0.11, 0.56, 1.00],	1115	[0.11, 0.56, 1.00],
862	[0.93, 0.46, 0.00],	1116	[0.93, 0.46, 0.00],
863	[0.18, 0.54, 0.34],	1117	[0.18, 0.54, 0.34],
…		…
880	$self->{$type} = $text;	1134	$self->{$type} = $text;
881	} else {	1135	} else {
882	$self->logprint ("msg: ", $text);	1136	$self->logprint ("msg: ", $text);
883	return if $color < 0; # negative color == ignore if not understood	1137	return if $color < 0; # negative color == ignore if not understood
884		1138
885	my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];	1139	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
886		1140
887	## try to create single paragraphs of multiple lines sent by the server	1141	::message ({
888	# no longer neecssary with TRT servers	1142	fg => $fg,
889	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1143	markup => $text,
		1144	type => $type,
		1145	extra => [@extra],
		1146	color_flags => $color, #d# ugly, kill
		1147	});
890		1148
891	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })	1149	# $color &= ~NDI_CLEAR; # only clear once for multiline messages
892	for split /\n/, $text;	1150	# # actually, this is an ugly design. _we_ should control the channels,
		1151	# # not some random other widget, as the channels are clearly protocol-specific.
		1152	# # then we could also react to flags such as CLEAR without resorting to
		1153	# # hacks such as color_flags, above.
893		1154
894	$self->{statusbox}->add ($text,	1155	$self->{statusbox}->add ($text,
895	group => $text,	1156	group => $text,
896	fg => $fg,	1157	fg => $fg,
897	timeout => $color >= 2 ? 180 : 10,	1158	timeout => $color >= 2 ? 180 : 10,
898	tooltip_font => $::FONT_FIXED,	1159	tooltip_font => $::FONT_FIXED,
899	);	1160	) if $type eq "info";
900	}	1161	}
901	}	1162	}
902		1163
903	sub spell_add {	1164	sub spell_add {
904	my ($self, $spell) = @_;	1165	my ($self, $spell) = @_;
…		…
908	$spell->{message} =~ s/\n+$//;	1169	$spell->{message} =~ s/\n+$//;
909	$spell->{message} ||= "Server did not provide a description for this spell.";	1170	$spell->{message} ||= "Server did not provide a description for this spell.";
910		1171
911	$::SPELL_LIST->add_spell ($spell);	1172	$::SPELL_LIST->add_spell ($spell);
912		1173
913	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1174	$self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
914	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	1175	$self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
915	}	1176	}
916		1177
917	sub spell_delete {	1178	sub spell_delete {
918	my ($self, $spell) = @_;	1179	my ($self, $spell) = @_;
919		1180
…		…
930	sub addme_success {	1191	sub addme_success {
931	my ($self) = @_;	1192	my ($self) = @_;
932		1193
933	my %skill_help;	1194	my %skill_help;
934		1195
935	for my $node (CFPlus::Pod::find skill_description => "*") {	1196	for my $node (DC::Pod::find skill_description => "*") {
936	my (undef, @par) = CFPlus::Pod::section_of $node;	1197	my (undef, @par) = DC::Pod::section_of $node;
937	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1198	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
938	};	1199	};
939		1200
940	for my $skill (values %{$self->{skill_info}}) {	1201	for my $skill (values %{$self->{skill_info}}) {
941	$self->{map_widget}->add_command ("ready_skill $skill",	1202	$self->{map_widget}->add_command ("ready_skill $skill",
942	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1203	(DC::asxml "Ready the skill '$skill'\n\n")
943	. $skill_help{$skill});	1204	. $skill_help{$skill});
944	$self->{map_widget}->add_command ("use_skill $skill",	1205	$self->{map_widget}->add_command ("use_skill $skill",
945	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1206	(DC::asxml "Immediately use the skill '$skill'\n\n")
946	. $skill_help{$skill});	1207	. $skill_help{$skill});
947	}	1208	}
948	}	1209	}
949		1210
950	sub eof {	1211	sub eof {
…		…
954		1215
955	::stop_game ();	1216	::stop_game ();
956	}	1217	}
957		1218
958	sub update_floorbox {	1219	sub update_floorbox {
959	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1220	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
960	return unless $::CONN;	1221	return unless $::CONN;
961		1222
962	$::FLOORBOX->clear;	1223	$::FLOORBOX->clear;
963		1224
964	my @add;	1225	my @add;
965		1226
966	my $row;	1227	my $row;
967	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {	1228	for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
		1229	next if $_->{tag} & 0x80000000;
968	if ($row < 6) {	1230	if ($row < 6) {
969	local $_->{face_widget}; # hack to force recreation of widget	1231	local $_->{face_widget}; # hack to force recreation of widget
970	local $_->{desc_widget}; # hack to force recreation of widget	1232	local $_->{desc_widget}; # hack to force recreation of widget
971	CFPlus::Item::update_widgets $_;	1233	DC::Item::update_widgets $_;
972		1234
973	push @add,	1235	push @add,
974	0, $row, $_->{face_widget},	1236	0, $row, $_->{face_widget},
975	1, $row, $_->{desc_widget};	1237	1, $row, $_->{desc_widget};
976		1238
977	$row++;	1239	$row++;
978	} else {	1240	} else {
979	push @add, 1, $row, new CFPlus::UI::Button	1241	push @add, 1, $row, new DC::UI::Button
980	text => "More...",	1242	text => "More...",
981	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1243	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
982	;	1244	;
983	last;	1245	last;
984	}	1246	}
985	}	1247	}
986	if ($::CONN->{open_container}) {	1248	if ($::CONN->{open_container}) {
987	push @add, 1, $row++, new CFPlus::UI::Button	1249	push @add, 1, $row++, new DC::UI::Button
988	text => "Close container",	1250	text => "Close container",
989	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1251	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
990	;	1252	;
991	}	1253	}
992		1254
993	$::FLOORBOX->add_at (@add);	1255	$::FLOORBOX->add_at (@add);
994	});	1256	});
995		1257
996	$::WANT_REFRESH++;	1258	$::WANT_REFRESH = 1;
997	}	1259	}
998		1260
999	sub set_opencont {	1261	sub set_opencont {
1000	my ($conn, $tag, $name) = @_;	1262	my ($conn, $tag, $name) = @_;
1001	$conn->{open_container} = $tag;	1263	$conn->{open_container} = $tag;
1002	update_floorbox;	1264	update_floorbox;
1003		1265
1004	$::INV_RIGHT_HB->clear ();	1266	$::INVR_HB->clear;
1005	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1267	$::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1006		1268
1007	if ($tag != 0) { # Floor isn't closable, is it?	1269	if ($tag != 0) { # Floor isn't closable, is it?
1008	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1270	$::INVR_HB->add (new DC::UI::Button
1009	text => "Close container",	1271	text => "Close container",
1010	tooltip => "Close the currently open container (if one is open)",	1272	tooltip => "Close the currently open container (if one is open)",
1011	on_activate => sub {	1273	on_activate => sub {
1012	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1274	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1013	if $tag != 0;	1275	if $tag != 0;
1014	#if $CONN->{open_container} != 0;
1015	0	1276	0
1016	},	1277	},
1017	);	1278	);
1018	}	1279	}
1019		1280
…		…
1021	}	1282	}
1022		1283
1023	sub update_containers {	1284	sub update_containers {
1024	my ($self) = @_;	1285	my ($self) = @_;
1025		1286
1026	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1287	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1027	my $todo = delete $self->{update_container}	1288	my $todo = delete $self->{update_container}
1028	or return;	1289	or return;
1029		1290
1030	for my $tag (keys %$todo) {	1291	for my $tag (keys %$todo) {
1031	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1292	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
1066	}	1327	}
1067		1328
1068	sub item_update {	1329	sub item_update {
1069	my ($self, $item) = @_;	1330	my ($self, $item) = @_;
1070		1331
1071	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1332	#print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1072		1333
1073	CFPlus::Item::update_widgets $item;	1334	DC::Item::update_widgets $item;
1074		1335
1075	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1336	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1076	set_opencont ($::CONN, 0, "Floor");	1337	set_opencont ($::CONN, 0, "Floor");
1077		1338
1078	} elsif ($item->{flags} & F_OPEN) {	1339	} elsif ($item->{flags} & F_OPEN) {
1079	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1340	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1080		1341
1081	} else {	1342	} else {
1082	$self->{update_container}{$item->{container}}++;	1343	$self->{update_container}{$item->{container}}++;
1083	$self->update_containers;	1344	$self->update_containers;
1084	}	1345	}
…		…
1095		1356
1096	my $weight = .001 * $self->{player}{weight};	1357	my $weight = .001 * $self->{player}{weight};
1097	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1358	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1098		1359
1099	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1360	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1100	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1361	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1101	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1362	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1102	}	1363	}
1103		1364
1104	sub update_server_info {	1365	sub update_server_info {
1105	my ($self) = @_;	1366	my ($self) = @_;
1106		1367
1107	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");	1368	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1108		1369
		1370	my $version = JSON::XS->new->encode ($self->{s_version});
		1371
1109	$::SERVER_INFO->set_markup (	1372	$::SERVER_INFO->set_markup (
1110	"server <tt>$self->{host}:$self->{port}</tt>\n"	1373	"server <tt>$self->{host}:$self->{port}</tt>\n"
1111	. "protocol version <tt>$self->{version}</tt>\n"	1374	. "protocol version <tt>$version</tt>\n"
1112	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1113	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1114	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1115	. "editing support $yesno[!!$self->{editor_support}]\n"	1375	. "editing support $yesno[!!$self->{editor_support}]\n"
1116	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1117	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1118	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1376	. "client support $yesno[$self->{cfplus_ext} > 0]"
1119	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1377	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1120	. "map size $self->{mapw}×$self->{maph}\n"	1378	. "map size $self->{mapw}×$self->{maph}\n"
1121	);	1379	);
1122		1380
1123	}	1381	}
…		…
1143	0	1401	0
1144	});	1402	});
1145		1403
1146	$self->update_server_info;	1404	$self->update_server_info;
1147		1405
1148	$self->send_command ("output-sync $::CFG->{output_sync}");
1149	$self->send_command ("output-count $::CFG->{output_count}");
1150	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1406	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1151	$self->send_command ("pickup $::CFG->{pickup}");	1407	$self->send_pickup ($::CFG->{pickup});
1152	}	1408	}
1153		1409
1154	sub lookat {	1410	sub lookat {
1155	my ($self, $x, $y) = @_;	1411	my ($self, $x, $y) = @_;
1156		1412
…		…
1158	$self->send_ext_req (lookat => $x, $y, sub {	1414	$self->send_ext_req (lookat => $x, $y, sub {
1159	my (%msg) = @_;	1415	my (%msg) = @_;
1160		1416
1161	if (exists $msg{npc_dialog}) {	1417	if (exists $msg{npc_dialog}) {
1162	# start npc chat dialog	1418	# start npc chat dialog
1163	$self->{npc_dialog} = new CFPlus::NPCDialog::	1419	$self->{w}{npc_dialog} = new DC::NPCDialog::
1164	token => $msg{npc_dialog},	1420	token => $msg{npc_dialog},
1165	title => "$msg{npc_dialog}[0] (NPC)",	1421	title => "$msg{npc_dialog}[0] (NPC)",
1166	conn => $self,	1422	conn => $self,
1167	;	1423	;
1168	}	1424	}
…		…
1173	}	1429	}
1174		1430
1175	sub destroy {	1431	sub destroy {
1176	my ($self) = @_;	1432	my ($self) = @_;
1177		1433
1178	(delete $self->{npc_dialog})->destroy	1434	$_->destroy
1179	if $self->{npc_dialog};	1435	for values %{ $self->{w} };
1180		1436
1181	$self->SUPER::destroy;	1437	$self->SUPER::destroy;
1182		1438
1183	%$self = ();	1439	%$self = ();
1184	}	1440	}
1185		1441
1186	package CFPlus::NPCDialog;	1442	package DC::NPCDialog;
1187		1443
1188	our @ISA = 'CFPlus::UI::Toplevel';	1444	our @ISA = 'DC::UI::Toplevel';
1189		1445
1190	sub new {	1446	sub new {
1191	my $class = shift;	1447	my $class = shift;
1192		1448
1193	my $self = $class->SUPER::new (	1449	my $self = $class->SUPER::new (
…		…
1200	kw => { hi => 0, yes => 0, no => 0 },	1456	kw => { hi => 0, yes => 0, no => 0 },
1201	has_close_button => 1,	1457	has_close_button => 1,
1202	@_,	1458	@_,
1203	);	1459	);
1204		1460
1205	CFPlus::weaken (my $this = $self);	1461	DC::weaken (my $this = $self);
1206		1462
1207	$self->connect (delete => sub { $this->destroy; 1 });	1463	$self->connect (delete => sub { $this->destroy; 1 });
1208		1464
1209	# better use a pane...	1465	# better use a pane...
1210	$self->add (my $hbox = new CFPlus::UI::HBox);	1466	$self->add (my $hbox = new DC::UI::HBox);
1211	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1467	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1212		1468
1213	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1469	$hbox->add (my $vbox = new DC::UI::VBox);
1214		1470
1215	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1471	$vbox->add (new DC::UI::Label text => "Message Entry:");
1216	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1472	$vbox->add ($self->{entry} = new DC::UI::Entry
1217	tooltip => "#npc_message_entry",	1473	tooltip => "#npc_message_entry",
1218	on_activate => sub {	1474	on_activate => sub {
1219	my ($entry, $text) = @_;	1475	my ($entry, $text) = @_;
1220		1476
1221	return unless $text =~ /\S/;	1477	return unless $text =~ /\S/;
…		…
1225		1481
1226	0	1482	0
1227	},	1483	},
1228	);	1484	);
1229		1485
1230	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1486	$vbox->add ($self->{options} = new DC::UI::VBox);
1231		1487
1232	$self->{bye_button} = new CFPlus::UI::Button	1488	$self->{bye_button} = new DC::UI::Button
1233	text => "Bye (close)",	1489	text => "Bye (close)",
1234	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1490	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1235	on_activate => sub { $this->destroy; 1 },	1491	on_activate => sub { $this->destroy; 1 },
1236	;	1492	;
1237		1493
…		…
1256	};	1512	};
1257		1513
1258	sub update_options {	1514	sub update_options {
1259	my ($self) = @_;	1515	my ($self) = @_;
1260		1516
1261	CFPlus::weaken $self;	1517	DC::weaken $self;
1262		1518
1263	$self->{options}->clear;	1519	$self->{options}->clear;
1264	$self->{options}->add ($self->{bye_button});	1520	$self->{options}->add ($self->{bye_button});
1265		1521
1266	for my $kw (sort keys %{ $self->{kw} }) {	1522	for my $kw (sort keys %{ $self->{kw} }) {
1267	$self->{options}->add (new CFPlus::UI::Button	1523	$self->{options}->add (new DC::UI::Button
1268	text => $kw,	1524	text => $kw,
1269	on_activate => sub {	1525	on_activate => sub {
1270	$self->send ($kw);	1526	$self->send ($kw);
1271	0	1527	0
1272	},	1528	},
…		…
1275	}	1531	}
1276		1532
1277	sub feed {	1533	sub feed {
1278	my ($self, $type, @arg) = @_;	1534	my ($self, $type, @arg) = @_;
1279		1535
1280	CFPlus::weaken $self;	1536	DC::weaken $self;
1281		1537
1282	if ($type eq "update") {	1538	if ($type eq "update") {
1283	my (%info) = @arg;	1539	my (%info) = @arg;
1284		1540
1285	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};	1541	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};	1542	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287		1543
1288	if (exists $info{msg}) {	1544	if (exists $info{msg}) {
1289	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};	1545	my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1290	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1546	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291	my @link;	1547	my @link;
1292	$text =~ s{	1548	$text =~ s{
1293	($match)	1549	($match)
1294	}{	1550	}{
1295	my $kw = $1;	1551	my $kw = $1;
1296		1552
1297	push @link, new CFPlus::UI::Label	1553	push @link, new DC::UI::Label
1298	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",	1554	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299	can_hover => 1,	1555	can_hover => 1,
1300	can_events => 1,	1556	can_events => 1,
1301	padding_x => 0,	1557	padding_x => 0,
1302	padding_y => 0,	1558	padding_y => 0,
…		…
1320	}	1576	}
1321		1577
1322	sub send {	1578	sub send {
1323	my ($self, $msg) = @_;	1579	my ($self, $msg) = @_;
1324		1580
1325	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1581	$self->{textview}->add_paragraph ({
		1582	markup =>
		1583	"\n<span foreground='#ffff00'><b>"
		1584	. (DC::asxml $msg)
		1585	. "</b></span>"
		1586	});
1326	$self->{textview}->scroll_to_bottom;	1587	$self->{textview}->scroll_to_bottom;
1327		1588
1328	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);	1589	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1329	}	1590	}
1330		1591
…		…
1333		1594
1334	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1595	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1335		1596
1336	if ($self->{conn}) {	1597	if ($self->{conn}) {
1337	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};	1598	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1338	delete $self->{conn}{npc_dialog};	1599	delete $self->{conn}{w}{npc_dialog};
1339	$self->{conn}->disconnect_ext ($self->{id});	1600	$self->{conn}->disconnect_ext ($self->{id});
1340	}	1601	}
1341		1602
1342	$self->SUPER::destroy;	1603	$self->SUPER::destroy;
1343	}	1604	}

Diff Legend

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