ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.106 by root, Sun Apr 29 20:03:08 2007 UTC vs.
Revision 1.226 by root, Thu Nov 15 03:07:46 2012 UTC

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

Diff Legend

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