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.64 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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