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

Diff Legend

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