ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.227 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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