ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 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 Guard ();
		7
6	use Crossfire::Protocol::Constants;	8	use Deliantra::Protocol::Constants;
7		9
8	use CFPlus;	10	use DC;
9	use CFPlus::DB;	11	use DC::DB;
10	use CFPlus::UI;	12	use DC::UI;
11	use CFPlus::Pod;	13	use DC::Pod;
12	use CFPlus::Macro;	14	use DC::Macro;
13	use CFPlus::Item;	15	use DC::Item;
14		16
15	use Crossfire::Protocol::Base 0.95;
16
17	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#
18		29
19	sub new {	30	sub new {
20	my ($class, %arg) = @_;	31	my ($class, %arg) = @_;
21		32
22	my $self = $class->SUPER::new (%arg,	33	my $self = $class->SUPER::new (%arg,
23	setup_req => {	34	setup_req => {
24	extmap => 1,	35	extmap => 1,
25	excmd => 1,	36	excmd => 1,
		37	widget => 2,
26	%{$arg{setup_req} || {}},	38	%{$arg{setup_req} || {}},
27	},	39	},
28	);	40	);
29		41
30	$self->{map_widget}->clr_commands;	42	$self->{map_widget}->clr_commands;
31		43
32	my @cmd_help = map {	44	my @cmd_help = map {
33	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	45	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
34	or die "unparseable command help: $_->{kw}[0]";	46	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
35		47
36	my $cmd = $1;	48	my $cmd = $1;
37	my @args = split /\|/, $2;	49	my @args = split /\|/, $2;
38	@args = (".*") unless @args;	50	@args = (".*") unless @args;
39		51
40	my (undef, @par) = CFPlus::Pod::section_of $_;	52	my (undef, @par) = DC::Pod::section_of $_;
41	my $text = CFPlus::Pod::as_label @par;	53	my $text = DC::Pod::as_label @par;
42		54
43	$_ = $_ eq ".*" ? "" : " $_"	55	$_ = $_ eq ".*" ? "" : " $_"
44	for @args;	56	for @args;
45		57
46	map ["$cmd$_", $text],	58	map ["$cmd$_", $text],
47	sort { (length $a) <=> (length $b) }	59	sort { (length $a) <=> (length $b) }
48	@args	60	@args
49	} sort { $a->{par} <=> $b->{par} }	61	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
50	CFPlus::Pod::find command => "*";	62	DC::Pod::find command => "*";
51		63
52	$self->connect_ext (event_capabilities => sub {	64	$self->{json_coder}
		65	->convert_blessed
		66	->filter_json_single_key_object ("\fw" => sub {
		67	$self->{widget}{$_[0]}
		68	})
		69	->filter_json_single_key_object ("\fc" => sub {
53	my ($cap) = @_;	70	my ($id) = @_;
54		71	sub {
55	if (my $ts = $cap->{tileset}) {	72	$self->send_exti_msg (w_e => $id, @_);
56	if (my ($default) = grep $_->[2] & 1, @$ts) {
57	$self->{tileset} = $default;
58	$self->{tilesize} = $default->[3];
59	$self->setup_req (tileset => $default->[0]);
60
61	my $w = int $self->{mapw} * 32 / $self->{tilesize};
62	my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64	$self->setup_req (mapsize => "${w}x${h}");
65	}	73	}
66	}	74	});
		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;
67	});	88	});
68		89
69	$self->{map_widget}->add_command (@$_)	90	$self->{map_widget}->add_command (@$_)
70	for @cmd_help;	91	for @cmd_help;
71		92
72	{	93	{
73	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	94	$self->{dialogue} = my $tex = $TEX_DIALOGUE;
74	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	95	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76	}	96	}
77		97
78	{	98	{
79	$self->{noface} = my $tex = new_from_file CFPlus::Texture	99	$self->{noface} = my $tex = $TEX_NOFACE;
80	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});	100	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82	}	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	# };
83		122
84	$self->{open_container} = 0;	123	$self->{open_container} = 0;
85		124
86	# per server	125	# per server
87	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	126	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
88		127
89	$self	128	$self
90	}	129	}
91		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 => {},
		208	};
		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	#############################################################################
		383
92	sub logprint {	384	sub logprint {
93	my ($self, @a) = @_;	385	my ($self, @a) = @_;
94		386
95	$self->{log_fh} ||= do {	387	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
96	my $path = "$Crossfire::VARDIR/log.$self->{host}";
97
98	open my $fh, ">>:utf8", $path
99	or die "Couldn't open logfile $path: $!";
100
101	$fh->autoflush (1);
102
103	$fh;
104	};
105
106	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
107
108	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
109	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
110
111	print {$self->{log_fh}} "$ts ", @a, "\n";
112	}	388	}
113		389
114	sub _stat_numdiff {	390	sub _stat_numdiff {
115	my ($self, $name, $old, $new) = @_;	391	my ($self, $name, $old, $new) = @_;
116		392
…		…
200		476
201	if (	477	if (
202	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	478	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
203	) {	479	) {
204	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	480	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
205	$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);
206	}	482	}
207		483
208	$self->update_stats_window ($stats, $prev);	484	$self->update_stats_window ($stats, $prev);
209		485
210	$self->{prev_stats} = { %$stats };	486	$self->{prev_stats} = { %$stats };
…		…
247		523
248	$::GAUGES->{hp} ->set_value ($hp, $hp_m);	524	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
249	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	525	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
250	$::GAUGES->{food} ->set_value ($fo, $fo_m);	526	$::GAUGES->{food} ->set_value ($fo, $fo_m);
251	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	527	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
252	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	528	$::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
253	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	529	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
254	my $rng = $stats->{+CS_STAT_RANGE};	530	$::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
255	$rng =~ s/^Range: //; # thank you so much dear server	531	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
256	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
257	my $title = $stats->{+CS_STAT_TITLE};	532	my $title = $stats->{+CS_STAT_TITLE};
258	$title =~ s/^Player: //;	533	$title =~ s/^Player: //;
259	$::STATWIDS->{title} ->set_text ("Title: " . $title);	534	$::STATWIDS->{title} ->set_text ("Title: " . $title);
260		535
261	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	536	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
278	for keys %RES_TBL;	553	for keys %RES_TBL;
279		554
280	my $sktbl = $::STATWIDS->{skill_tbl};	555	my $sktbl = $::STATWIDS->{skill_tbl};
281	my @skills = keys %{ $self->{skill_info} };	556	my @skills = keys %{ $self->{skill_info} };
282		557
283	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
284	$sktbl->clear;	566	$sktbl->clear;
285		567
		568	my $sw = $self->{skillwid}{""} ||= [
286	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	569	0, 0, (new DC::UI::Label text => "Experience", align => 1),
287	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	570	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
288	$sktbl->add (2, 0, new CFPlus::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),
289	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	573	4, 0, (new DC::UI::Label text => "Experience", align => 1),
290	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	574	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
291	$sktbl->add (5, 0, new CFPlus::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	];
292		578
		579	my @add = @$sw;
		580
293	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	581	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
294		582
295	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	583	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
296	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	584	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
297		585
298	my ($x, $y) = (0, 1);	586	my ($x, $y) = (0, 1);
299	for (	587	for (@order) {
300	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
301	map [$_, $self->{skill_info}{$_}],
302	grep exists $stats->{$_},
303	@skills
304	) {
305	my ($idx, $name) = @$_;	588	my ($idx, $name) = @$_;
306		589
307	my $spell_cb = sub {	590	my $spell_cb = sub {
308	my ($widget, $ev) = @_;	591	my ($widget, $ev) = @_;
309		592
310	if ($ev->{button} == 1) {	593	if ($ev->{button} == 1) {
311	$::CONN->user_send ("ready_skill $name");	594	$::CONN->user_send ("ready_skill $name");
312	} elsif ($ev->{button} == 2) {	595	} elsif ($ev->{button} == 2) {
313	$::CONN->user_send ("use_skill $name");	596	$::CONN->user_send ("use_skill $name");
314	} elsif ($ev->{button} == 3) {	597	} elsif ($ev->{button} == 3) {
315	my $shortname = CFPlus::shorten $name, 14;	598	my $shortname = DC::shorten $name, 14;
316	(new CFPlus::UI::Menu	599	(new DC::UI::Menu
317	items => [	600	items => [
318	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],	601	["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
319	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],	602	["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
320	],	603	],
321	)->popup ($ev);	604	)->popup ($ev);
322	} else {	605	} else {
323	return 0;	606	return 0;
324	}	607	}
325		608
326	1	609	1
327	};	610	};
328		611
329	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	612	my $sw = $self->{skillwid}{$idx} ||= [
		613	# exp
		614	(new DC::UI::Label
330	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	615	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
331	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	616
		617	# level
		618	(new DC::UI::Label
332	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	619	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		620
		621	# progress
		622	(new DC::UI::ExperienceProgress),
		623
		624	# label
333	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	625	(new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
334	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	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	;
335		635
336	$x++ and ($x, $y) = (0, $y + 1);	636	$x++ and ($x, $y) = (0, $y + 1);
337	}	637	}
338	}
339		638
340	for (grep exists $stats->{$_}, @skills) {	639	$sktbl->add_at (@add);
341	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
342	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
343	}	640	}
344	}
345		641
346	sub macro_send {	642	for (@order) {
347	my ($self, $macro) = @_;	643	my ($idx, $name) = @$_;
		644	my $val = $stats->{$idx};
348		645
349	for my $cmd (@{ $macro->{action} }) {	646	next if $prev->{$idx}[1] eq $val->[1];
350	$self->send_command ($cmd);	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);
351	}	655	}
352	}	656	}
353		657
354	sub user_send {	658	sub user_send {
355	my ($self, $command) = @_;	659	my ($self, $command) = @_;
…		…
357	$self->{record}->($command)	661	$self->{record}->($command)
358	if $self->{record};	662	if $self->{record};
359		663
360	$self->logprint ("send: ", $command);	664	$self->logprint ("send: ", $command);
361	$self->send_command ($command);	665	$self->send_command ($command);
362	::status ($command);
363	}	666	}
364		667
365	sub record {	668	sub record {
366	my ($self, $cb) = @_;	669	my ($self, $cb) = @_;
367		670
…		…
369	}	672	}
370		673
371	sub map_scroll {	674	sub map_scroll {
372	my ($self, $dx, $dy) = @_;	675	my ($self, $dx, $dy) = @_;
373		676
374	$self->{map}->scroll ($dx, $dy);	677	$self->{map_widget}->scroll ($dx, $dy);
375	}	678	}
376		679
377	sub feed_map1a {	680	sub feed_map1a {
378	my ($self, $data) = @_;	681	my ($self, $data) = @_;
379		682
380	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	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 {
381	$self->{map_widget}->update;	711	$self->{map_widget}->update;
		712	}
382	}	713	}
383		714
384	sub magicmap {	715	sub magicmap {
385	my ($self, $w, $h, $x, $y, $data) = @_;	716	my ($self, $w, $h, $x, $y, $data) = @_;
386		717
…		…
388	}	719	}
389		720
390	sub flush_map {	721	sub flush_map {
391	my ($self) = @_;	722	my ($self) = @_;
392		723
393	my $map_info = delete $self->{map_info}	724	return unless $self->{map_info};
394	or return;
395		725
		726	for my $map_info (values %{ $self->{map_cache} || {} }) {
396	my ($hash, $x, $y, $w, $h) = @$map_info;	727	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
397		728
398	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	729	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
		730
		731	if ($data ne $$rdata) {
		732	$map_info->[1] = \$data;
		733	my $cdata = Compress::LZF::compress $data;
399	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	734	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
400	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	735	}
		736	}
401	}	737	}
402		738
403	sub map_clear {	739	sub map_clear {
404	my ($self) = @_;	740	my ($self) = @_;
405		741
406	$self->flush_map;	742	$self->flush_map;
		743	delete $self->{map_info};
407	delete $self->{neigh_map};	744	delete $self->{neigh_map};
408		745
409	$self->{map}->clear;	746	$self->{map}->clear;
410	delete $self->{map_widget}{magicmap};	747	delete $self->{map_widget}{magicmap};
411	}	748	}
412		749
413	sub bg_fetch {	750	sub bg_fetch {
414	my ($self) = @_;	751	my ($self) = @_;
415		752
416	my $id;	753	my $tile;
417		754
418	do {	755	do {
419	$id = pop @{$self->{bg_fetch}}	756	$tile = pop @{$self->{bg_fetch}}
420	or return;	757	or return;
421	} while $self->{texture}[$id];	758	} while $self->{texture}[$tile];
422		759
423	CFPlus::DB::get tilecache => $id, sub {	760	DC::DB::get tilecache => $tile, sub {
424	my ($data) = @_;	761	my ($data) = @_;
425		762
426	return unless $self->{map}; # stop when destroyed	763	return unless $self->{map}; # stop when destroyed
427		764
428	$self->set_texture ($id => $data)
429	if defined $data;	765	if (defined $data) {
		766	$self->have_tile ($tile, $data);
		767	$self->{texture}[$tile]->upload;
		768	}
430		769
431	$self->bg_fetch;	770	$self->bg_fetch;
432	};	771	};
433	}	772	}
434		773
435	sub load_map($$$) {	774	sub load_map($$$$$$) {
436	my ($self, $hash, $x, $y) = @_;	775	my ($self, $hash, $x, $y, $w, $h) = @_;
437		776
438	my $gen = $self->{map_change_gen};	777	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
439		778
440	CFPlus::DB::get $self->{mapcache} => $hash, sub {	779	my $cb = sub {
441	return unless $gen == $self->{map_change_gen};	780	$map_info->[1] = \$_[0];
442		781
443	my ($data) = @_;
444
445	if (defined $data) {
446	$data = Compress::LZF::decompress $data;
447	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
448
449	my $inprogress = @{ $self->{bg_fetch} || [] };	782	my $inprogress = @{ $self->{bg_fetch} || [] };
450	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	783	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
451	$self->bg_fetch unless $inprogress;	784	$self->bg_fetch unless $inprogress;
452	}
453	};	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]);
		796	};
		797	}
454	}	798	}
455		799
456	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	800	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
457	# (server resource,s latency, bandwidth), so this hack is warranted.	801	# (server resources, latency, bandwidth), so this hack is warranted.
458	# 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
459	sub send_mapinfo {	803	sub send_mapinfo {
460	my ($self, $data, $cb) = @_;	804	my ($self, $data, $cb) = @_;
461		805
462	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)$%) {
…		…
487	}	831	}
488		832
489	# this method does a "flood fill" into every tile direction	833	# this method does a "flood fill" into every tile direction
490	# it assumes that tiles are arranged in a rectangular grid,	834	# it assumes that tiles are arranged in a rectangular grid,
491	# i.e. a map is the same as the left of the right map etc.	835	# i.e. a map is the same as the left of the right map etc.
492	# failure to comply are harmless and result in display errors	836	# failure to comply is harmless and results in display errors
493	# at worst.	837	# at worst.
494	sub flood_fill {	838	sub flood_fill {
495	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	839	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
496		840
497	# the server does not allow map paths > 6	841	# the server does not allow map paths > 6
…		…
533	return if $mode ne "spatial";	877	return if $mode ne "spatial";
534		878
535	$x += $self->{map}->ox;	879	$x += $self->{map}->ox;
536	$y += $self->{map}->oy;	880	$y += $self->{map}->oy;
537		881
538	$self->load_map ($hash, $x, $y)	882	$self->load_map ($hash, $x, $y, $w, $h)
539	unless $self->{neigh_map}{$hash}[5]++;#d#	883	unless $self->{neigh_map}{$hash}[5]++;#d#
540		884
541	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	885	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
542		886
543	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	887	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
551	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	895	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
552		896
553	$self->flush_map;	897	$self->flush_map;
554		898
555	++$self->{map_change_gen};	899	++$self->{map_change_gen};
		900	$self->{map_cache_old} = delete $self->{map_cache};
556		901
557	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	902	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
558		903
559	my $mapmapw = $self->{mapmap}->{w};	904	my $mapmapw = $self->{mapmap}->{w};
560	my $mapmaph = $self->{mapmap}->{h};	905	my $mapmaph = $self->{mapmap}->{h};
…		…
572	$self->{map_info} = [$hash, $x, $y, $w, $h];	917	$self->{map_info} = [$hash, $x, $y, $w, $h];
573		918
574	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	919	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
575	$::STATWIDS->{map}->set_text ("Map: " . $map);	920	$::STATWIDS->{map}->set_text ("Map: " . $map);
576		921
577	$self->load_map ($hash, $x, $y);	922	$self->load_map ($hash, $x, $y, $w, $h);
578	$self->flood_fill (0, 0, 0, "", $hash, $flags);	923	$self->flood_fill (0, 0, 0, "", $hash, $flags);
579	}	924	}
580		925
581	sub face_find {	926	sub face_find {
582	my ($self, $facenum, $face, $cb) = @_;	927	my ($self, $facenum, $face, $cb) = @_;
583		928
584	my $hash = "$face->{chksum},$face->{name}";	929	if ($face->{type} == 0) { # FT_FACE
585
586	my $id = CFPlus::DB::get_tile_id_sync $hash;	930	my $id = DC::DB::get_tile_id_sync $face->{name};
587		931
588	$face->{id} = $id;	932	$face->{id} = $id;
589	$self->{faceid}[$facenum] = $id;
590
591	$self->{map}->set_tileid ($facenum => $id);	933	$self->{map}->set_tileid ($facenum => $id);
592		934
593	CFPlus::DB::get tilecache => $id, $cb;	935	DC::DB::get tilecache => $id, $cb;
		936
		937	} elsif ($face->{type} & 1) { # with metadata
		938	DC::DB::get res_meta => $face->{name}, $cb;
		939
		940	} else { # no metadata
		941	DC::DB::get res_data => $face->{name}, $cb;
		942	}
594	}	943	}
595		944
596	sub face_update {	945	sub face_update {
597	my ($self, $facenum, $face, $changed) = @_;	946	my ($self, $facenum, $face, $changed) = @_;
598		947
		948	if ($face->{type} == 0) {
		949	# image, FT_FACE
599	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	950	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
600	if $changed;	951	if $changed;
601		952
602	$self->set_texture ($face->{id} => delete $face->{image});	953	$self->have_tile ($face->{id}, delete $face->{data});
		954
		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	}
603	}	986	}
604		987
605	sub smooth_update {	988	sub smooth_update {
606	my ($self, $facenum, $face) = @_;	989	my ($self, $facenum, $face) = @_;
607		990
608	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	991	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
609	}	992	}
610		993
611	sub set_texture {	994	sub have_tile {
612	my ($self, $id, $data) = @_;	995	my ($self, $tile, $data) = @_;
613		996
614	$self->{texture}[$id] = my $tex =	997	return unless $self->{map};
615	new_from_image CFPlus::Texture	998
		999	my $tex = $self->{texture}[$tile] ||=
		1000	new DC::Texture
		1001	tile => $tile,
		1002	image => $data, delete_image => 1,
616	$data, minify => 1, mipmap => 1;	1003	minify => 1, mipmap => 1;
617		1004
618	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	1005	if (my $cbs = delete $self->{tile_cb}{$tile}) {
619	$self->{map_widget}->update;	1006	$_->($tex) for @$cbs;
		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)
620	}	1039	}
621		1040
622	sub sound_play {	1041	sub sound_play {
623	my ($self, $x, $y, $soundnum, $type) = @_;	1042	my ($self, $type, $face, $dx, $dy, $vol) = @_;
624		1043
625	$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
626	}	1046	}
627		1047
628	my $LAST_QUERY; # server is stupid, stupid, stupid	1048	my $LAST_QUERY; # server is stupid, stupid, stupid
629		1049
630	sub query {	1050	sub query {
…		…
633	$prompt = $LAST_QUERY unless length $prompt;	1053	$prompt = $LAST_QUERY unless length $prompt;
634	$LAST_QUERY = $prompt;	1054	$LAST_QUERY = $prompt;
635		1055
636	$self->{query}-> ($self, $flags, $prompt);	1056	$self->{query}-> ($self, $flags, $prompt);
637	}	1057	}
		1058
		1059	sub sanitise_xml($) {
		1060	local $_ = shift;
		1061
		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	);
638		1095
639	our @CF_COLOR = (	1096	our @CF_COLOR = (
640	[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],
641	[1.00, 1.00, 1.00],	1098	[1.00, 1.00, 1.00],
642	[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]
…		…
650	[0.75, 0.61, 0.20],	1107	[0.75, 0.61, 0.20],
651	[0.99, 0.77, 0.26],	1108	[0.99, 0.77, 0.26],
652	[0.74, 0.65, 0.41],	1109	[0.74, 0.65, 0.41],
653	);	1110	);
654		1111
655	sub drawinfo {	1112	sub msg {
656	my ($self, $color, $text) = @_;	1113	my ($self, $color, $type, $text, @extra) = @_;
657		1114
658	my $fg = $CF_COLOR[$color % @CF_COLOR];	1115	$text = sanitise_xml $text;
659		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 {
660	$self->logprint ("info: ", $text);	1123	$self->logprint ("msg: ", $text);
		1124	return if $color < 0; # negative color == ignore if not understood
661		1125
		1126	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
		1127
662	## 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
663	# no longer neecssary with TRT servers	1129	# no longer neecssary with TRT servers
664	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1130	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
665		1131
666	$text = CFPlus::asxml $text;	1132	::message ({
667	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1133	fg => $fg,
668	$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	});
669		1139
670	::message ({ fg => $fg, markup => $_ })	1140	# $color &= ~NDI_CLEAR; # only clear once for multiline messages
671	for split /\n/, $text;	1141	# # actually, this is an ugly design. _we_ should control the channels,
		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.
672		1145
673	$self->{statusbox}->add ($text,	1146	$self->{statusbox}->add ($text,
674	group => $text,	1147	group => $text,
675	fg => $fg,	1148	fg => $fg,
676	timeout => $color >= 2 ? 180 : 10,	1149	timeout => $color >= 2 ? 180 : 10,
677	tooltip_font => $::FONT_FIXED,	1150	tooltip_font => $::FONT_FIXED,
678	);	1151	) if $type eq "info";
679	}	1152	}
680
681	sub drawextinfo {
682	my ($self, $color, $type, $subtype, $message) = @_;
683
684	$self->drawinfo ($color, $message);
685	}	1153	}
686		1154
687	sub spell_add {	1155	sub spell_add {
688	my ($self, $spell) = @_;	1156	my ($self, $spell) = @_;
689		1157
…		…
692	$spell->{message} =~ s/\n+$//;	1160	$spell->{message} =~ s/\n+$//;
693	$spell->{message} ||= "Server did not provide a description for this spell.";	1161	$spell->{message} ||= "Server did not provide a description for this spell.";
694		1162
695	$::SPELL_LIST->add_spell ($spell);	1163	$::SPELL_LIST->add_spell ($spell);
696		1164
697	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1165	$self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
698	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	1166	$self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
699	}	1167	}
700		1168
701	sub spell_delete {	1169	sub spell_delete {
702	my ($self, $spell) = @_;	1170	my ($self, $spell) = @_;
703		1171
…		…
714	sub addme_success {	1182	sub addme_success {
715	my ($self) = @_;	1183	my ($self) = @_;
716		1184
717	my %skill_help;	1185	my %skill_help;
718		1186
719	for my $node (CFPlus::Pod::find skill_description => "*") {	1187	for my $node (DC::Pod::find skill_description => "*") {
720	my (undef, @par) = CFPlus::Pod::section_of $node;	1188	my (undef, @par) = DC::Pod::section_of $node;
721	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1189	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
722	};	1190	};
723		1191
724	for my $skill (values %{$self->{skill_info}}) {	1192	for my $skill (values %{$self->{skill_info}}) {
725	$self->{map_widget}->add_command ("ready_skill $skill",	1193	$self->{map_widget}->add_command ("ready_skill $skill",
726	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1194	(DC::asxml "Ready the skill '$skill'\n\n")
727	. $skill_help{$skill});	1195	. $skill_help{$skill});
728	$self->{map_widget}->add_command ("use_skill $skill",	1196	$self->{map_widget}->add_command ("use_skill $skill",
729	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1197	(DC::asxml "Immediately use the skill '$skill'\n\n")
730	. $skill_help{$skill});	1198	. $skill_help{$skill});
731	}	1199	}
732	}	1200	}
733		1201
734	sub eof {	1202	sub eof {
…		…
737	$self->{map_widget}->clr_commands;	1205	$self->{map_widget}->clr_commands;
738		1206
739	::stop_game ();	1207	::stop_game ();
740	}	1208	}
741		1209
742	sub image_info {
743	my ($self, $numfaces) = @_;
744
745	$self->{num_faces} = $numfaces;
746	$self->{face_prefetch} = [1 .. $numfaces];
747	$self->face_prefetch;
748	}
749
750	sub face_prefetch {
751	my ($self) = @_;
752
753	return unless $::CFG->{face_prefetch};
754
755	if ($self->{num_faces}) {
756	return if @{ $self->{send_queue} || [] };
757	my $todo = @{ $self->{face_prefetch} }
758	or return;
759
760	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
761
762	$self->send ("requestinfo image_sums $face $face");
763
764	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
765	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
766	} elsif (!exists $self->{num_faces}) {
767	$self->send ("requestinfo image_info");
768
769	$self->{num_faces} = 0;
770
771	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
772	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
773	}
774	}
775
776	sub update_floorbox {	1210	sub update_floorbox {
777	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1211	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
778	return unless $::CONN;	1212	return unless $::CONN;
779		1213
780	$::FLOORBOX->clear;	1214	$::FLOORBOX->clear;
781		1215
		1216	my @add;
		1217
782	my $row;	1218	my $row;
783	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;
784	if ($row < 6) {	1221	if ($row < 6) {
785	local $_->{face_widget}; # hack to force recreation of widget	1222	local $_->{face_widget}; # hack to force recreation of widget
786	local $_->{desc_widget}; # hack to force recreation of widget	1223	local $_->{desc_widget}; # hack to force recreation of widget
787	CFPlus::Item::update_widgets $_;	1224	DC::Item::update_widgets $_;
788		1225
		1226	push @add,
789	$::FLOORBOX->add (0, $row, $_->{face_widget});	1227	0, $row, $_->{face_widget},
790	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1228	1, $row, $_->{desc_widget};
791		1229
792	$row++;	1230	$row++;
793	} else {	1231	} else {
794	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1232	push @add, 1, $row, new DC::UI::Button
795	text => "More...",	1233	text => "More...",
796	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1234	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
797	);	1235	;
798	last;	1236	last;
799	}	1237	}
800	}	1238	}
801	if ($::CONN->{open_container}) {	1239	if ($::CONN->{open_container}) {
802	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1240	push @add, 1, $row++, new DC::UI::Button
803	text => "Close container",	1241	text => "Close container",
804	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1242	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
805	);	1243	;
806	}	1244	}
		1245
		1246	$::FLOORBOX->add_at (@add);
807	});	1247	});
808		1248
809	$::WANT_REFRESH++;	1249	$::WANT_REFRESH = 1;
810	}	1250	}
811		1251
812	sub set_opencont {	1252	sub set_opencont {
813	my ($conn, $tag, $name) = @_;	1253	my ($conn, $tag, $name) = @_;
814	$conn->{open_container} = $tag;	1254	$conn->{open_container} = $tag;
815	update_floorbox;	1255	update_floorbox;
816		1256
817	$::INV_RIGHT_HB->clear ();	1257	$::INVR_HB->clear;
818	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1258	$::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
819		1259
820	if ($tag != 0) { # Floor isn't closable, is it?	1260	if ($tag != 0) { # Floor isn't closable, is it?
821	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1261	$::INVR_HB->add (new DC::UI::Button
822	text => "Close container",	1262	text => "Close container",
823	tooltip => "Close the currently open container (if one is open)",	1263	tooltip => "Close the currently open container (if one is open)",
824	on_activate => sub {	1264	on_activate => sub {
825	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1265	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
826	if $tag != 0;	1266	if $tag != 0;
827	#if $CONN->{open_container} != 0;
828	0	1267	0
829	},	1268	},
830	);	1269	);
831	}	1270	}
832		1271
…		…
834	}	1273	}
835		1274
836	sub update_containers {	1275	sub update_containers {
837	my ($self) = @_;	1276	my ($self) = @_;
838		1277
839	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1278	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
840	my $todo = delete $self->{update_container}	1279	my $todo = delete $self->{update_container}
841	or return;	1280	or return;
842		1281
843	for my $tag (keys %$todo) {	1282	for my $tag (keys %$todo) {
844	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1283	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
879	}	1318	}
880		1319
881	sub item_update {	1320	sub item_update {
882	my ($self, $item) = @_;	1321	my ($self, $item) = @_;
883		1322
884	#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";
885		1324
886	CFPlus::Item::update_widgets $item;	1325	DC::Item::update_widgets $item;
887		1326
888	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1327	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
889	set_opencont ($::CONN, 0, "Floor");	1328	set_opencont ($::CONN, 0, "Floor");
890		1329
891	} elsif ($item->{flags} & F_OPEN) {	1330	} elsif ($item->{flags} & F_OPEN) {
892	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1331	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
893		1332
894	} else {	1333	} else {
895	$self->{update_container}{$item->{container}}++;	1334	$self->{update_container}{$item->{container}}++;
896	$self->update_containers;	1335	$self->update_containers;
897	}	1336	}
…		…
908		1347
909	my $weight = .001 * $self->{player}{weight};	1348	my $weight = .001 * $self->{player}{weight};
910	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1349	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
911		1350
912	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1351	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
913	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1352	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
914	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1353	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
915	}	1354	}
916		1355
917	sub update_server_info {	1356	sub update_server_info {
918	my ($self) = @_;	1357	my ($self) = @_;
…		…
926	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1365	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
927	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"	1366	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
928	. "editing support $yesno[!!$self->{editor_support}]\n"	1367	. "editing support $yesno[!!$self->{editor_support}]\n"
929	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1368	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
930	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"	1369	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
931	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1370	. "client support $yesno[$self->{cfplus_ext} > 0]"
932	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1371	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
933	. "map size $self->{mapw}×$self->{maph}\n"	1372	. "map size $self->{mapw}×$self->{maph}\n"
934	);	1373	);
935		1374
936	::setup_build_button ($self->{editor_support}->{builder_ui});
937	}	1375	}
938		1376
939	sub logged_in {	1377	sub logged_in {
940	my ($self) = @_;	1378	my ($self) = @_;
941		1379
942	$self->send_ext_req (cfplus_support => version => 1, sub {	1380	$self->send_ext_req (cfplus_support => version => 2, sub {
		1381	my (%msg) = @_;
		1382
943	$self->{cfplus_ext} = $_[0]{version};	1383	$self->{cfplus_ext} = $msg{version};
944	$self->update_server_info;	1384	$self->update_server_info;
945		1385
946	if ($self->{cfplus_ext} >= 2) {	1386	if ($self->{cfplus_ext} >= 2) {
947	$self->send_ext_req ("editor_support", sub {	1387	$self->send_ext_req ("editor_support", sub {
948	$self->{editor_support} = $_[0];	1388	$self->{editor_support} = { @_ };
949	$self->update_server_info;	1389	$self->update_server_info;
950		1390
951	0	1391	0
952	});	1392	});
953	}	1393	}
…		…
955	0	1395	0
956	});	1396	});
957		1397
958	$self->update_server_info;	1398	$self->update_server_info;
959		1399
960	$self->send_command ("output-sync $::CFG->{output_sync}");
961	$self->send_command ("output-count $::CFG->{output_count}");
962	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1400	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
963	$self->send_command ("pickup $::CFG->{pickup}");	1401	$self->send_pickup ($::CFG->{pickup});
964	}
965		1402
966	sub buildat {	1403	$self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
967	my ($self, $builditem, $x, $y) = @_;	1404	DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
968
969	if ($self->{cfplus_ext}) {
970	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971	}
972	}	1405	}
973		1406
974	sub lookat {	1407	sub lookat {
975	my ($self, $x, $y) = @_;	1408	my ($self, $x, $y) = @_;
976		1409
977	if ($self->{cfplus_ext}) {	1410	if ($self->{cfplus_ext}) {
978	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1411	$self->send_ext_req (lookat => $x, $y, sub {
979	my ($msg) = @_;	1412	my (%msg) = @_;
980		1413
981	if (exists $msg->{npc_dialog}) {	1414	if (exists $msg{npc_dialog}) {
982	# start npc chat dialog	1415	# start npc chat dialog
983	$self->{npc_dialog} = new CFPlus::NPCDialog::	1416	$self->{npc_dialog} = new DC::NPCDialog::
984	dx => $x,	1417	token => $msg{npc_dialog},
985	dy => $y,
986	title => "$msg->{npc_dialog} (NPC)",	1418	title => "$msg{npc_dialog}[0] (NPC)",
987	conn => $self,	1419	conn => $self,
988	;	1420	;
989	}	1421	}
990	});	1422	});
991	}	1423	}
…		…
998		1430
999	(delete $self->{npc_dialog})->destroy	1431	(delete $self->{npc_dialog})->destroy
1000	if $self->{npc_dialog};	1432	if $self->{npc_dialog};
1001		1433
1002	$self->SUPER::destroy;	1434	$self->SUPER::destroy;
1003	}
1004		1435
		1436	%$self = ();
		1437	}
		1438
1005	package CFPlus::NPCDialog;	1439	package DC::NPCDialog;
1006		1440
1007	our @ISA = 'CFPlus::UI::Toplevel';	1441	our @ISA = 'DC::UI::Toplevel';
1008		1442
1009	sub new {	1443	sub new {
1010	my $class = shift;	1444	my $class = shift;
1011		1445
1012	my $self = $class->SUPER::new (	1446	my $self = $class->SUPER::new (
…		…
1019	kw => { hi => 0, yes => 0, no => 0 },	1453	kw => { hi => 0, yes => 0, no => 0 },
1020	has_close_button => 1,	1454	has_close_button => 1,
1021	@_,	1455	@_,
1022	);	1456	);
1023		1457
1024	CFPlus::weaken (my $this = $self);	1458	DC::weaken (my $this = $self);
1025		1459
1026	$self->connect (delete => sub { $this->destroy; 1 });	1460	$self->connect (delete => sub { $this->destroy; 1 });
1027		1461
1028	# better use a pane...	1462	# better use a pane...
1029	$self->add (my $hbox = new CFPlus::UI::HBox);	1463	$self->add (my $hbox = new DC::UI::HBox);
1030	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1464	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1031		1465
1032	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1466	$hbox->add (my $vbox = new DC::UI::VBox);
1033		1467
1034	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1468	$vbox->add (new DC::UI::Label text => "Message Entry:");
1035	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1469	$vbox->add ($self->{entry} = new DC::UI::Entry
1036	tooltip => "#npc_message_entry",	1470	tooltip => "#npc_message_entry",
1037	on_activate => sub {	1471	on_activate => sub {
1038	my ($entry, $text) = @_;	1472	my ($entry, $text) = @_;
1039		1473
1040	return unless $text =~ /\S/;	1474	return unless $text =~ /\S/;
…		…
1044		1478
1045	0	1479	0
1046	},	1480	},
1047	);	1481	);
1048		1482
1049	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1483	$vbox->add ($self->{options} = new DC::UI::VBox);
1050		1484
1051	$self->{bye_button} = new CFPlus::UI::Button	1485	$self->{bye_button} = new DC::UI::Button
1052	text => "Bye (close)",	1486	text => "Bye (close)",
1053	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.",
1054	on_activate => sub { $this->destroy; 1 },	1488	on_activate => sub { $this->destroy; 1 },
1055	;	1489	;
1056		1490
1057	$self->update_options;	1491	$self->update_options;
1058		1492
1059	$self->{id} = $self->{conn}->send_ext_req (	1493	$self->{id} = "npc-channel-" . $self->{conn}->token;
1060	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1494	$self->{conn}->connect_ext ($self->{id} => sub {
1061	sub { $this && $this->feed (@_) }	1495	$this->feed (@_) if $this;
1062	);	1496	});
		1497
		1498	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1063		1499
1064	$self->{entry}->grab_focus;	1500	$self->{entry}->grab_focus;
1065		1501
1066	$self->{textview}->add_paragraph ({	1502	$self->{textview}->add_paragraph ({
1067	fg => [1, 1, 0, 1],	1503	fg => [1, 1, 0, 1],
…		…
1073	};	1509	};
1074		1510
1075	sub update_options {	1511	sub update_options {
1076	my ($self) = @_;	1512	my ($self) = @_;
1077		1513
1078	CFPlus::weaken $self;	1514	DC::weaken $self;
1079		1515
1080	$self->{options}->clear;	1516	$self->{options}->clear;
1081	$self->{options}->add ($self->{bye_button});	1517	$self->{options}->add ($self->{bye_button});
1082		1518
1083	for my $kw (sort keys %{ $self->{kw} }) {	1519	for my $kw (sort keys %{ $self->{kw} }) {
1084	$self->{options}->add (new CFPlus::UI::Button	1520	$self->{options}->add (new DC::UI::Button
1085	text => $kw,	1521	text => $kw,
1086	on_activate => sub {	1522	on_activate => sub {
1087	$self->send ($kw);	1523	$self->send ($kw);
1088	0	1524	0
1089	},	1525	},
1090	);	1526	);
1091	}	1527	}
1092	}	1528	}
1093		1529
1094	sub feed {	1530	sub feed {
1095	my ($self, $msg) = @_;	1531	my ($self, $type, @arg) = @_;
1096		1532
1097	CFPlus::weaken $self;	1533	DC::weaken $self;
1098		1534
1099	if ($msg->{msgtype} eq "reply") {	1535	if ($type eq "update") {
		1536	my (%info) = @arg;
		1537
1100	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1538	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1101	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1539	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1102
1103	my $text = "\n" . CFPlus::asxml $msg->{msg};
1104	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1105	my @link;
1106	$text =~ s{
1107	($match)
1108	}{
1109	my $kw = $1;
1110
1111	push @link, new CFPlus::UI::Label
1112	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1113	can_hover => 1,
1114	can_events => 1,
1115	padding_x => 0,
1116	padding_y => 0,
1117	on_button_up => sub {
1118	$self->send ($kw);
1119	};
1120
1121	"\x{fffc}"
1122	}giex;
1123		1540
		1541	if (exists $info{msg}) {
		1542	my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
		1543	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1544	my @link;
		1545	$text =~ s{
		1546	($match)
		1547	}{
		1548	my $kw = $1;
		1549
		1550	push @link, new DC::UI::Label
		1551	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1552	can_hover => 1,
		1553	can_events => 1,
		1554	padding_x => 0,
		1555	padding_y => 0,
		1556	on_button_up => sub {
		1557	$self->send ($kw);
		1558	};
		1559
		1560	"\x{fffc}"
		1561	}giex;
		1562
1124	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1563	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1125	$self->{textview}->scroll_to_bottom;	1564	$self->{textview}->scroll_to_bottom;
		1565	}
		1566
1126	$self->update_options;	1567	$self->update_options;
1127	} else {	1568	} else {
1128	$self->destroy;	1569	$self->destroy;
1129	}	1570	}
1130		1571
…		…
1132	}	1573	}
1133		1574
1134	sub send {	1575	sub send {
1135	my ($self, $msg) = @_;	1576	my ($self, $msg) = @_;
1136		1577
1137	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1578	$self->{textview}->add_paragraph ({
		1579	markup =>
		1580	"\n<span foreground='#ffff00'><b>"
		1581	. (DC::asxml $msg)
		1582	. "</b></span>"
		1583	});
1138	$self->{textview}->scroll_to_bottom;	1584	$self->{textview}->scroll_to_bottom;
1139		1585
1140	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1586	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1141	}	1587	}
1142		1588
1143	sub destroy {	1589	sub destroy {
1144	my ($self) = @_;	1590	my ($self) = @_;
1145		1591
1146	#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
1147		1593
1148	if ($self->{conn}) {	1594	if ($self->{conn}) {
1149	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1595	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1150	delete $self->{conn}{npc_dialog};	1596	delete $self->{conn}{npc_dialog};
1151	$self->{conn}->disconnect_ext ($self->{id});	1597	$self->{conn}->disconnect_ext ($self->{id});
1152	}	1598	}
1153		1599
1154	$self->SUPER::destroy;	1600	$self->SUPER::destroy;

Diff Legend

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