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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.82 by root, Sat Aug 19 02:53:48 2006 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 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 (@_, setup_req => { extmap => 1 });	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
38	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
39	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
40		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 => {},
		94	};
		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	});
		204
41	$self->{map_widget}->add_command (@$_)	205	$self->{map_widget}->add_command (@$_)
42	for @cmd_help;	206	for @cmd_help;
43		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	{
44	$self->{noface} = new_from_file CFPlus::Texture	215	$self->{noface} = my $tex = new_from_file CFPlus::Texture
45	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	}
46		219
47	$self->{open_container} = 0;	220	$self->{open_container} = 0;
48		221
49	# "global"
50	$self->{tilecache} = CFPlus::db_table "tilecache"
51	or die "tilecache: unable to open database table";
52	$self->{facemap} = CFPlus::db_table "facemap"
53	or die "facemap: unable to open database table";
54
55	# per server	222	# per server
56	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
57	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
58		224
59	$self	225	$self
60	}	226	}
61		227
62	sub logprint {	228	sub logprint {
…		…
219	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	385	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
220	$::GAUGES->{food} ->set_value ($fo, $fo_m);	386	$::GAUGES->{food} ->set_value ($fo, $fo_m);
221	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	387	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
222	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	388	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	389	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224	my $rng = $stats->{+CS_STAT_RANGE};	390	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
225	$rng =~ s/^Range: //; # thank you so much dear server
226	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
227	my $title = $stats->{+CS_STAT_TITLE};	391	my $title = $stats->{+CS_STAT_TITLE};
228	$title =~ s/^Player: //;	392	$title =~ s/^Player: //;
229	$::STATWIDS->{title} ->set_text ("Title: " . $title);	393	$::STATWIDS->{title} ->set_text ("Title: " . $title);
230		394
231	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	395	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
251	my @skills = keys %{ $self->{skill_info} };	415	my @skills = keys %{ $self->{skill_info} };
252		416
253	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	417	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254	$sktbl->clear;	418	$sktbl->clear;
255		419
		420	my @add;
		421
		422	push @add,
256	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	423	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	424	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	425	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
259	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	426	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	427	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	428	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		429	;
262		430
263	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	431	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
264		432
265	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	433	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
266	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	434	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
280	if ($ev->{button} == 1) {	448	if ($ev->{button} == 1) {
281	$::CONN->user_send ("ready_skill $name");	449	$::CONN->user_send ("ready_skill $name");
282	} elsif ($ev->{button} == 2) {	450	} elsif ($ev->{button} == 2) {
283	$::CONN->user_send ("use_skill $name");	451	$::CONN->user_send ("use_skill $name");
284	} elsif ($ev->{button} == 3) {	452	} elsif ($ev->{button} == 3) {
		453	my $shortname = CFPlus::shorten $name, 14;
285	(new CFPlus::UI::Menu	454	(new CFPlus::UI::Menu
286	items => [	455	items => [
287	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	456	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
288	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	457	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
289	],	458	],
290	)->popup ($ev);	459	)->popup ($ev);
291	} else {	460	} else {
292	return 0;	461	return 0;
293	}	462	}
294		463
295	1	464	1
296	};	465	};
297		466
		467	push @add,
298	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	468	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
299	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	469	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
300	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	470	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
301	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	471	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
302	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	472	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
303	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	473	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		474	;
304		475
305	$x++ and ($x, $y) = (0, $y + 1);	476	$x++ and ($x, $y) = (0, $y + 1);
306	}	477	}
		478
		479	$sktbl->add_at (@add);
307	}	480	}
308		481
309	for (grep exists $stats->{$_}, @skills) {	482	for (grep exists $stats->{$_}, @skills) {
310	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	483	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	484	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312	}	485	}
313	}	486	}
314		487
		488	sub macro_send {
		489	my ($self, $macro) = @_;
		490
		491	for my $cmd (@{ $macro->{action} }) {
		492	$self->send_command ($cmd);
		493	}
		494	}
		495
315	sub user_send {	496	sub user_send {
316	my ($self, $command) = @_;	497	my ($self, $command) = @_;
317		498
		499	$self->{record}->($command)
318	if ($self->{record}) {	500	if $self->{record};
319	push @{$self->{record}}, $command;
320	}
321		501
322	$self->logprint ("send: ", $command);	502	$self->logprint ("send: ", $command);
323	$self->send_command ($command);	503	$self->send_command ($command);
324	::status ($command);	504	::status ($command);
325	}	505	}
326		506
327	sub start_record {	507	sub record {
328	my ($self) = @_;	508	my ($self, $cb) = @_;
329		509
330	$self->{record} = [];	510	$self->{record} = $cb;
331	}
332
333	sub stop_record {
334	my ($self) = @_;
335	return delete $self->{record};
336	}	511	}
337		512
338	sub map_scroll {	513	sub map_scroll {
339	my ($self, $dx, $dy) = @_;	514	my ($self, $dx, $dy) = @_;
340		515
…		…
361	or return;	536	or return;
362		537
363	my ($hash, $x, $y, $w, $h) = @$map_info;	538	my ($hash, $x, $y, $w, $h) = @$map_info;
364		539
365	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	540	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	541	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	542	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368	}	543	}
369		544
370	sub map_clear {	545	sub map_clear {
371	my ($self) = @_;	546	my ($self) = @_;
…		…
375		550
376	$self->{map}->clear;	551	$self->{map}->clear;
377	delete $self->{map_widget}{magicmap};	552	delete $self->{map_widget}{magicmap};
378	}	553	}
379		554
		555	sub bg_fetch {
		556	my ($self) = @_;
		557
		558	my $id;
		559
		560	do {
		561	$id = pop @{$self->{bg_fetch}}
		562	or return;
		563	} while $self->{texture}[$id];
		564
		565	CFPlus::DB::get tilecache => $id, sub {
		566	my ($data) = @_;
		567
		568	return unless $self->{map}; # stop when destroyed
		569
		570	$self->set_texture ($id => $data)
		571	if defined $data;
		572
		573	$self->bg_fetch;
		574	};
		575	}
380		576
381	sub load_map($$$) {	577	sub load_map($$$) {
382	my ($self, $hash, $x, $y) = @_;	578	my ($self, $hash, $x, $y) = @_;
383		579
384	if (defined (my $data = $self->{mapcache}->get ($hash))) {	580	my $gen = $self->{map_change_gen};
		581
		582	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		583	return unless $gen == $self->{map_change_gen};
		584
		585	my ($data) = @_;
		586
		587	if (defined $data) {
385	$data = Compress::LZF::decompress $data;	588	$data = Compress::LZF::decompress $data;
386	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	589	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
387	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388	my $data = $self->{tilecache}->get ($id)
389	or next;
390		590
391	$self->set_texture ($id => $data);	591	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		592	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		593	$self->bg_fetch unless $inprogress;
392	}	594	}
393	}	595	};
394	}	596	}
395		597
396	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	598	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397	# (server resource,s latency, bandwidth), so this hack is warranted.	599	# (server resource,s latency, bandwidth), so this hack is warranted.
398	# the right fix is to make real tiled maps with an overview file	600	# the right fix is to make real tiled maps with an overview file
…		…
462		664
463	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	665	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	666	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465		667
466	} else {	668	} else {
		669	my $gen = $self->{map_change_gen};
467	$self->send_mapinfo ("spatial $path$tile", sub {	670	$self->send_mapinfo ("spatial $path$tile", sub {
		671	return unless $gen == $self->{map_change_gen};
		672
468	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	673	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469		674
470	return if $mode ne "spatial";	675	return if $mode ne "spatial";
471		676
472	$x += $self->{map}->ox;	677	$x += $self->{map}->ox;
…		…
486		691
487	sub map_change {	692	sub map_change {
488	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	693	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489		694
490	$self->flush_map;	695	$self->flush_map;
		696
		697	++$self->{map_change_gen};
491		698
492	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	699	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493		700
494	my $mapmapw = $self->{mapmap}->{w};	701	my $mapmapw = $self->{mapmap}->{w};
495	my $mapmaph = $self->{mapmap}->{h};	702	my $mapmaph = $self->{mapmap}->{h};
…		…
512	$self->load_map ($hash, $x, $y);	719	$self->load_map ($hash, $x, $y);
513	$self->flood_fill (0, 0, 0, "", $hash, $flags);	720	$self->flood_fill (0, 0, 0, "", $hash, $flags);
514	}	721	}
515		722
516	sub face_find {	723	sub face_find {
517	my ($self, $facenum, $face) = @_;	724	my ($self, $facenum, $face, $cb) = @_;
518		725
519	my $hash = "$face->{chksum},$face->{name}";	726	if ($face->{type} == 0) { # FT_FACE
		727	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
520		728
521	my $id = $self->{facemap}->get ($hash);	729	$face->{id} = $id;
522
523	unless ($id) {
524	# create new id for face
525	# I love transactions
526	for (1..100) {
527	my $txn = $CFPlus::DB_ENV->txn_begin;
528	my $status = $self->{facemap}->db_get (id => $id);
529	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
530	$id = ($id \|\| 64) + 1;
531	if ($self->{facemap}->put (id => $id) == 0
532	&& $self->{facemap}->put ($hash => $id) == 0) {
533	$txn->txn_commit;
534
535	goto gotid;
536	}
537	}
538	$txn->txn_abort;
539	}
540
541	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
542	}
543
544	gotid:
545	$face->{id} = $id;
546	$self->{map}->set_face ($facenum => $id);
547	$self->{faceid}[$facenum] = $id;#d#	730	$self->{faceid}[$facenum] = $id;
548		731
549	my $face = $self->{tilecache}->get ($id);	732	$self->{map}->set_tileid ($facenum => $id);
550		733
551	if ($face) {	734	CFPlus::DB::get tilecache => $id, $cb;
552	#$self->face_prefetch;	735
553	$face	736	} elsif ($face->{type} & 1) { # with metadata
554	} else {	737	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
555	my $tex = $self->{noface};	738	CFPlus::DB::get res_meta => $face->{name}, $cb;
556	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
557	undef
558	};	739	}
559	}	740	}
560		741
561	sub face_update {	742	sub face_update {
562	my ($self, $facenum, $face, $changed) = @_;	743	my ($self, $facenum, $face, $changed) = @_;
563		744
564	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	745	if ($face->{type} == 0) { # FT_FACE
		746	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		747	if $changed;
565		748
566	$self->set_texture ($face->{id} => delete $face->{image});	749	$self->set_texture ($face->{id} => delete $face->{data});
		750
		751	} elsif ($face->{type} & 1) { # split metadata
		752	my $cb = sub { };
		753
		754	if ($face->{type} == 3) { # FT_MUSIC
		755	$cb = sub {
		756	$self->{music_meta}{$facenum} = $face;
		757
		758	::message ({ markup => "downloaded song #$facenum" })
		759	if $changed;
		760
		761	&::audio_music_push ($facenum);
		762	};
		763	} elsif ($face->{type} == 5) { # FT_SOUND
		764	$cb = sub {
		765	$self->{sound_meta}{$facenum} = $face;
		766
		767	::message ({ markup => "downloaded sound #$facenum" })
		768	if $changed;
		769
		770	&::audio_sound_push ($facenum);
		771	};
		772	}
		773
		774	if ($changed) { # new data
		775	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		776
		777	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		778	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
		779	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		780	::add_license ($face);
		781	$cb->();
		782	};
		783
		784	} else {
		785	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		786	::add_license ($face);
		787	$cb->();
		788	}
		789	}
		790	}
		791
		792	sub smooth_update {
		793	my ($self, $facenum, $face) = @_;
		794
		795	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
567	}	796	}
568		797
569	sub set_texture {	798	sub set_texture {
570	my ($self, $id, $data) = @_;	799	my ($self, $id, $data) = @_;
571		800
		801	return unless $self->{map};
		802
572	$self->{texture}[$id] \|\|= do {	803	$self->{texture}[$id] = my $tex =
573	my $tex =
574	new_from_image CFPlus::Texture	804	new_from_image CFPlus::Texture
575	$data, minify => 1, mipmap => 1;	805	$data, minify => 1, mipmap => 1;
576		806
577	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	807	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
578	$self->{map_widget}->update;	808	$self->{map_widget}->update;
579		809
580	$tex	810	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
		811	}
		812
		813	sub connect_face_update {
		814	my ($self, $id, $cb) = @_;
		815
		816	push @{$self->{face_cb}{$id}}, $cb;
		817
		818	CFPlus::guard {
		819	@{$self->{face_cb}{$id}}
		820	= grep $_ != $cb,
		821	@{$self->{face_cb}{$id}};
581	};	822	}
582	}	823	}
583		824
584	sub sound_play {	825	sub sound_play {
585	my ($self, $x, $y, $soundnum, $type) = @_;	826	my ($self, $type, $face, $dx, $dy, $vol) = @_;
586		827
587	$self->{sound_play}->($x, $y, $soundnum, $type);	828	&::audio_sound_play ($face, $dx, $dy, $vol)
		829	unless $type & 1; # odd types are silent for future expansion
588	}	830	}
589		831
590	my $LAST_QUERY; # server is stupid, stupid, stupid	832	my $LAST_QUERY; # server is stupid, stupid, stupid
591		833
592	sub query {	834	sub query {
…		…
596	$LAST_QUERY = $prompt;	838	$LAST_QUERY = $prompt;
597		839
598	$self->{query}-> ($self, $flags, $prompt);	840	$self->{query}-> ($self, $flags, $prompt);
599	}	841	}
600		842
601	sub drawinfo {	843	sub sanitise_xml($) {
602	my ($self, $color, $text) = @_;	844	local $_ = shift;
603		845
604	my @color = (	846	# we now weed out all tags we do not support
		847	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		848	# now all entities
		849	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		850
		851	# handle some elements
		852	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		853	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		854
		855	$_
		856	}
		857
		858	our %NAME_TO_COLOR = (
		859	black => 0,
		860	white => 1,
		861	darkblue => 2,
		862	red => 3,
		863	orange => 4,
		864	lightblue => 5,
		865	darkorange => 6,
		866	green => 7,
		867	darkgreen => 8,
		868	grey => 9,
		869	brown => 10,
		870	yellow => 11,
		871	tan => 12,
		872	);
		873
		874	our @CF_COLOR = (
605	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	875	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
606	[1.00, 1.00, 1.00],	876	[1.00, 1.00, 1.00],
607	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	877	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
608	[1.00, 0.00, 0.00],	878	[1.00, 0.00, 0.00],
609	[1.00, 0.54, 0.00],	879	[1.00, 0.54, 0.00],
610	[0.11, 0.56, 1.00],	880	[0.11, 0.56, 1.00],
611	[0.93, 0.46, 0.00],	881	[0.93, 0.46, 0.00],
612	[0.18, 0.54, 0.34],	882	[0.18, 0.54, 0.34],
613	[0.56, 0.73, 0.56],	883	[0.56, 0.73, 0.56],
614	[0.80, 0.80, 0.80],	884	[0.80, 0.80, 0.80],
615	[0.75, 0.61, 0.20],	885	[0.75, 0.61, 0.20],
616	[0.99, 0.77, 0.26],	886	[0.99, 0.77, 0.26],
617	[0.74, 0.65, 0.41],	887	[0.74, 0.65, 0.41],
618	);	888	);
619		889
		890	sub msg {
		891	my ($self, $color, $type, $text, @extra) = @_;
		892
		893	$text = sanitise_xml $text;
		894
		895	if (my $cb = $self->{cb_msg}{$type}) {
		896	$_->($self, $color, $type, $text, @extra) for values %$cb;
		897	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		898	$type =~ s/-/_/g;
		899	$self->{$type} = $text;
		900	} else {
620	$self->logprint ("info: ", $text);	901	$self->logprint ("msg: ", $text);
		902	return if $color < 0; # negative color == ignore if not understood
621		903
622	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	904	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
623		905
624	# try to create single paragraphs of multiple lines sent by the server	906	## try to create single paragraphs of multiple lines sent by the server
		907	# no longer neecssary with TRT servers
625	$text =~ s/(?<=\S)\n(?=\w)/ /g;	908	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
626		909
627	$text = CFPlus::asxml $text;	910	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
628	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	911	for split /\n/, $text;
629	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630		912
631	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
632	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
633	$self->{logview}->scroll_to_bottom;
634
635	$self->{statusbox}->add ($text,	913	$self->{statusbox}->add ($text,
636	group => $text,	914	group => $text,
637	fg => $color[$color],	915	fg => $fg,
638	timeout => $color >= 2 ? 180 : 10,	916	timeout => $color >= 2 ? 180 : 10,
639	tooltip_font => $::FONT_FIXED,	917	tooltip_font => $::FONT_FIXED,
640	);	918	);
641	}	919	}
642
643	sub drawextinfo {
644	my ($self, $color, $type, $subtype, $message) = @_;
645
646	$self->drawinfo ($color, $message);
647	}	920	}
648		921
649	sub spell_add {	922	sub spell_add {
650	my ($self, $spell) = @_;	923	my ($self, $spell) = @_;
651		924
652	# try to create single paragraphs out of the multiple lines sent by the server	925	# try to create single paragraphs out of the multiple lines sent by the server
653	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	926	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654	$spell->{message} =~ s/\n+$//;	927	$spell->{message} =~ s/\n+$//;
655	$spell->{message} \|\|= "Server did not provide a description for this spell.";	928	$spell->{message} \|\|= "Server did not provide a description for this spell.";
656		929
657	$::SPELL_PAGE->add_spell ($spell);	930	$::SPELL_LIST->add_spell ($spell);
658		931
659	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	932	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
660	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	933	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661	}	934	}
662		935
663	sub spell_delete {	936	sub spell_delete {
664	my ($self, $spell) = @_;	937	my ($self, $spell) = @_;
665		938
666	$::SPELL_PAGE->remove_spell ($spell);	939	$::SPELL_LIST->remove_spell ($spell);
		940	}
		941
		942	sub setup {
		943	my ($self, $setup) = @_;
		944
		945	$self->{map_widget}->set_tilesize ($self->{tilesize});
		946	$::MAP->resize ($self->{mapw}, $self->{maph});
667	}	947	}
668		948
669	sub addme_success {	949	sub addme_success {
670	my ($self) = @_;	950	my ($self) = @_;
671		951
…		…
692	$self->{map_widget}->clr_commands;	972	$self->{map_widget}->clr_commands;
693		973
694	::stop_game ();	974	::stop_game ();
695	}	975	}
696		976
697	sub image_info {
698	my ($self, $numfaces) = @_;
699
700	$self->{num_faces} = $numfaces;
701	$self->{face_prefetch} = [1 .. $numfaces];
702	$self->face_prefetch;
703	}
704
705	sub face_prefetch {
706	my ($self) = @_;
707
708	return unless $::CFG->{face_prefetch};
709
710	if ($self->{num_faces}) {
711	return if @{ $self->{send_queue} \|\| [] };
712	my $todo = @{ $self->{face_prefetch} }
713	or return;
714
715	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
716
717	$self->send ("requestinfo image_sums $face $face");
718
719	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
720	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
721	} elsif (!exists $self->{num_faces}) {
722	$self->send ("requestinfo image_info");
723
724	$self->{num_faces} = 0;
725
726	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
727	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
728	}
729	}
730
731	sub update_floorbox {	977	sub update_floorbox {
732	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	978	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
733	return unless $::CONN;	979	return unless $::CONN;
734		980
735	$::FLOORBOX->clear;	981	$::FLOORBOX->clear;
		982
		983	my @add;
736		984
737	my $row;	985	my $row;
738	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	986	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
739	if ($row < 6) {	987	if ($row < 6) {
740	local $_->{face_widget}; # hack to force recreation of widget	988	local $_->{face_widget}; # hack to force recreation of widget
741	local $_->{desc_widget}; # hack to force recreation of widget	989	local $_->{desc_widget}; # hack to force recreation of widget
742	CFPlus::Item::update_widgets $_;	990	CFPlus::Item::update_widgets $_;
743		991
		992	push @add,
744	$::FLOORBOX->add (0, $row, $_->{face_widget});	993	0, $row, $_->{face_widget},
745	$::FLOORBOX->add (1, $row, $_->{desc_widget});	994	1, $row, $_->{desc_widget};
746		995
747	$row++;	996	$row++;
748	} else {	997	} else {
749	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	998	push @add, 1, $row, new CFPlus::UI::Button
750	text => "More...",	999	text => "More...",
751	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1000	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
752	);	1001	;
753	last;	1002	last;
754	}	1003	}
755	}	1004	}
756	if ($::CONN->{open_container}) {	1005	if ($::CONN->{open_container}) {
757	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1006	push @add, 1, $row++, new CFPlus::UI::Button
758	text => "Close container",	1007	text => "Close container",
759	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1008	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760	);	1009	;
761	}	1010	}
		1011
		1012	$::FLOORBOX->add_at (@add);
762	});	1013	});
763		1014
764	$::WANT_REFRESH++;	1015	$::WANT_REFRESH++;
765	}	1016	}
766		1017
…		…
877	$::SERVER_INFO->set_markup (	1128	$::SERVER_INFO->set_markup (
878	"server <tt>$self->{host}:$self->{port}</tt>\n"	1129	"server <tt>$self->{host}:$self->{port}</tt>\n"
879	. "protocol version <tt>$self->{version}</tt>\n"	1130	. "protocol version <tt>$self->{version}</tt>\n"
880	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1131	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1132	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1133	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1134	. "editing support $yesno[!!$self->{editor_support}]\n"
882	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1135	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1136	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
883	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1137	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1138	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885	. "map size $self->{mapw}×$self->{maph}\n"	1139	. "map size $self->{mapw}×$self->{maph}\n"
886	);	1140	);
		1141
887	}	1142	}
888		1143
889	sub logged_in {	1144	sub logged_in {
890	my ($self) = @_;	1145	my ($self) = @_;
891		1146
892	$self->send_ext_req (cfplus_support => version => 1, sub {	1147	$self->send_ext_req (cfplus_support => version => 2, sub {
		1148	my (%msg) = @_;
		1149
893	$self->{cfplus_ext} = $_[0]{version};	1150	$self->{cfplus_ext} = $msg{version};
894	$self->update_server_info;	1151	$self->update_server_info;
		1152
		1153	if ($self->{cfplus_ext} >= 2) {
		1154	$self->send_ext_req ("editor_support", sub {
		1155	$self->{editor_support} = { @_ };
		1156	$self->update_server_info;
		1157
		1158	0
		1159	});
		1160	}
895		1161
896	0	1162	0
897	});	1163	});
898		1164
899	$self->update_server_info;	1165	$self->update_server_info;
900		1166
901	$self->send_command ("output-sync $::CFG->{output_sync}");	1167	$self->send_command ("output-sync $::CFG->{output_sync}");
902	$self->send_command ("output-count $::CFG->{output_count}");	1168	$self->send_command ("output-count $::CFG->{output_count}");
		1169	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
903	$self->send_command ("pickup $::CFG->{pickup}");	1170	$self->send_command ("pickup $::CFG->{pickup}");
904	}	1171	}
905		1172
906	sub lookat {	1173	sub lookat {
907	my ($self, $x, $y) = @_;	1174	my ($self, $x, $y) = @_;
908		1175
909	if ($self->{cfplus_ext}) {	1176	if ($self->{cfplus_ext}) {
910	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1177	$self->send_ext_req (lookat => $x, $y, sub {
911	my ($msg) = @_;	1178	my (%msg) = @_;
912		1179
913	if (exists $msg->{npc_dialog}) {	1180	if (exists $msg{npc_dialog}) {
914	# start npc chat dialog	1181	# start npc chat dialog
915	$self->{npc_dialog} = new CFPlus::NPCDialog::	1182	$self->{npc_dialog} = new CFPlus::NPCDialog::
916	dx => $x,	1183	token => $msg{npc_dialog},
917	dy => $y,
918	title => "$msg->{npc_dialog} (NPC)",	1184	title => "$msg{npc_dialog}[0] (NPC)",
919	conn => $self,	1185	conn => $self,
920	;	1186	;
921	}	1187	}
922	});	1188	});
923	}	1189	}
…		…
930		1196
931	(delete $self->{npc_dialog})->destroy	1197	(delete $self->{npc_dialog})->destroy
932	if $self->{npc_dialog};	1198	if $self->{npc_dialog};
933		1199
934	$self->SUPER::destroy;	1200	$self->SUPER::destroy;
		1201
		1202	%$self = ();
935	}	1203	}
936		1204
937	package CFPlus::NPCDialog;	1205	package CFPlus::NPCDialog;
938		1206
939	our @ISA = 'CFPlus::UI::Toplevel';	1207	our @ISA = 'CFPlus::UI::Toplevel';
…		…
951	kw => { hi => 0, yes => 0, no => 0 },	1219	kw => { hi => 0, yes => 0, no => 0 },
952	has_close_button => 1,	1220	has_close_button => 1,
953	@_,	1221	@_,
954	);	1222	);
955		1223
956	Scalar::Util::weaken (my $this = $self);	1224	CFPlus::weaken (my $this = $self);
957		1225
958	$self->connect (delete => sub { $this->destroy; 1 });	1226	$self->connect (delete => sub { $this->destroy; 1 });
959		1227
960	# better use a pane...	1228	# better use a pane...
961	$self->add (my $hbox = new CFPlus::UI::HBox);	1229	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
986	on_activate => sub { $this->destroy; 1 },	1254	on_activate => sub { $this->destroy; 1 },
987	;	1255	;
988		1256
989	$self->update_options;	1257	$self->update_options;
990		1258
991	$self->{id} = $self->{conn}->send_ext_req (	1259	$self->{id} = "npc-channel-" . $self->{conn}->token;
992	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1260	$self->{conn}->connect_ext ($self->{id} => sub {
993	sub { $this && $this->feed (@_) }	1261	$this->feed (@_) if $this;
994	);	1262	});
		1263
		1264	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
995		1265
996	$self->{entry}->grab_focus;	1266	$self->{entry}->grab_focus;
997		1267
998	$self->{textview}->add_paragraph ({	1268	$self->{textview}->add_paragraph ({
999	fg => [1, 1, 0, 1],	1269	fg => [1, 1, 0, 1],
…		…
1005	};	1275	};
1006		1276
1007	sub update_options {	1277	sub update_options {
1008	my ($self) = @_;	1278	my ($self) = @_;
1009		1279
1010	Scalar::Util::weaken $self;	1280	CFPlus::weaken $self;
1011		1281
1012	$self->{options}->clear;	1282	$self->{options}->clear;
1013	$self->{options}->add ($self->{bye_button});	1283	$self->{options}->add ($self->{bye_button});
1014		1284
1015	for my $kw (sort keys %{ $self->{kw} }) {	1285	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1022	);	1292	);
1023	}	1293	}
1024	}	1294	}
1025		1295
1026	sub feed {	1296	sub feed {
1027	my ($self, $msg) = @_;	1297	my ($self, $type, @arg) = @_;
1028		1298
1029	Scalar::Util::weaken $self;	1299	CFPlus::weaken $self;
1030		1300
1031	if ($msg->{msgtype} eq "reply") {	1301	if ($type eq "update") {
		1302	my (%info) = @arg;
		1303
1032	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1304	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1033	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1305	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1034
1035	my $text = "\n" . CFPlus::asxml $msg->{msg};
1036	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1037	my @link;
1038	$text =~ s{
1039	($match)
1040	}{
1041	my $kw = $1;
1042
1043	push @link, new CFPlus::UI::Label
1044	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1045	can_hover => 1,
1046	can_events => 1,
1047	padding_x => 0,
1048	padding_y => 0,
1049	on_button_up => sub {
1050	$self->send ($kw);
1051	};
1052
1053	"\x{fffc}"
1054	}giex;
1055		1306
		1307	if (exists $info{msg}) {
		1308	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1309	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1310	my @link;
		1311	$text =~ s{
		1312	($match)
		1313	}{
		1314	my $kw = $1;
		1315
		1316	push @link, new CFPlus::UI::Label
		1317	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1318	can_hover => 1,
		1319	can_events => 1,
		1320	padding_x => 0,
		1321	padding_y => 0,
		1322	on_button_up => sub {
		1323	$self->send ($kw);
		1324	};
		1325
		1326	"\x{fffc}"
		1327	}giex;
		1328
1056	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1329	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1057	$self->{textview}->scroll_to_bottom;	1330	$self->{textview}->scroll_to_bottom;
		1331	}
		1332
1058	$self->update_options;	1333	$self->update_options;
1059	} else {	1334	} else {
1060	$self->destroy;	1335	$self->destroy;
1061	}	1336	}
1062		1337
…		…
1067	my ($self, $msg) = @_;	1342	my ($self, $msg) = @_;
1068		1343
1069	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1344	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1070	$self->{textview}->scroll_to_bottom;	1345	$self->{textview}->scroll_to_bottom;
1071		1346
1072	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1347	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1073	}	1348	}
1074		1349
1075	sub destroy {	1350	sub destroy {
1076	my ($self) = @_;	1351	my ($self) = @_;
1077		1352
1078	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1353	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1079		1354
1080	if ($self->{conn}) {	1355	if ($self->{conn}) {
1081	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1356	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1082	delete $self->{conn}{npc_dialog};	1357	delete $self->{conn}{npc_dialog};
1083	$self->{conn}->disconnect_ext ($self->{id});	1358	$self->{conn}->disconnect_ext ($self->{id});
1084	}	1359	}
1085		1360
1086	$self->SUPER::destroy;	1361	$self->SUPER::destroy;
1087	}	1362	}
1088		1363
1089	1	1364	1
		1365

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.82 by root, Sat Aug 19 02:53:48 2006 UTC vs. Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.82 by root, Sat Aug 19 02:53:48 2006 UTC vs.
Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC