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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC vs. Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.148 by root, Fri Aug 10 04:02:13 2007 UTC