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.94 by root, Fri Mar 16 02:33:49 2007 UTC vs.
Revision 1.202 by root, Tue Sep 9 10:27:26 2008 UTC

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

Diff Legend

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