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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.227 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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