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

Diff Legend

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