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

Diff Legend

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