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.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.218 by root, Thu Apr 8 19:11:21 2010 UTC

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

Diff Legend

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