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

Diff Legend

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