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

Diff Legend

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