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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.221 by root, Sun Nov 4 02:13:53 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,
		32	widget => 2,
25	%{$arg{setup_req} || {}},	33	%{$arg{setup_req} || {}},
26	},	34	},
27	);	35	);
28		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
29	$self->{map_widget}->clr_commands;	84	$self->{map_widget}->clr_commands;
30		85
31	my @cmd_help = map {	86	my @cmd_help = map {
32	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	87	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
33	or die "unparseable command help: $_->{kw}[0]";	88	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
34		89
35	my $cmd = $1;	90	my $cmd = $1;
36	my @args = split /\|/, $2;	91	my @args = split /\|/, $2;
37	@args = (".*") unless @args;	92	@args = (".*") unless @args;
38		93
39	my (undef, @par) = CFPlus::Pod::section_of $_;	94	my (undef, @par) = DC::Pod::section_of $_;
40	my $text = CFPlus::Pod::as_label @par;	95	my $text = DC::Pod::as_label @par;
41		96
42	$_ = $_ eq ".*" ? "" : " $_"	97	$_ = $_ eq ".*" ? "" : " $_"
43	for @args;	98	for @args;
44		99
45	map ["$cmd$_", $text],	100	map ["$cmd$_", $text],
46	sort { (length $a) <=> (length $b) }	101	sort { (length $a) <=> (length $b) }
47	@args	102	@args
48	} sort { $a->{par} <=> $b->{par} }	103	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
49	CFPlus::Pod::find command => "*";	104	DC::Pod::find command => "*";
50		105
51	$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 {
52	my ($cap) = @_;	112	my ($id) = @_;
53		113	sub {
54	if (my $ts = $cap->{tileset}) {	114	$self->send_exti_msg (w_e => $id, @_);
55	if (my ($default) = grep $_->[2] & 1, @$ts) {
56	$self->{tileset} = $default;
57	$self->{tilesize} = $default->[3];
58	$self->setup_req (tileset => $default->[0]);
59
60	my $w = int $self->{mapw} * 32 / $self->{tilesize};
61	my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63	$self->setup_req (mapsize => "${w}x${h}");
64	}	115	}
65	}	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;
66	});	130	});
67		131
68	$self->{map_widget}->add_command (@$_)	132	$self->{map_widget}->add_command (@$_)
69	for @cmd_help;	133	for @cmd_help;
70		134
71	{	135	{
72	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	136	$self->{dialogue} = my $tex = $TEX_DIALOGUE;
73	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
74	$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}});
75	}	138	}
76		139
77	{	140	{
78	$self->{noface} = my $tex = new_from_file CFPlus::Texture	141	$self->{noface} = my $tex = $TEX_NOFACE;
79	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80	$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}});
81	}	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	# };
82		159
83	$self->{open_container} = 0;	160	$self->{open_container} = 0;
84		161
85	# per server	162	# per server
86	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	163	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
87		164
88	$self	165	$self
89	}	166	}
90		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
91	sub logprint {	406	sub logprint {
92	my ($self, @a) = @_;	407	my ($self, @a) = @_;
93		408
94	$self->{log_fh} ||= do {	409	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
95	my $path = "$Crossfire::VARDIR/log.$self->{host}";
96
97	open my $fh, ">>:utf8", $path
98	or die "Couldn't open logfile $path: $!";
99
100	$fh->autoflush (1);
101
102	$fh;
103	};
104
105	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
106
107	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
108	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
109
110	print {$self->{log_fh}} "$ts ", @a, "\n";
111	}	410	}
112		411
113	sub _stat_numdiff {	412	sub _stat_numdiff {
114	my ($self, $name, $old, $new) = @_;	413	my ($self, $name, $old, $new) = @_;
115		414
…		…
133	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})	432	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
134	: ()	433	: ()
135	}	434	}
136	sort { $a <=> $b } keys %{$self->{spell_paths}};	435	sort { $a <=> $b } keys %{$self->{spell_paths}};
137		436
138	join "", @diff	437	"\u$name: " . (join ", ", @diff)
139	}	438	}
140		439
141	# all stats that are chacked against changes	440	# all stats that are chacked against changes
142	my @statchange = (	441	my @statchange = (
143	[&CS_STAT_STR => \&_stat_numdiff, "Str"],	442	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
…		…
186		485
187	if (my @diffs =	486	if (my @diffs =
188	(	487	(
189	($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" : ()),
190	map {	489	map {
191	$stats->{$_} && $prev->{$_}	490	$stats->{$_} && $prev->{$_}
192	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()	491	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
193	} sort { $a <=> $b } keys %{$self->{skill_info}}	492	} sort { $a <=> $b } keys %{$self->{skill_info}}
194	)	493	)
195	) {	494	) {
196	my $msg = join " ", @diffs;	495	my $msg = join " ", @diffs;
…		…
198	}	497	}
199		498
200	if (	499	if (
201	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	500	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
202	) {	501	) {
203	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	502	my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
204	$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);
205	}	504	}
206		505
207	$self->update_stats_window ($stats, $prev);	506	$self->update_stats_window ($stats, $prev);
208		507
209	$self->{prev_stats} = { %$stats };	508	$self->{prev_stats} = { %$stats };
…		…
246		545
247	$::GAUGES->{hp} ->set_value ($hp, $hp_m);	546	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
248	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	547	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
249	$::GAUGES->{food} ->set_value ($fo, $fo_m);	548	$::GAUGES->{food} ->set_value ($fo, $fo_m);
250	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	549	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
251	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	550	$::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
252	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	551	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253	my $rng = $stats->{+CS_STAT_RANGE};	552	$::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
254	$rng =~ s/^Range: //; # thank you so much dear server	553	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
255	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
256	my $title = $stats->{+CS_STAT_TITLE};	554	my $title = $stats->{+CS_STAT_TITLE};
257	$title =~ s/^Player: //;	555	$title =~ s/^Player: //;
258	$::STATWIDS->{title} ->set_text ("Title: " . $title);	556	$::STATWIDS->{title} ->set_text ("Title: " . $title);
259		557
260	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	558	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
271	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});	569	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
272	$::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});
273		571
274	$self->update_weight;	572	$self->update_weight;
275		573
276	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})	574	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
277	for keys %RES_TBL;	575	for keys %RES_TBL;
278		576
279	my $sktbl = $::STATWIDS->{skill_tbl};	577	my $sktbl = $::STATWIDS->{skill_tbl};
280	my @skills = keys %{ $self->{skill_info} };	578	my @skills = keys %{ $self->{skill_info} };
281		579
282	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
283	$sktbl->clear;	588	$sktbl->clear;
284		589
		590	my $sw = $self->{skillwid}{""} ||= [
285	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	591	0, 0, (new DC::UI::Label text => "Experience", align => 1),
286	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	592	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
287	$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),
288	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	595	4, 0, (new DC::UI::Label text => "Experience", align => 1),
289	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	596	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
290	$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	];
291		600
		601	my @add = @$sw;
		602
292	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>";
293		604
294	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);
295	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);
296		607
297	my ($x, $y) = (0, 1);	608	my ($x, $y) = (0, 1);
298	for (	609	for (@order) {
299	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
300	map [$_, $self->{skill_info}{$_}],
301	grep exists $stats->{$_},
302	@skills
303	) {
304	my ($idx, $name) = @$_;	610	my ($idx, $name) = @$_;
305		611
306	my $spell_cb = sub {	612	my $spell_cb = sub {
307	my ($widget, $ev) = @_;	613	my ($widget, $ev) = @_;
308		614
309	if ($ev->{button} == 1) {	615	if ($ev->{button} == 1) {
310	$::CONN->user_send ("ready_skill $name");	616	$::CONN->user_send ("ready_skill $name");
311	} elsif ($ev->{button} == 2) {	617	} elsif ($ev->{button} == 2) {
312	$::CONN->user_send ("use_skill $name");	618	$::CONN->user_send ("use_skill $name");
313	} elsif ($ev->{button} == 3) {	619	} elsif ($ev->{button} == 3) {
314	my $shortname = CFPlus::shorten $name, 14;	620	my $shortname = DC::shorten $name, 14;
315	(new CFPlus::UI::Menu	621	(new DC::UI::Menu
316	items => [	622	items => [
317	["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"] }],
318	["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"] }],
319	],	625	],
320	)->popup ($ev);	626	)->popup ($ev);
321	} else {	627	} else {
322	return 0;	628	return 0;
323	}	629	}
324		630
325	1	631	1
326	};	632	};
327		633
328	$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
329	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),
330	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	638
		639	# level
		640	(new DC::UI::Label
331	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
332	$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,
333	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	;
334		657
335	$x++ and ($x, $y) = (0, $y + 1);	658	$x++ and ($x, $y) = (0, $y + 1);
336	}	659	}
337	}
338		660
339	for (grep exists $stats->{$_}, @skills) {	661	$sktbl->add_at (@add);
340	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
342	}	662	}
343	}
344		663
345	sub macro_send {	664	for (@order) {
346	my ($self, $macro) = @_;	665	my ($idx, $name) = @$_;
		666	my $val = $stats->{$idx};
347		667
348	for my $cmd (@{ $macro->{action} }) {	668	next if $prev->{$idx}[1] eq $val->[1];
349	$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);
350	}	677	}
351	}	678	}
352		679
353	sub user_send {	680	sub user_send {
354	my ($self, $command) = @_;	681	my ($self, $command) = @_;
…		…
356	$self->{record}->($command)	683	$self->{record}->($command)
357	if $self->{record};	684	if $self->{record};
358		685
359	$self->logprint ("send: ", $command);	686	$self->logprint ("send: ", $command);
360	$self->send_command ($command);	687	$self->send_command ($command);
361	::status ($command);
362	}	688	}
363		689
364	sub record {	690	sub record {
365	my ($self, $cb) = @_;	691	my ($self, $cb) = @_;
366		692
…		…
368	}	694	}
369		695
370	sub map_scroll {	696	sub map_scroll {
371	my ($self, $dx, $dy) = @_;	697	my ($self, $dx, $dy) = @_;
372		698
373	$self->{map}->scroll ($dx, $dy);	699	$self->{map_widget}->scroll ($dx, $dy);
374	}	700	}
375		701
376	sub feed_map1a {	702	sub feed_map1a {
377	my ($self, $data) = @_;	703	my ($self, $data) = @_;
378		704
379	$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 {
380	$self->{map_widget}->update;	733	$self->{map_widget}->update;
		734	}
381	}	735	}
382		736
383	sub magicmap {	737	sub magicmap {
384	my ($self, $w, $h, $x, $y, $data) = @_;	738	my ($self, $w, $h, $x, $y, $data) = @_;
385		739
…		…
387	}	741	}
388		742
389	sub flush_map {	743	sub flush_map {
390	my ($self) = @_;	744	my ($self) = @_;
391		745
392	my $map_info = delete $self->{map_info}	746	return unless $self->{map_info};
393	or return;
394		747
		748	for my $map_info (values %{ $self->{map_cache} || {} }) {
395	my ($hash, $x, $y, $w, $h) = @$map_info;	749	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
396		750
397	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;
398	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	756	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
399	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	757	}
		758	}
400	}	759	}
401		760
402	sub map_clear {	761	sub map_clear {
403	my ($self) = @_;	762	my ($self) = @_;
404		763
405	$self->flush_map;	764	$self->flush_map;
		765	delete $self->{map_info};
406	delete $self->{neigh_map};	766	delete $self->{neigh_map};
407		767
408	$self->{map}->clear;	768	$self->{map}->clear;
409	delete $self->{map_widget}{magicmap};	769	delete $self->{map_widget}{magicmap};
410	}	770	}
411		771
412	sub bg_fetch {	772	sub bg_fetch {
413	my ($self) = @_;	773	my ($self) = @_;
414		774
415	my $id;	775	my $tile;
416		776
417	do {	777	do {
418	$id = pop @{$self->{bg_fetch}}	778	$tile = pop @{$self->{bg_fetch}}
419	or return;	779	or return;
420	} while $self->{texture}[$id];	780	} while $self->{texture}[$tile];
421		781
422	CFPlus::DB::get tilecache => $id, sub {	782	DC::DB::get tilecache => $tile, sub {
423	my ($data) = @_;	783	my ($data) = @_;
424		784
425	return unless $self->{map}; # stop when destroyed	785	return unless $self->{map}; # stop when destroyed
426		786
427	$self->set_texture ($id => $data)
428	if defined $data;	787	if (defined $data) {
		788	$self->have_tile ($tile, $data);
		789	$self->{texture}[$tile]->upload;
		790	}
429		791
430	$self->bg_fetch;	792	$self->bg_fetch;
431	};	793	};
432	}	794	}
433		795
434	sub load_map($$$) {	796	sub load_map($$$$$$) {
435	my ($self, $hash, $x, $y) = @_;	797	my ($self, $hash, $x, $y, $w, $h) = @_;
436		798
437	my $gen = $self->{map_change_gen};	799	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
438		800
439	CFPlus::DB::get $self->{mapcache} => $hash, sub {	801	my $cb = sub {
440	return unless $gen == $self->{map_change_gen};	802	$map_info->[1] = \$_[0];
441		803
442	my ($data) = @_;
443
444	if (defined $data) {
445	$data = Compress::LZF::decompress $data;
446	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
447
448	my $inprogress = @{ $self->{bg_fetch} || [] };	804	my $inprogress = @{ $self->{bg_fetch} || [] };
449	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	805	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
450	$self->bg_fetch unless $inprogress;	806	$self->bg_fetch unless $inprogress;
451	}
452	};	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	}
453	}	820	}
454		821
455	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	822	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
456	# (server resource,s latency, bandwidth), so this hack is warranted.	823	# (server resources, latency, bandwidth), so this hack is warranted.
457	# 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
458	sub send_mapinfo {	825	sub send_mapinfo {
459	my ($self, $data, $cb) = @_;	826	my ($self, $data, $cb) = @_;
460		827
461	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)$%) {
…		…
486	}	853	}
487		854
488	# this method does a "flood fill" into every tile direction	855	# this method does a "flood fill" into every tile direction
489	# it assumes that tiles are arranged in a rectangular grid,	856	# it assumes that tiles are arranged in a rectangular grid,
490	# 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.
491	# failure to comply are harmless and result in display errors	858	# failure to comply is harmless and results in display errors
492	# at worst.	859	# at worst.
493	sub flood_fill {	860	sub flood_fill {
494	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	861	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
495		862
496	# the server does not allow map paths > 6	863	# the server does not allow map paths > 6
…		…
532	return if $mode ne "spatial";	899	return if $mode ne "spatial";
533		900
534	$x += $self->{map}->ox;	901	$x += $self->{map}->ox;
535	$y += $self->{map}->oy;	902	$y += $self->{map}->oy;
536		903
537	$self->load_map ($hash, $x, $y)	904	$self->load_map ($hash, $x, $y, $w, $h)
538	unless $self->{neigh_map}{$hash}[5]++;#d#	905	unless $self->{neigh_map}{$hash}[5]++;#d#
539		906
540	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	907	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
541		908
542	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	909	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
550	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	917	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
551		918
552	$self->flush_map;	919	$self->flush_map;
553		920
554	++$self->{map_change_gen};	921	++$self->{map_change_gen};
		922	$self->{map_cache_old} = delete $self->{map_cache};
555		923
556	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	924	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
557		925
558	my $mapmapw = $self->{mapmap}->{w};	926	my $mapmapw = $self->{mapmap}->{w};
559	my $mapmaph = $self->{mapmap}->{h};	927	my $mapmaph = $self->{mapmap}->{h};
…		…
571	$self->{map_info} = [$hash, $x, $y, $w, $h];	939	$self->{map_info} = [$hash, $x, $y, $w, $h];
572		940
573	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	941	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
574	$::STATWIDS->{map}->set_text ("Map: " . $map);	942	$::STATWIDS->{map}->set_text ("Map: " . $map);
575		943
576	$self->load_map ($hash, $x, $y);	944	$self->load_map ($hash, $x, $y, $w, $h);
577	$self->flood_fill (0, 0, 0, "", $hash, $flags);	945	$self->flood_fill (0, 0, 0, "", $hash, $flags);
578	}	946	}
579		947
580	sub face_find {	948	sub face_find {
581	my ($self, $facenum, $face, $cb) = @_;	949	my ($self, $facenum, $face, $cb) = @_;
582		950
583	my $hash = "$face->{chksum},$face->{name}";	951	if ($face->{type} == 0) { # FT_FACE
584
585	my $id = CFPlus::DB::get_tile_id_sync $hash;	952	my $id = DC::DB::get_tile_id_sync $face->{name};
586		953
587	$face->{id} = $id;	954	$face->{id} = $id;
588	$self->{faceid}[$facenum] = $id;
589
590	$self->{map}->set_tileid ($facenum => $id);	955	$self->{map}->set_tileid ($facenum => $id);
591		956
592	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	}
593	}	965	}
594		966
595	sub face_update {	967	sub face_update {
596	my ($self, $facenum, $face, $changed) = @_;	968	my ($self, $facenum, $face, $changed) = @_;
597		969
		970	if ($face->{type} == 0) {
		971	# image, FT_FACE
598	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	972	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
599	if $changed;	973	if $changed;
600		974
601	$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	}
602	}	1008	}
603		1009
604	sub smooth_update {	1010	sub smooth_update {
605	my ($self, $facenum, $face) = @_;	1011	my ($self, $facenum, $face) = @_;
606		1012
607	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	1013	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
608	}	1014	}
609		1015
610	sub set_texture {	1016	sub have_tile {
611	my ($self, $id, $data) = @_;	1017	my ($self, $tile, $data) = @_;
612		1018
613	$self->{texture}[$id] = my $tex =	1019	return unless $self->{map};
614	new_from_image CFPlus::Texture
615	$data, minify => 1, mipmap => 1;
616		1020
617	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	1021	my $tex = $self->{texture}[$tile] ||=
618	$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)
619	}	1061	}
620		1062
621	sub sound_play {	1063	sub sound_play {
622	my ($self, $x, $y, $soundnum, $type) = @_;	1064	my ($self, $type, $face, $dx, $dy, $vol) = @_;
623		1065
624	$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
625	}	1068	}
626		1069
627	my $LAST_QUERY; # server is stupid, stupid, stupid	1070	my $LAST_QUERY; # server is stupid, stupid, stupid
628		1071
629	sub query {	1072	sub query {
630	my ($self, $flags, $prompt) = @_;	1073	my ($self, $flags, $prompt) = @_;
631		1074
632	$prompt = $LAST_QUERY unless length $prompt;	1075	$prompt = $LAST_QUERY unless length $prompt;
633	$LAST_QUERY = $prompt;	1076	$LAST_QUERY = $prompt;
634		1077
635	$self->{query}-> ($self, $flags, $prompt);	1078	$self->{query}->($self, $flags, $prompt);
636	}	1079	}
637		1080
638	sub drawinfo {	1081	sub sanitise_xml($) {
639	my ($self, $color, $text) = @_;	1082	local $_ = shift;
640		1083
641	my @color = (	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	$_
		1100	}
		1101
		1102	our %NAME_TO_COLOR = (
		1103	black => 0,
		1104	white => 1,
		1105	darkblue => 2,
		1106	red => 3,
		1107	orange => 4,
		1108	lightblue => 5,
		1109	darkorange => 6,
		1110	green => 7,
		1111	darkgreen => 8,
		1112	grey => 9,
		1113	brown => 10,
		1114	yellow => 11,
		1115	tan => 12,
		1116	);
		1117
		1118	our @CF_COLOR = (
642	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1119	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643	[1.00, 1.00, 1.00],	1120	[1.00, 1.00, 1.00],
644	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1121	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645	[1.00, 0.00, 0.00],	1122	[1.00, 0.00, 0.00],
646	[1.00, 0.54, 0.00],	1123	[1.00, 0.54, 0.00],
647	[0.11, 0.56, 1.00],	1124	[0.11, 0.56, 1.00],
648	[0.93, 0.46, 0.00],	1125	[0.93, 0.46, 0.00],
649	[0.18, 0.54, 0.34],	1126	[0.18, 0.54, 0.34],
650	[0.56, 0.73, 0.56],	1127	[0.56, 0.73, 0.56],
651	[0.80, 0.80, 0.80],	1128	[0.80, 0.80, 0.80],
652	[0.75, 0.61, 0.20],	1129	[0.75, 0.61, 0.20],
653	[0.99, 0.77, 0.26],	1130	[0.99, 0.77, 0.26],
654	[0.74, 0.65, 0.41],	1131	[0.74, 0.65, 0.41],
655	);	1132	);
656		1133
657	my $fg = $color[$color % @color];	1134	sub msg {
		1135	my ($self, $color, $type, $text, @extra) = @_;
658		1136
		1137	$text = sanitise_xml $text;
		1138
		1139	if (my $cb = $self->{cb_msg}{$type}) {
		1140	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1141	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		1142	$type =~ s/-/_/g;
		1143	$self->{$type} = $text;
		1144	} else {
659	$self->logprint ("info: ", $text);	1145	$self->logprint ("msg: ", $text);
		1146	return if $color < 0; # negative color == ignore if not understood
660		1147
661	## try to create single paragraphs of multiple lines sent by the server	1148	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
662	# no longer neecssary with TRT servers
663	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
664		1149
665	$text = CFPlus::asxml $text;	1150	::message ({
666	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1151	fg => $fg,
667	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1152	markup => $text,
		1153	type => $type,
		1154	extra => [@extra],
		1155	color_flags => $color, #d# ugly, kill
		1156	});
668		1157
669	::message ({ fg => $fg, markup => $_ })	1158	# $color &= ~NDI_CLEAR; # only clear once for multiline messages
670	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.
671		1163
672	$self->{statusbox}->add ($text,	1164	$self->{statusbox}->add ($text,
673	group => $text,	1165	group => $text,
674	fg => $fg,	1166	fg => $fg,
675	timeout => $color >= 2 ? 180 : 10,	1167	timeout => $color >= 2 ? 180 : 10,
676	tooltip_font => $::FONT_FIXED,	1168	tooltip_font => $::FONT_FIXED,
677	);	1169	) if $type eq "info";
678	}	1170	}
679
680	sub drawextinfo {
681	my ($self, $color, $type, $subtype, $message) = @_;
682
683	$self->drawinfo ($color, $message);
684	}	1171	}
685		1172
686	sub spell_add {	1173	sub spell_add {
687	my ($self, $spell) = @_;	1174	my ($self, $spell) = @_;
688		1175
…		…
691	$spell->{message} =~ s/\n+$//;	1178	$spell->{message} =~ s/\n+$//;
692	$spell->{message} ||= "Server did not provide a description for this spell.";	1179	$spell->{message} ||= "Server did not provide a description for this spell.";
693		1180
694	$::SPELL_LIST->add_spell ($spell);	1181	$::SPELL_LIST->add_spell ($spell);
695		1182
696	$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});
697	$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});
698	}	1185	}
699		1186
700	sub spell_delete {	1187	sub spell_delete {
701	my ($self, $spell) = @_;	1188	my ($self, $spell) = @_;
702		1189
…		…
713	sub addme_success {	1200	sub addme_success {
714	my ($self) = @_;	1201	my ($self) = @_;
715		1202
716	my %skill_help;	1203	my %skill_help;
717		1204
718	for my $node (CFPlus::Pod::find skill_description => "*") {	1205	for my $node (DC::Pod::find skill_description => "*") {
719	my (undef, @par) = CFPlus::Pod::section_of $node;	1206	my (undef, @par) = DC::Pod::section_of $node;
720	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1207	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
721	};	1208	};
722		1209
723	for my $skill (values %{$self->{skill_info}}) {	1210	for my $skill (values %{$self->{skill_info}}) {
724	$self->{map_widget}->add_command ("ready_skill $skill",	1211	$self->{map_widget}->add_command ("ready_skill $skill",
725	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1212	(DC::asxml "Ready the skill '$skill'\n\n")
726	. $skill_help{$skill});	1213	. $skill_help{$skill});
727	$self->{map_widget}->add_command ("use_skill $skill",	1214	$self->{map_widget}->add_command ("use_skill $skill",
728	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1215	(DC::asxml "Immediately use the skill '$skill'\n\n")
729	. $skill_help{$skill});	1216	. $skill_help{$skill});
730	}	1217	}
731	}	1218	}
732		1219
733	sub eof {	1220	sub eof {
…		…
736	$self->{map_widget}->clr_commands;	1223	$self->{map_widget}->clr_commands;
737		1224
738	::stop_game ();	1225	::stop_game ();
739	}	1226	}
740		1227
741	sub image_info {
742	my ($self, $numfaces) = @_;
743
744	$self->{num_faces} = $numfaces;
745	$self->{face_prefetch} = [1 .. $numfaces];
746	$self->face_prefetch;
747	}
748
749	sub face_prefetch {
750	my ($self) = @_;
751
752	return unless $::CFG->{face_prefetch};
753
754	if ($self->{num_faces}) {
755	return if @{ $self->{send_queue} || [] };
756	my $todo = @{ $self->{face_prefetch} }
757	or return;
758
759	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
760
761	$self->send ("requestinfo image_sums $face $face");
762
763	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
764	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
765	} elsif (!exists $self->{num_faces}) {
766	$self->send ("requestinfo image_info");
767
768	$self->{num_faces} = 0;
769
770	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
771	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
772	}
773	}
774
775	sub update_floorbox {	1228	sub update_floorbox {
776	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1229	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
777	return unless $::CONN;	1230	return unless $::CONN;
778		1231
779	$::FLOORBOX->clear;	1232	$::FLOORBOX->clear;
780		1233
		1234	my @add;
		1235
781	my $row;	1236	my $row;
782	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;
783	if ($row < 6) {	1239	if ($row < 6) {
784	local $_->{face_widget}; # hack to force recreation of widget	1240	local $_->{face_widget}; # hack to force recreation of widget
785	local $_->{desc_widget}; # hack to force recreation of widget	1241	local $_->{desc_widget}; # hack to force recreation of widget
786	CFPlus::Item::update_widgets $_;	1242	DC::Item::update_widgets $_;
787		1243
		1244	push @add,
788	$::FLOORBOX->add (0, $row, $_->{face_widget});	1245	0, $row, $_->{face_widget},
789	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1246	1, $row, $_->{desc_widget};
790		1247
791	$row++;	1248	$row++;
792	} else {	1249	} else {
793	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1250	push @add, 1, $row, new DC::UI::Button
794	text => "More...",	1251	text => "More...",
795	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1252	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
796	);	1253	;
797	last;	1254	last;
798	}	1255	}
799	}	1256	}
800	if ($::CONN->{open_container}) {	1257	if ($::CONN->{open_container}) {
801	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1258	push @add, 1, $row++, new DC::UI::Button
802	text => "Close container",	1259	text => "Close container",
803	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1260	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
804	);	1261	;
805	}	1262	}
		1263
		1264	$::FLOORBOX->add_at (@add);
806	});	1265	});
807		1266
808	$::WANT_REFRESH++;	1267	$::WANT_REFRESH = 1;
809	}	1268	}
810		1269
811	sub set_opencont {	1270	sub set_opencont {
812	my ($conn, $tag, $name) = @_;	1271	my ($conn, $tag, $name) = @_;
813	$conn->{open_container} = $tag;	1272	$conn->{open_container} = $tag;
814	update_floorbox;	1273	update_floorbox;
815		1274
816	$::INV_RIGHT_HB->clear ();	1275	$::INVR_HB->clear;
817	$::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);
818		1277
819	if ($tag != 0) { # Floor isn't closable, is it?	1278	if ($tag != 0) { # Floor isn't closable, is it?
820	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1279	$::INVR_HB->add (new DC::UI::Button
821	text => "Close container",	1280	text => "Close container",
822	tooltip => "Close the currently open container (if one is open)",	1281	tooltip => "Close the currently open container (if one is open)",
823	on_activate => sub {	1282	on_activate => sub {
824	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1283	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
825	if $tag != 0;	1284	if $tag != 0;
826	#if $CONN->{open_container} != 0;
827	0	1285	0
828	},	1286	},
829	);	1287	);
830	}	1288	}
831		1289
…		…
833	}	1291	}
834		1292
835	sub update_containers {	1293	sub update_containers {
836	my ($self) = @_;	1294	my ($self) = @_;
837		1295
838	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1296	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
839	my $todo = delete $self->{update_container}	1297	my $todo = delete $self->{update_container}
840	or return;	1298	or return;
841		1299
842	for my $tag (keys %$todo) {	1300	for my $tag (keys %$todo) {
843	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1301	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
878	}	1336	}
879		1337
880	sub item_update {	1338	sub item_update {
881	my ($self, $item) = @_;	1339	my ($self, $item) = @_;
882		1340
883	#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";
884		1342
885	CFPlus::Item::update_widgets $item;	1343	DC::Item::update_widgets $item;
886		1344
887	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1345	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
888	set_opencont ($::CONN, 0, "Floor");	1346	set_opencont ($::CONN, 0, "Floor");
889		1347
890	} elsif ($item->{flags} & F_OPEN) {	1348	} elsif ($item->{flags} & F_OPEN) {
891	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1349	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
892		1350
893	} else {	1351	} else {
894	$self->{update_container}{$item->{container}}++;	1352	$self->{update_container}{$item->{container}}++;
895	$self->update_containers;	1353	$self->update_containers;
896	}	1354	}
…		…
907		1365
908	my $weight = .001 * $self->{player}{weight};	1366	my $weight = .001 * $self->{player}{weight};
909	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1367	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
910		1368
911	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1369	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
912	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1370	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
913	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1371	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
914	}	1372	}
915		1373
916	sub update_server_info {	1374	sub update_server_info {
917	my ($self) = @_;	1375	my ($self) = @_;
918		1376
919	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>");
920		1378
		1379	my $version = JSON::XS->new->encode ($self->{s_version});
		1380
921	$::SERVER_INFO->set_markup (	1381	$::SERVER_INFO->set_markup (
922	"server <tt>$self->{host}:$self->{port}</tt>\n"	1382	"server <tt>$self->{host}:$self->{port}</tt>\n"
923	. "protocol version <tt>$self->{version}</tt>\n"	1383	. "protocol version <tt>$version</tt>\n"
924	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926	. "editing support $yesno[!!$self->{editor_support}]\n"	1384	. "editing support $yesno[!!$self->{editor_support}]\n"
927	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
928	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1385	. "client support $yesno[$self->{cfplus_ext} > 0]"
929	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1386	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930	. "map size $self->{mapw}×$self->{maph}\n"	1387	. "map size $self->{mapw}×$self->{maph}\n"
931	);	1388	);
932		1389
933	::setup_build_button ($self->{editor_support}->{builder_ui});
934	}	1390	}
935		1391
936	sub logged_in {	1392	sub logged_in {
937	my ($self) = @_;	1393	my ($self) = @_;
938		1394
939	$self->send_ext_req (cfplus_support => version => 1, sub {	1395	$self->send_ext_req (cfplus_support => version => 2, sub {
		1396	my (%msg) = @_;
		1397
940	$self->{cfplus_ext} = $_[0]{version};	1398	$self->{cfplus_ext} = $msg{version};
941	$self->update_server_info;	1399	$self->update_server_info;
942		1400
943	if ($self->{cfplus_ext} >= 2) {	1401	if ($self->{cfplus_ext} >= 2) {
944	$self->send_ext_req ("editor_support", sub {	1402	$self->send_ext_req ("editor_support", sub {
945	$self->{editor_support} = $_[0];	1403	$self->{editor_support} = { @_ };
946	$self->update_server_info;	1404	$self->update_server_info;
947		1405
948	0	1406	0
949	});	1407	});
950	}	1408	}
…		…
952	0	1410	0
953	});	1411	});
954		1412
955	$self->update_server_info;	1413	$self->update_server_info;
956		1414
957	$self->send_command ("output-sync $::CFG->{output_sync}");
958	$self->send_command ("output-count $::CFG->{output_count}");
959	$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;
960	$self->send_command ("pickup $::CFG->{pickup}");	1416	$self->send_pickup ($::CFG->{pickup});
961	}
962
963	sub buildat {
964	my ($self, $builditem, $x, $y) = @_;
965
966	if ($self->{cfplus_ext}) {
967	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968	}
969	}	1417	}
970		1418
971	sub lookat {	1419	sub lookat {
972	my ($self, $x, $y) = @_;	1420	my ($self, $x, $y) = @_;
973		1421
974	if ($self->{cfplus_ext}) {	1422	if ($self->{cfplus_ext}) {
975	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1423	$self->send_ext_req (lookat => $x, $y, sub {
976	my ($msg) = @_;	1424	my (%msg) = @_;
977		1425
978	if (exists $msg->{npc_dialog}) {	1426	if (exists $msg{npc_dialog}) {
979	# start npc chat dialog	1427	# start npc chat dialog
980	$self->{npc_dialog} = new CFPlus::NPCDialog::	1428	$self->{w}{npc_dialog} = new DC::NPCDialog::
981	dx => $x,	1429	token => $msg{npc_dialog},
982	dy => $y,
983	title => "$msg->{npc_dialog} (NPC)",	1430	title => "$msg{npc_dialog}[0] (NPC)",
984	conn => $self,	1431	conn => $self,
985	;	1432	;
986	}	1433	}
987	});	1434	});
988	}	1435	}
…		…
991	}	1438	}
992		1439
993	sub destroy {	1440	sub destroy {
994	my ($self) = @_;	1441	my ($self) = @_;
995		1442
996	(delete $self->{npc_dialog})->destroy	1443	$_->destroy
997	if $self->{npc_dialog};	1444	for values %{ $self->{w} };
998		1445
999	$self->SUPER::destroy;	1446	$self->SUPER::destroy;
1000	}
1001		1447
		1448	%$self = ();
		1449	}
		1450
1002	package CFPlus::NPCDialog;	1451	package DC::NPCDialog;
1003		1452
1004	our @ISA = 'CFPlus::UI::Toplevel';	1453	our @ISA = 'DC::UI::Toplevel';
1005		1454
1006	sub new {	1455	sub new {
1007	my $class = shift;	1456	my $class = shift;
1008		1457
1009	my $self = $class->SUPER::new (	1458	my $self = $class->SUPER::new (
…		…
1016	kw => { hi => 0, yes => 0, no => 0 },	1465	kw => { hi => 0, yes => 0, no => 0 },
1017	has_close_button => 1,	1466	has_close_button => 1,
1018	@_,	1467	@_,
1019	);	1468	);
1020		1469
1021	CFPlus::weaken (my $this = $self);	1470	DC::weaken (my $this = $self);
1022		1471
1023	$self->connect (delete => sub { $this->destroy; 1 });	1472	$self->connect (delete => sub { $this->destroy; 1 });
1024		1473
1025	# better use a pane...	1474	# better use a pane...
1026	$self->add (my $hbox = new CFPlus::UI::HBox);	1475	$self->add (my $hbox = new DC::UI::HBox);
1027	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1476	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1028		1477
1029	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1478	$hbox->add (my $vbox = new DC::UI::VBox);
1030		1479
1031	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1480	$vbox->add (new DC::UI::Label text => "Message Entry:");
1032	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1481	$vbox->add ($self->{entry} = new DC::UI::Entry
1033	tooltip => "#npc_message_entry",	1482	tooltip => "#npc_message_entry",
1034	on_activate => sub {	1483	on_activate => sub {
1035	my ($entry, $text) = @_;	1484	my ($entry, $text) = @_;
1036		1485
1037	return unless $text =~ /\S/;	1486	return unless $text =~ /\S/;
…		…
1041		1490
1042	0	1491	0
1043	},	1492	},
1044	);	1493	);
1045		1494
1046	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1495	$vbox->add ($self->{options} = new DC::UI::VBox);
1047		1496
1048	$self->{bye_button} = new CFPlus::UI::Button	1497	$self->{bye_button} = new DC::UI::Button
1049	text => "Bye (close)",	1498	text => "Bye (close)",
1050	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.",
1051	on_activate => sub { $this->destroy; 1 },	1500	on_activate => sub { $this->destroy; 1 },
1052	;	1501	;
1053		1502
1054	$self->update_options;	1503	$self->update_options;
1055		1504
1056	$self->{id} = $self->{conn}->send_ext_req (	1505	$self->{id} = "npc-channel-" . $self->{conn}->token;
1057	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1506	$self->{conn}->connect_ext ($self->{id} => sub {
1058	sub { $this && $this->feed (@_) }	1507	$this->feed (@_) if $this;
1059	);	1508	});
		1509
		1510	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1060		1511
1061	$self->{entry}->grab_focus;	1512	$self->{entry}->grab_focus;
1062		1513
1063	$self->{textview}->add_paragraph ({	1514	$self->{textview}->add_paragraph ({
1064	fg => [1, 1, 0, 1],	1515	fg => [1, 1, 0, 1],
…		…
1070	};	1521	};
1071		1522
1072	sub update_options {	1523	sub update_options {
1073	my ($self) = @_;	1524	my ($self) = @_;
1074		1525
1075	CFPlus::weaken $self;	1526	DC::weaken $self;
1076		1527
1077	$self->{options}->clear;	1528	$self->{options}->clear;
1078	$self->{options}->add ($self->{bye_button});	1529	$self->{options}->add ($self->{bye_button});
1079		1530
1080	for my $kw (sort keys %{ $self->{kw} }) {	1531	for my $kw (sort keys %{ $self->{kw} }) {
1081	$self->{options}->add (new CFPlus::UI::Button	1532	$self->{options}->add (new DC::UI::Button
1082	text => $kw,	1533	text => $kw,
1083	on_activate => sub {	1534	on_activate => sub {
1084	$self->send ($kw);	1535	$self->send ($kw);
1085	0	1536	0
1086	},	1537	},
1087	);	1538	);
1088	}	1539	}
1089	}	1540	}
1090		1541
1091	sub feed {	1542	sub feed {
1092	my ($self, $msg) = @_;	1543	my ($self, $type, @arg) = @_;
1093		1544
1094	CFPlus::weaken $self;	1545	DC::weaken $self;
1095		1546
1096	if ($msg->{msgtype} eq "reply") {	1547	if ($type eq "update") {
		1548	my (%info) = @arg;
		1549
1097	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1550	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1098	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1551	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1099
1100	my $text = "\n" . CFPlus::asxml $msg->{msg};
1101	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102	my @link;
1103	$text =~ s{
1104	($match)
1105	}{
1106	my $kw = $1;
1107
1108	push @link, new CFPlus::UI::Label
1109	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1110	can_hover => 1,
1111	can_events => 1,
1112	padding_x => 0,
1113	padding_y => 0,
1114	on_button_up => sub {
1115	$self->send ($kw);
1116	};
1117
1118	"\x{fffc}"
1119	}giex;
1120		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
1121	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1575	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1122	$self->{textview}->scroll_to_bottom;	1576	$self->{textview}->scroll_to_bottom;
		1577	}
		1578
1123	$self->update_options;	1579	$self->update_options;
1124	} else {	1580	} else {
1125	$self->destroy;	1581	$self->destroy;
1126	}	1582	}
1127		1583
…		…
1129	}	1585	}
1130		1586
1131	sub send {	1587	sub send {
1132	my ($self, $msg) = @_;	1588	my ($self, $msg) = @_;
1133		1589
1134	$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	});
1135	$self->{textview}->scroll_to_bottom;	1596	$self->{textview}->scroll_to_bottom;
1136		1597
1137	$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);
1138	}	1599	}
1139		1600
1140	sub destroy {	1601	sub destroy {
1141	my ($self) = @_;	1602	my ($self) = @_;
1142		1603
1143	#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
1144		1605
1145	if ($self->{conn}) {	1606	if ($self->{conn}) {
1146	$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};
1147	delete $self->{conn}{npc_dialog};	1608	delete $self->{conn}{w}{npc_dialog};
1148	$self->{conn}->disconnect_ext ($self->{id});	1609	$self->{conn}->disconnect_ext ($self->{id});
1149	}	1610	}
1150		1611
1151	$self->SUPER::destroy;	1612	$self->SUPER::destroy;
1152	}	1613	}

Diff Legend

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