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

Diff Legend

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