[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11:45 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFPlus;	8	use CFPlus;
		9	use CFPlus::DB;
9	use CFPlus::UI;	10	use CFPlus::UI;
10	use CFPlus::Pod;	11	use CFPlus::Pod;
		12	use CFPlus::Macro;
		13	use CFPlus::Item;
		14
		15	use Crossfire::Protocol::Base 0.95;
11		16
12	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
13		18
14	sub new {	19	sub new {
15	my $class = shift;	20	my ($class, %arg) = @_;
16		21
17	my $self = $class->SUPER::new (@_);	22	my $self = $class->SUPER::new (%arg,
		23	setup_req => {
		24	extmap => 1,
		25	excmd => 1,
		26	xwidget => 1,#d#
		27	%{$arg{setup_req} \|\| {}},
		28	},
		29	);
18		30
19	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
20		32
21	my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {	33	my @cmd_help = map {
22	my ($pom) = @_;
23
24	my @cmd_help;
25
26	for my $head2 ($pom->head1->[-2]->head2) {
27	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
28	or next;	35	or die "unparseable command help: $_->{kw}[0]";
29		36
30	my $cmd = $1;	37	my $cmd = $1;
31	my @args = split /\\|/, $2;	38	my @args = split /\\|/, $2;
32	@args = (".*") unless @args;	39	@args = (".*") unless @args;
33		40
		41	my (undef, @par) = CFPlus::Pod::section_of $_;
		42	my $text = CFPlus::Pod::as_label @par;
		43
34	$_ = $_ eq ".*" ? "" : " $_"	44	$_ = $_ eq ".*" ? "" : " $_"
35	for @args;	45	for @args;
36		46
37	my $text = CFPlus::Pod::as_markup $head2->content;	47	map ["$cmd$_", $text],
38
39	push @cmd_help, ["$cmd$_", $text]
40	for sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
41	@args;	49	@args
		50	} sort { $a->{par} <=> $b->{par} }
		51	CFPlus::Pod::find command => "*";
		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62
		63	$self->send_exti_msg (fx_want => {
		64	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		65	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		66	});
		67
		68	if (my $ts = $cap{tileset}) {
		69	if (my ($default) = grep $_->[2] & 1, @$ts) {
		70	$self->{tileset} = $default;
		71	$self->{tilesize} = $default->[3];
		72	$self->setup_req (tileset => $default->[0]);
		73
		74	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		75	my $h = int $self->{maph} * 32 / $self->{tilesize};
		76
		77	$self->setup_req (mapsize => "${w}x${h}");
		78	}
		79	}
		80	});
		81
		82	$self->{json_coder}
		83	->convert_blessed
		84	->filter_json_single_key_object (__w_ => sub {
		85	$self->{widget}{$_[0]}
		86	});
		87
		88	# widgetset new
		89	$self->connect_ext (ws_n => sub {
		90	my ($id) = @_;
		91
		92	$self->{widgetset}{$id} = {
		93	w => {},
42	}	94	};
43
44	\@cmd_help
45	};	95	});
		96
		97	# widgetset destroy
		98	$self->connect_ext (ws_d => sub {
		99	my ($id) = @_;
		100
		101	my $ws = delete $self->{widgetset}{$id}
		102	or return;
		103
		104	$_->destroy
		105	for values %{$ws->{w}};
		106	});
		107
		108	# widgetset create
		109	$self->connect_ext (ws_c => sub {
		110	my ($ws, $id, $class, $args) = @_;
		111
		112	for my $ev (grep /^on_/, keys %$args) {
		113	$args->{$ev} = sub {
		114	my $id = shift->{s_id};
		115	$self->send_exti_msg (w_e => $id, $ev, \@_);
		116
		117	1
		118	};
		119	}
		120
		121	if (my $widget = eval {
		122	local $SIG{__DIE__};
		123	"CFPlus::UI::$class"->new (
		124	%$args,
		125	s_ws => $ws,
		126	s_id => $id,
		127	)
		128	}
		129	) {
		130	$self->{widget}{$id}
		131	= $self->{widgetset}{$ws}{w}{$id}
		132	= $widget;
		133
		134	$widget->connect (on_destroy => sub {
		135	my ($widget) = @_;
		136
		137	delete $self->{widget}{$widget->{s_id}};
		138	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
		139	});
		140	} else {
		141	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		142	$self->send_exti_msg (w_e => $id, "destroy");
		143	}
		144	});
		145
		146	# widget call
		147	$self->connect_ext (w_c => sub {
		148	my ($id, $rid, $method, $args) = @_;
		149
		150	my $w = $self->{widget}{$id}
		151	or return;
		152
		153	$args \|\|= [];
		154
		155	if ($rid) {
		156	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
		157	} else {
		158	$w->$method (@$args);
		159	}
		160	});
		161
		162	# widget set
		163	$self->connect_ext (w_s => sub {
		164	my ($id, $attr) = @_;
		165
		166	my $w = $self->{widget}{$id}
		167	or return;
		168
		169	for (my $i = 0; $i < $#$attr; $i += 2) {
		170	my ($member, $value) = @$attr[$i, $i+1];
		171	if (defined $value) {
		172	$w->{$member} = $value;
		173	} else {
		174	delete $w->{$member};
		175	}
		176	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		177	}
		178	});
		179
		180	# widget get
		181	$self->connect_ext (w_g => sub {
		182	my ($id, $rid, $attr) = @_;
		183
		184	my $w = $self->{widget}{$id}
		185	or return;
		186
		187	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		188	});
		189
		190	# message window
		191	$self->connect_ext (channel_info => sub {
		192	my ($info) = @_;
		193	$self->{channels}->{$info->{id}} = $info;
		194	$::MESSAGE_WINDOW->add_channel ($info);
		195	});
		196
		197	# destroy widgets on logout
		198	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		199	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		200	$_->destroy
		201	for values %{delete $ws->{w} \|\| {}};
		202	}
		203	});
46		204
47	$self->{map_widget}->add_command (@$_)	205	$self->{map_widget}->add_command (@$_)
48	for @$cmd_help;	206	for @cmd_help;
49		207
		208	{
		209	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		210	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		211	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		212	}
		213
		214	{
50	$self->{noface} = new_from_file CFPlus::Texture	215	$self->{noface} = my $tex = new_from_file CFPlus::Texture
51	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	216	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		217	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		218	}
52		219
53	$self->{open_container} = 0;	220	$self->{open_container} = 0;
54		221
55	# "global"
56	$self->{tilecache} = CFPlus::db_table "tilecache";
57	$self->{facemap} = CFPlus::db_table "facemap";
58
59	# per server	222	# per server
60	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61		224
62	$self	225	$self
63	}	226	}
64		227
65	sub logprint {	228	sub logprint {
66	my ($self, @a) = @_;	229	my ($self, @a) = @_;
67		230
68	$self->{log_fh} \|\|= do {	231	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
69	my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71	open my $fh, ">>:utf8", $path
72	or die "Couldn't open logfile $path: $!";
73
74	$fh->autoflush (1);
75
76	$fh;
77	};
78
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84	print {$self->{log_fh}} "$ts ", @a, "\n";
85	}	232	}
86		233
87	sub _stat_numdiff {	234	sub _stat_numdiff {
88	my ($self, $name, $old, $new) = @_;	235	my ($self, $name, $old, $new) = @_;
89		236
…		…
222	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	369	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
223	$::GAUGES->{food} ->set_value ($fo, $fo_m);	370	$::GAUGES->{food} ->set_value ($fo, $fo_m);
224	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	371	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
225	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	372	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	373	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227	my $rng = $stats->{+CS_STAT_RANGE};	374	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228	$rng =~ s/^Range: //; # thank you so much dear server
229	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
230	my $title = $stats->{+CS_STAT_TITLE};	375	my $title = $stats->{+CS_STAT_TITLE};
231	$title =~ s/^Player: //;	376	$title =~ s/^Player: //;
232	$::STATWIDS->{title} ->set_text ("Title: " . $title);	377	$::STATWIDS->{title} ->set_text ("Title: " . $title);
233		378
234	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	379	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
254	my @skills = keys %{ $self->{skill_info} };	399	my @skills = keys %{ $self->{skill_info} };
255		400
256	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	401	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257	$sktbl->clear;	402	$sktbl->clear;
258		403
		404	my @add;
		405
		406	push @add,
259	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	407	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	408	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	409	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	410	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	411	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
264	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	412	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		413	;
265		414
266	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	415	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267		416
268	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	417	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	418	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270	my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271		419
272	my ($x, $y) = (0, 1);	420	my ($x, $y) = (0, 1);
273	for (	421	for (
274	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }	422	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275	map [$_, $self->{skill_info}{$_}],	423	map [$_, $self->{skill_info}{$_}],
…		…
284	if ($ev->{button} == 1) {	432	if ($ev->{button} == 1) {
285	$::CONN->user_send ("ready_skill $name");	433	$::CONN->user_send ("ready_skill $name");
286	} elsif ($ev->{button} == 2) {	434	} elsif ($ev->{button} == 2) {
287	$::CONN->user_send ("use_skill $name");	435	$::CONN->user_send ("use_skill $name");
288	} elsif ($ev->{button} == 3) {	436	} elsif ($ev->{button} == 3) {
		437	my $shortname = CFPlus::shorten $name, 14;
289	(new CFPlus::UI::Menu	438	(new CFPlus::UI::Menu
290	items => [	439	items => [
291	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	440	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	441	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293	],	442	],
294	)->popup ($ev);	443	)->popup ($ev);
295	} else {	444	} else {
296	return 0;	445	return 0;
297	}	446	}
298		447
299	1	448	1
300	};	449	};
301		450
		451	push @add,
302	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	452	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	453	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
304	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	454	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	455	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
306	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);	456	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		457	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		458	;
307		459
308	$x++ and ($x, $y) = (0, $y + 1);	460	$x++ and ($x, $y) = (0, $y + 1);
309	}	461	}
		462
		463	$sktbl->add_at (@add);
310	}	464	}
311		465
312	for (grep exists $stats->{$_}, @skills) {	466	for (grep exists $stats->{$_}, @skills) {
313	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	467	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	468	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315	}	469	}
316	}	470	}
317		471
		472	sub macro_send {
		473	my ($self, $macro) = @_;
		474
		475	for my $cmd (@{ $macro->{action} }) {
		476	$self->send_command ($cmd);
		477	}
		478	}
		479
318	sub user_send {	480	sub user_send {
319	my ($self, $command) = @_;	481	my ($self, $command) = @_;
320		482
		483	$self->{record}->($command)
321	if ($self->{record}) {	484	if $self->{record};
322	push @{$self->{record}}, $command;
323	}
324		485
325	$self->logprint ("send: ", $command);	486	$self->logprint ("send: ", $command);
326	$self->send_command ($command);	487	$self->send_command ($command);
327	::status ($command);	488	::status ($command);
328	}	489	}
329		490
330	sub start_record {	491	sub record {
331	my ($self) = @_;	492	my ($self, $cb) = @_;
332		493
333	$self->{record} = [];	494	$self->{record} = $cb;
334	}
335
336	sub stop_record {
337	my ($self) = @_;
338	return delete $self->{record};
339	}	495	}
340		496
341	sub map_scroll {	497	sub map_scroll {
342	my ($self, $dx, $dy) = @_;	498	my ($self, $dx, $dy) = @_;
343		499
…		…
345	}	501	}
346		502
347	sub feed_map1a {	503	sub feed_map1a {
348	my ($self, $data) = @_;	504	my ($self, $data) = @_;
349		505
350	$self->{map}->map1a_update ($data);	506	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
351	$self->{map_widget}->update;	507	$self->{map_widget}->update;
352	}	508	}
353		509
354	sub magicmap {	510	sub magicmap {
355	my ($self, $w, $h, $x, $y, $data) = @_;	511	my ($self, $w, $h, $x, $y, $data) = @_;
…		…
364	or return;	520	or return;
365		521
366	my ($hash, $x, $y, $w, $h) = @$map_info;	522	my ($hash, $x, $y, $w, $h) = @$map_info;
367		523
368	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	524	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	525	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	526	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371	}	527	}
372		528
373	sub map_clear {	529	sub map_clear {
374	my ($self) = @_;	530	my ($self) = @_;
…		…
378		534
379	$self->{map}->clear;	535	$self->{map}->clear;
380	delete $self->{map_widget}{magicmap};	536	delete $self->{map_widget}{magicmap};
381	}	537	}
382		538
		539	sub bg_fetch {
		540	my ($self) = @_;
		541
		542	my $id;
		543
		544	do {
		545	$id = pop @{$self->{bg_fetch}}
		546	or return;
		547	} while $self->{texture}[$id];
		548
		549	CFPlus::DB::get tilecache => $id, sub {
		550	my ($data) = @_;
		551
		552	return unless $self->{map}; # stop when destroyed
		553
		554	$self->set_texture ($id => $data)
		555	if defined $data;
		556
		557	$self->bg_fetch;
		558	};
		559	}
383		560
384	sub load_map($$$) {	561	sub load_map($$$) {
385	my ($self, $hash, $x, $y) = @_;	562	my ($self, $hash, $x, $y) = @_;
386		563
387	if (defined (my $data = $self->{mapcache}->get ($hash))) {	564	my $gen = $self->{map_change_gen};
		565
		566	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		567	return unless $gen == $self->{map_change_gen};
		568
		569	my ($data) = @_;
		570
		571	if (defined $data) {
388	$data = Compress::LZF::decompress $data;	572	$data = Compress::LZF::decompress $data;
389	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	573	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391	my $data = $self->{tilecache}->get ($id)
392	or next;
393		574
394	$self->set_texture ($id => $data);	575	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		576	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		577	$self->bg_fetch unless $inprogress;
395	}	578	}
396	}	579	};
397	}	580	}
398		581
399	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	582	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400	# (server resource,s latency, bandwidth), so this hack is warranted.	583	# (server resource,s latency, bandwidth), so this hack is warranted.
401	# the right fix is to make real tiled maps with an overview file	584	# the right fix is to make real tiled maps with an overview file
…		…
465		648
466	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	649	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	650	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468		651
469	} else {	652	} else {
		653	my $gen = $self->{map_change_gen};
470	$self->send_mapinfo ("spatial $path$tile", sub {	654	$self->send_mapinfo ("spatial $path$tile", sub {
		655	return unless $gen == $self->{map_change_gen};
		656
471	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	657	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472		658
473	return if $mode ne "spatial";	659	return if $mode ne "spatial";
474		660
475	$x += $self->{map}->ox;	661	$x += $self->{map}->ox;
…		…
489		675
490	sub map_change {	676	sub map_change {
491	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	677	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492		678
493	$self->flush_map;	679	$self->flush_map;
		680
		681	++$self->{map_change_gen};
494		682
495	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	683	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496		684
497	my $mapmapw = $self->{mapmap}->{w};	685	my $mapmapw = $self->{mapmap}->{w};
498	my $mapmaph = $self->{mapmap}->{h};	686	my $mapmaph = $self->{mapmap}->{h};
…		…
515	$self->load_map ($hash, $x, $y);	703	$self->load_map ($hash, $x, $y);
516	$self->flood_fill (0, 0, 0, "", $hash, $flags);	704	$self->flood_fill (0, 0, 0, "", $hash, $flags);
517	}	705	}
518		706
519	sub face_find {	707	sub face_find {
520	my ($self, $facenum, $face) = @_;	708	my ($self, $facenum, $face, $cb) = @_;
521		709
522	my $hash = "$face->{chksum},$face->{name}";	710	if ($face->{type} == 0) { # FT_FACE
		711	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
523		712
524	my $id = $self->{facemap}->get ($hash);	713	$face->{id} = $id;
525
526	unless ($id) {
527	# create new id for face
528	# I love transactions
529	for (1..100) {
530	my $txn = $CFPlus::DB_ENV->txn_begin;
531	my $status = $self->{facemap}->db_get (id => $id);
532	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
533	$id = ($id \|\| 64) + 1;
534	if ($self->{facemap}->put (id => $id) == 0
535	&& $self->{facemap}->put ($hash => $id) == 0) {
536	$txn->txn_commit;
537
538	goto gotid;
539	}
540	}
541	$txn->txn_abort;
542	}
543
544	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545	}
546
547	gotid:
548	$face->{id} = $id;
549	$self->{map}->set_face ($facenum => $id);
550	$self->{faceid}[$facenum] = $id;#d#	714	$self->{faceid}[$facenum] = $id;
551		715
552	my $face = $self->{tilecache}->get ($id);	716	$self->{map}->set_tileid ($facenum => $id);
553		717
554	if ($face) {	718	CFPlus::DB::get tilecache => $id, $cb;
555	#$self->face_prefetch;	719
556	$face	720	} elsif ($face->{type} & 1) { # with metadata
557	} else {	721	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
558	my $tex = $self->{noface};	722	CFPlus::DB::get res_meta => $face->{name}, $cb;
559	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560	undef
561	};	723	}
562	}	724	}
563		725
564	sub face_update {	726	sub face_update {
565	my ($self, $facenum, $face, $changed) = @_;	727	my ($self, $facenum, $face, $changed) = @_;
566		728
567	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	729	if ($face->{type} == 0) { # FT_FACE
		730	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		731	if $changed;
568		732
569	$self->set_texture ($face->{id} => delete $face->{image});	733	$self->set_texture ($face->{id} => delete $face->{data});
		734
		735	} elsif ($face->{type} & 1) { # split metadata
		736	my $cb = sub { };
		737
		738	if ($face->{type} == 3) { # FT_MUSIC
		739	$cb = sub {
		740	$self->{music_meta}{$facenum} = $face;
		741
		742	::message ({ markup => "downloaded song #$facenum" })
		743	if $changed;
		744
		745	&::audio_music_push ($facenum);
		746	};
		747	} elsif ($face->{type} == 5) { # FT_SOUND
		748	$cb = sub {
		749	$self->{sound_meta}{$facenum} = $face;
		750
		751	::message ({ markup => "downloaded sound #$facenum" })
		752	if $changed;
		753
		754	&::audio_sound_push ($facenum);
		755	};
		756	}
		757
		758	if ($changed) { # new data
		759	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		760
		761	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		762	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
		763	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		764	::add_license ($face);
		765	$cb->();
		766	};
		767
		768	} else {
		769	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		770	::add_license ($face);
		771	$cb->();
		772	}
		773	}
		774	}
		775
		776	sub smooth_update {
		777	my ($self, $facenum, $face) = @_;
		778
		779	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570	}	780	}
571		781
572	sub set_texture {	782	sub set_texture {
573	my ($self, $id, $data) = @_;	783	my ($self, $id, $data) = @_;
574		784
		785	return unless $self->{map};
		786
575	$self->{texture}[$id] \|\|= do {	787	$self->{texture}[$id] = my $tex =
576	my $tex =
577	new_from_image CFPlus::Texture	788	new_from_image CFPlus::Texture
578	$data, minify => 1, mipmap => 1;	789	$data, minify => 1, mipmap => 1;
579		790
580	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	791	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581	$self->{map_widget}->update;	792	$self->{map_widget}->update;
582		793
583	$tex	794	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
		795	}
		796
		797	sub connect_face_update {
		798	my ($self, $id, $cb) = @_;
		799
		800	push @{$self->{face_cb}{$id}}, $cb;
		801
		802	CFPlus::guard {
		803	@{$self->{face_cb}{$id}}
		804	= grep $_ != $cb,
		805	@{$self->{face_cb}{$id}};
584	};	806	}
585	}	807	}
586		808
587	sub sound_play {	809	sub sound_play {
588	my ($self, $x, $y, $soundnum, $type) = @_;	810	my ($self, $type, $face, $dx, $dy, $vol) = @_;
589		811
590	$self->{sound_play}->($x, $y, $soundnum, $type);	812	&::audio_sound_play ($face, $dx, $dy, $vol)
		813	unless $type & 1; # odd types are silent for future expansion
591	}	814	}
592		815
593	my $LAST_QUERY; # server is stupid, stupid, stupid	816	my $LAST_QUERY; # server is stupid, stupid, stupid
594		817
595	sub query {	818	sub query {
…		…
599	$LAST_QUERY = $prompt;	822	$LAST_QUERY = $prompt;
600		823
601	$self->{query}-> ($self, $flags, $prompt);	824	$self->{query}-> ($self, $flags, $prompt);
602	}	825	}
603		826
604	sub drawinfo {	827	sub sanitise_xml($) {
605	my ($self, $color, $text) = @_;	828	local $_ = shift;
606		829
607	my @color = (	830	# we now weed out all tags we do not support
		831	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		832	# now all entities
		833	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		834
		835	# handle some elements
		836	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		837	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		838
		839	$_
		840	}
		841
		842	our %NAME_TO_COLOR = (
		843	black => 0,
		844	white => 1,
		845	darkblue => 2,
		846	red => 3,
		847	orange => 4,
		848	lightblue => 5,
		849	darkorange => 6,
		850	green => 7,
		851	darkgreen => 8,
		852	grey => 9,
		853	brown => 10,
		854	yellow => 11,
		855	tan => 12,
		856	);
		857
		858	our @CF_COLOR = (
608	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	859	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609	[1.00, 1.00, 1.00],	860	[1.00, 1.00, 1.00],
610	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	861	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611	[1.00, 0.00, 0.00],	862	[1.00, 0.00, 0.00],
612	[1.00, 0.54, 0.00],	863	[1.00, 0.54, 0.00],
613	[0.11, 0.56, 1.00],	864	[0.11, 0.56, 1.00],
614	[0.93, 0.46, 0.00],	865	[0.93, 0.46, 0.00],
615	[0.18, 0.54, 0.34],	866	[0.18, 0.54, 0.34],
616	[0.56, 0.73, 0.56],	867	[0.56, 0.73, 0.56],
617	[0.80, 0.80, 0.80],	868	[0.80, 0.80, 0.80],
618	[0.75, 0.61, 0.20],	869	[0.75, 0.61, 0.20],
619	[0.99, 0.77, 0.26],	870	[0.99, 0.77, 0.26],
620	[0.74, 0.65, 0.41],	871	[0.74, 0.65, 0.41],
621	);	872	);
622		873
		874	sub msg {
		875	my ($self, $color, $type, $text, @extra) = @_;
		876
		877	$text = sanitise_xml $text;
		878
		879	if (my $cb = $self->{cb_msg}{$type}) {
		880	$_->($self, $color, $type, $text, @extra) for values %$cb;
		881	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		882	$type =~ s/-/_/g;
		883	$self->{$type} = $text;
		884	} else {
623	$self->logprint ("info: ", $text);	885	$self->logprint ("msg: ", $text);
		886	return if $color < 0; # negative color == ignore if not understood
624		887
625	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	888	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
626		889
627	# try to create single paragraphs of multiple lines sent by the server	890	## try to create single paragraphs of multiple lines sent by the server
		891	# no longer neecssary with TRT servers
628	$text =~ s/(?<=\S)\n(?=\w)/ /g;	892	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
629		893
630	$text = CFPlus::asxml $text;	894	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
631	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	895	for split /\n/, $text;
632	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633		896
634	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636	$self->{logview}->scroll_to_bottom;
637
638	$self->{statusbox}->add ($text,	897	$self->{statusbox}->add ($text,
639	group => $text,	898	group => $text,
640	fg => $color[$color],	899	fg => $fg,
641	timeout => $color >= 2 ? 60 : 10,	900	timeout => $color >= 2 ? 180 : 10,
642	tooltip_font => $::FONT_FIXED,	901	tooltip_font => $::FONT_FIXED,
643	);	902	);
644	}	903	}
645
646	sub drawextinfo {
647	my ($self, $color, $type, $subtype, $message) = @_;
648
649	$self->drawinfo ($color, $message);
650	}	904	}
651		905
652	sub spell_add {	906	sub spell_add {
653	my ($self, $spell) = @_;	907	my ($self, $spell) = @_;
654		908
655	# try to create single paragraphs out of the multiple lines sent by the server	909	# try to create single paragraphs out of the multiple lines sent by the server
656	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	910	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657	$spell->{message} =~ s/\n+$//;	911	$spell->{message} =~ s/\n+$//;
658	$spell->{message} \|\|= "Server did not provide a description for this spell.";	912	$spell->{message} \|\|= "Server did not provide a description for this spell.";
659		913
660	$::SPELL_PAGE->add_spell ($spell);	914	$::SPELL_LIST->add_spell ($spell);
661		915
662	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	916	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	917	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664	}	918	}
665		919
666	sub spell_delete {	920	sub spell_delete {
667	my ($self, $spell) = @_;	921	my ($self, $spell) = @_;
668		922
669	$::SPELL_PAGE->remove_spell ($spell);	923	$::SPELL_LIST->remove_spell ($spell);
		924	}
		925
		926	sub setup {
		927	my ($self, $setup) = @_;
		928
		929	$self->{map_widget}->set_tilesize ($self->{tilesize});
		930	$::MAP->resize ($self->{mapw}, $self->{maph});
670	}	931	}
671		932
672	sub addme_success {	933	sub addme_success {
673	my ($self) = @_;	934	my ($self) = @_;
674		935
675	my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676	my ($pom) = @_;
677
678	my %skill_help;	936	my %skill_help;
679		937
680	for my $head2 ($pom->head1->[3]->head2) {	938	for my $node (CFPlus::Pod::find skill_description => "*") {
681	$skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;	939	my (undef, @par) = CFPlus::Pod::section_of $node;
682	}	940	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684	\%skill_help
685	};	941	};
686		942
687	for my $skill (values %{$self->{skill_info}}) {	943	for my $skill (values %{$self->{skill_info}}) {
688	$self->{map_widget}->add_command ("ready_skill $skill",	944	$self->{map_widget}->add_command ("ready_skill $skill",
689	(CFPlus::asxml "Ready the skill '$skill'\n\n")	945	(CFPlus::asxml "Ready the skill '$skill'\n\n")
690	. $skill_help->{$skill});	946	. $skill_help{$skill});
691	$self->{map_widget}->add_command ("use_skill $skill",	947	$self->{map_widget}->add_command ("use_skill $skill",
692	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	948	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693	. $skill_help->{$skill});	949	. $skill_help{$skill});
694	}	950	}
695	}	951	}
696		952
697	sub eof {	953	sub eof {
698	my ($self) = @_;	954	my ($self) = @_;
699		955
700	$self->{map_widget}->clr_commands;	956	$self->{map_widget}->clr_commands;
701		957
702	::stop_game ();	958	::stop_game ();
703	}
704
705	sub image_info {
706	my ($self, $numfaces) = @_;
707
708	$self->{num_faces} = $numfaces;
709	$self->{face_prefetch} = [1 .. $numfaces];
710	$self->face_prefetch;
711	}
712
713	sub face_prefetch {
714	my ($self) = @_;
715
716	return unless $::CFG->{face_prefetch};
717
718	if ($self->{num_faces}) {
719	return if @{ $self->{send_queue} \|\| [] };
720	my $todo = @{ $self->{face_prefetch} }
721	or return;
722
723	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724
725	$self->send ("requestinfo image_sums $face $face");
726
727	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729	} elsif (!exists $self->{num_faces}) {
730	$self->send ("requestinfo image_info");
731
732	$self->{num_faces} = 0;
733
734	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736	}
737	}	959	}
738		960
739	sub update_floorbox {	961	sub update_floorbox {
740	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	962	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741	return unless $::CONN;	963	return unless $::CONN;
742		964
743	$::FLOORBOX->clear;	965	$::FLOORBOX->clear;
		966
		967	my @add;
744		968
745	my $row;	969	my $row;
746	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	970	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
747	if ($row < 6) {	971	if ($row < 6) {
748	local $_->{face_widget}; # hack to force recreation of widget	972	local $_->{face_widget}; # hack to force recreation of widget
749	local $_->{desc_widget}; # hack to force recreation of widget	973	local $_->{desc_widget}; # hack to force recreation of widget
750	CFPlus::Item::update_widgets $_;	974	CFPlus::Item::update_widgets $_;
751		975
		976	push @add,
752	$::FLOORBOX->add (0, $row, $_->{face_widget});	977	0, $row, $_->{face_widget},
753	$::FLOORBOX->add (1, $row, $_->{desc_widget});	978	1, $row, $_->{desc_widget};
754		979
755	$row++;	980	$row++;
756	} else {	981	} else {
757	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	982	push @add, 1, $row, new CFPlus::UI::Button
758	text => "More...",	983	text => "More...",
759	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	984	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760	);	985	;
761	last;	986	last;
762	}	987	}
763	}	988	}
764	if ($::CONN->{open_container}) {	989	if ($::CONN->{open_container}) {
765	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	990	push @add, 1, $row++, new CFPlus::UI::Button
766	text => "Close container",	991	text => "Close container",
767	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	992	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768	);	993	;
769	}	994	}
		995
		996	$::FLOORBOX->add_at (@add);
770	});	997	});
771		998
772	$::WANT_REFRESH++;	999	$::WANT_REFRESH++;
773	}	1000	}
774		1001
…		…
885	$::SERVER_INFO->set_markup (	1112	$::SERVER_INFO->set_markup (
886	"server <tt>$self->{host}:$self->{port}</tt>\n"	1113	"server <tt>$self->{host}:$self->{port}</tt>\n"
887	. "protocol version <tt>$self->{version}</tt>\n"	1114	. "protocol version <tt>$self->{version}</tt>\n"
888	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1115	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1116	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1117	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1118	. "editing support $yesno[!!$self->{editor_support}]\n"
		1119	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1120	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1121	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1122	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892	. "map size $self->{mapw}×$self->{maph}\n"	1123	. "map size $self->{mapw}×$self->{maph}\n"
893	);	1124	);
		1125
894	}	1126	}
895		1127
896	sub logged_in {	1128	sub logged_in {
897	my ($self) = @_;	1129	my ($self) = @_;
898		1130
899	$self->send_ext_req (cfplus_support => "1", sub {	1131	$self->send_ext_req (cfplus_support => version => 2, sub {
		1132	my (%msg) = @_;
		1133
900	$self->{cfplus_ext} = $_[0];	1134	$self->{cfplus_ext} = $msg{version};
901	$self->update_server_info;	1135	$self->update_server_info;
		1136
		1137	if ($self->{cfplus_ext} >= 2) {
		1138	$self->send_ext_req ("editor_support", sub {
		1139	$self->{editor_support} = { @_ };
		1140	$self->update_server_info;
		1141
		1142	0
		1143	});
		1144	}
		1145
		1146	0
902	});	1147	});
903		1148
904	$self->update_server_info;	1149	$self->update_server_info;
905		1150
906	$self->send_command ("output-sync $::CFG->{output_sync}");	1151	$self->send_command ("output-sync $::CFG->{output_sync}");
907	$self->send_command ("output-count $::CFG->{output_count}");	1152	$self->send_command ("output-count $::CFG->{output_count}");
		1153	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908	$self->send_command ("pickup $::CFG->{pickup}");	1154	$self->send_command ("pickup $::CFG->{pickup}");
909	}	1155	}
910		1156
911	sub lookat {	1157	sub lookat {
912	my ($self, $x, $y) = @_;	1158	my ($self, $x, $y) = @_;
913		1159
914	if ($self->{cfplus_ext}) {	1160	if ($self->{cfplus_ext}) {
915	$self->send_ext_req (lookat => "$x $y", sub {	1161	$self->send_ext_req (lookat => $x, $y, sub {
916	my %res = split /\x00/, $_[0];	1162	my (%msg) = @_;
917		1163
918	if (exists $res{npc_dialog}) {	1164	if (exists $msg{npc_dialog}) {
919	# start npc chat dialog	1165	# start npc chat dialog
920	$self->{npc_dialog} = new CFPlus::NPCDialog::	1166	$self->{npc_dialog} = new CFPlus::NPCDialog::
921	dx => $x,	1167	token => $msg{npc_dialog},
922	dy => $y,
923	title => "$res{npc_dialog} (NPC)",	1168	title => "$msg{npc_dialog}[0] (NPC)",
924	conn => $self,	1169	conn => $self,
925	;	1170	;
926	}	1171	}
927	});	1172	});
928	}	1173	}
…		…
931	}	1176	}
932		1177
933	sub destroy {	1178	sub destroy {
934	my ($self) = @_;	1179	my ($self) = @_;
935		1180
936	$self->{npc_dialog}->destroy	1181	(delete $self->{npc_dialog})->destroy
937	if $self->{npc_dialog};	1182	if $self->{npc_dialog};
938		1183
939	$self->SUPER::destroy;	1184	$self->SUPER::destroy;
		1185
		1186	%$self = ();
940	}	1187	}
941		1188
942	package CFPlus::NPCDialog;	1189	package CFPlus::NPCDialog;
943		1190
944	our @ISA = 'CFPlus::UI::FancyFrame';	1191	our @ISA = 'CFPlus::UI::Toplevel';
945		1192
946	sub new {	1193	sub new {
947	my $class = shift;	1194	my $class = shift;
948		1195
949	my $self = $class->SUPER::new (	1196	my $self = $class->SUPER::new (
…		…
956	kw => { hi => 0, yes => 0, no => 0 },	1203	kw => { hi => 0, yes => 0, no => 0 },
957	has_close_button => 1,	1204	has_close_button => 1,
958	@_,	1205	@_,
959	);	1206	);
960		1207
961	Scalar::Util::weaken (my $this = $self);	1208	CFPlus::weaken (my $this = $self);
962		1209
963	$self->connect (delete => sub { $this->destroy; 1 });	1210	$self->connect (delete => sub { $this->destroy; 1 });
964		1211
965	# better use a pane...	1212	# better use a pane...
966	$self->add (my $hbox = new CFPlus::UI::HBox);	1213	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
968		1215
969	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1216	$hbox->add (my $vbox = new CFPlus::UI::VBox);
970		1217
971	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1218	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1219	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
973	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1220	tooltip => "#npc_message_entry",
974	. "Sometimes you have to tell an NPC something you cannot find out during "
975	. "a normal conversation (such as a password). In those cases you have to use "
976	. "this text entry. You can also enter responses manually instead of using the response "
977	. "buttons below.",
978	on_activate => sub {	1221	on_activate => sub {
979	my ($entry, $text) = @_;	1222	my ($entry, $text) = @_;
980		1223
981	return unless $text =~ /\S/;	1224	return unless $text =~ /\S/;
982		1225
…		…
995	on_activate => sub { $this->destroy; 1 },	1238	on_activate => sub { $this->destroy; 1 },
996	;	1239	;
997		1240
998	$self->update_options;	1241	$self->update_options;
999		1242
1000	$self->{token} = $self->{conn}->ext_token;	1243	$self->{id} = "npc-channel-" . $self->{conn}->token;
1001	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1244	$self->{conn}->connect_ext ($self->{id} => sub {
1002	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1245	$this->feed (@_) if $this;
		1246	});
		1247
		1248	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1003		1249
1004	$self->{entry}->grab_focus;	1250	$self->{entry}->grab_focus;
1005		1251
1006	$self->{textview}->add_paragraph ({	1252	$self->{textview}->add_paragraph ({
1007	fg => [1, 1, 0, 1],	1253	fg => [1, 1, 0, 1],
…		…
1013	};	1259	};
1014		1260
1015	sub update_options {	1261	sub update_options {
1016	my ($self) = @_;	1262	my ($self) = @_;
1017		1263
1018	Scalar::Util::weaken $self;	1264	CFPlus::weaken $self;
1019		1265
1020	$self->{options}->clear;	1266	$self->{options}->clear;
1021	$self->{options}->add ($self->{bye_button});	1267	$self->{options}->add ($self->{bye_button});
1022		1268
1023	for my $kw (sort keys %{ $self->{kw} }) {	1269	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1030	);	1276	);
1031	}	1277	}
1032	}	1278	}
1033		1279
1034	sub feed {	1280	sub feed {
1035	my ($self, $data) = @_;	1281	my ($self, $type, @arg) = @_;
1036		1282
1037	Scalar::Util::weaken $self;	1283	CFPlus::weaken $self;
1038		1284
1039	my ($type, $msg) = split / /, $data, 2;
1040
1041	if ($type eq "msg") {	1285	if ($type eq "update") {
1042	my ($msg, @kw) = split /\x00/, $msg;	1286	my (%info) = @arg;
1043		1287
1044	utf8::decode $_ for ($msg, @kw);	1288	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
		1289	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1045		1290
1046	$self->{kw}{$_} = 1 for @kw;	1291	if (exists $info{msg}) {
1047		1292	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1048	$msg = "\n" . CFPlus::UI::asxml $msg;
1049	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1293	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050	my @link;	1294	my @link;
1051	$msg =~ s{	1295	$text =~ s{
1052	($match)	1296	($match)
1053	}{	1297	}{
1054	my $kw = $1;	1298	my $kw = $1;
1055		1299
1056	push @link, new CFPlus::UI::Label	1300	push @link, new CFPlus::UI::Label
1057	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",	1301	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058	can_hover => 1,	1302	can_hover => 1,
1059	can_events => 1,	1303	can_events => 1,
1060	padding_x => 0,	1304	padding_x => 0,
1061	padding_y => 0,	1305	padding_y => 0,
1062	on_button_up => sub {	1306	on_button_up => sub {
1063	$self->send ($kw);	1307	$self->send ($kw);
1064	};	1308	};
1065		1309
1066	chr 0xfffc	1310	"\x{fffc}"
1067	}giex;	1311	}giex;
1068		1312
1069	$self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });	1313	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070	$self->{textview}->scroll_to_bottom;	1314	$self->{textview}->scroll_to_bottom;
		1315	}
		1316
1071	$self->update_options;	1317	$self->update_options;
1072	} else {	1318	} else {
1073	$self->destroy;	1319	$self->destroy;
1074	}	1320	}
1075		1321
…		…
1080	my ($self, $msg) = @_;	1326	my ($self, $msg) = @_;
1081		1327
1082	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1328	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083	$self->{textview}->scroll_to_bottom;	1329	$self->{textview}->scroll_to_bottom;
1084		1330
1085	utf8::encode $msg;
1086	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1331	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1087	}	1332	}
1088		1333
1089	sub destroy {	1334	sub destroy {
1090	my ($self) = @_;	1335	my ($self) = @_;
1091		1336
1092	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1337	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093		1338
		1339	if ($self->{conn}) {
1094	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};	1340	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1095	delete $self->{conn}{npc_dialog};	1341	delete $self->{conn}{npc_dialog};
1096	$self->{conn}->disconnect_ext ($self->{token});	1342	$self->{conn}->disconnect_ext ($self->{id});
		1343	}
1097		1344
1098	$self->SUPER::destroy;	1345	$self->SUPER::destroy;
1099	}	1346	}
1100		1347
1101	1	1348	1
		1349

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.145 by root, Mon Aug 6 02:11:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11:45 2007 UTC