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.229 by root, Mon Nov 26 13:02:28 2012 UTC

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

Diff Legend

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