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

Diff Legend

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