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

Diff Legend

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