[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.146 by root, Mon Aug 6 05:06:33 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 {
63	my ($self, @a) = @_;	229	my ($self, @a) = @_;
64		230
65	$self->{log_fh} \|\|= do {	231	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
66	my $path = "$Crossfire::VARDIR/log.$self->{host}";
67
68	open my $fh, ">>:utf8", $path
69	or die "Couldn't open logfile $path: $!";
70
71	$fh->autoflush (1);
72
73	$fh;
74	};
75
76	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
77
78	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
79	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
80
81	print {$self->{log_fh}} "$ts ", @a, "\n";
82	}	232	}
83		233
84	sub _stat_numdiff {	234	sub _stat_numdiff {
85	my ($self, $name, $old, $new) = @_;	235	my ($self, $name, $old, $new) = @_;
86		236
…		…
219	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	369	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
220	$::GAUGES->{food} ->set_value ($fo, $fo_m);	370	$::GAUGES->{food} ->set_value ($fo, $fo_m);
221	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	371	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
222	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	372	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	373	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224	my $rng = $stats->{+CS_STAT_RANGE};	374	$::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};	375	my $title = $stats->{+CS_STAT_TITLE};
228	$title =~ s/^Player: //;	376	$title =~ s/^Player: //;
229	$::STATWIDS->{title} ->set_text ("Title: " . $title);	377	$::STATWIDS->{title} ->set_text ("Title: " . $title);
230		378
231	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	379	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
251	my @skills = keys %{ $self->{skill_info} };	399	my @skills = keys %{ $self->{skill_info} };
252		400
253	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	401	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254	$sktbl->clear;	402	$sktbl->clear;
255		403
		404	my @add;
		405
		406	push @add,
256	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	407	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	408	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	409	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
259	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	410	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	411	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	412	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		413	;
262		414
263	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>";
264		416
265	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);
266	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);
…		…
280	if ($ev->{button} == 1) {	432	if ($ev->{button} == 1) {
281	$::CONN->user_send ("ready_skill $name");	433	$::CONN->user_send ("ready_skill $name");
282	} elsif ($ev->{button} == 2) {	434	} elsif ($ev->{button} == 2) {
283	$::CONN->user_send ("use_skill $name");	435	$::CONN->user_send ("use_skill $name");
284	} elsif ($ev->{button} == 3) {	436	} elsif ($ev->{button} == 3) {
		437	my $shortname = CFPlus::shorten $name, 14;
285	(new CFPlus::UI::Menu	438	(new CFPlus::UI::Menu
286	items => [	439	items => [
287	["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"] }],
288	["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"] }],
289	],	442	],
290	)->popup ($ev);	443	)->popup ($ev);
291	} else {	444	} else {
292	return 0;	445	return 0;
293	}	446	}
294		447
295	1	448	1
296	};	449	};
297		450
		451	push @add,
298	$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
299	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),
300	$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
301	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),
302	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	456	$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);	457	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		458	;
304		459
305	$x++ and ($x, $y) = (0, $y + 1);	460	$x++ and ($x, $y) = (0, $y + 1);
306	}	461	}
		462
		463	$sktbl->add_at (@add);
307	}	464	}
308		465
309	for (grep exists $stats->{$_}, @skills) {	466	for (grep exists $stats->{$_}, @skills) {
310	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	467	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	468	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312	}	469	}
313	}	470	}
314		471
		472	sub macro_send {
		473	my ($self, $macro) = @_;
		474
		475	for my $cmd (@{ $macro->{action} }) {
		476	$self->send_command ($cmd);
		477	}
		478	}
		479
315	sub user_send {	480	sub user_send {
316	my ($self, $command) = @_;	481	my ($self, $command) = @_;
317		482
		483	$self->{record}->($command)
318	if ($self->{record}) {	484	if $self->{record};
319	push @{$self->{record}}, $command;
320	}
321		485
322	$self->logprint ("send: ", $command);	486	$self->logprint ("send: ", $command);
323	$self->send_command ($command);	487	$self->send_command ($command);
324	::status ($command);	488	::status ($command);
325	}	489	}
326		490
327	sub start_record {	491	sub record {
328	my ($self) = @_;	492	my ($self, $cb) = @_;
329		493
330	$self->{record} = [];	494	$self->{record} = $cb;
331	}
332
333	sub stop_record {
334	my ($self) = @_;
335	return delete $self->{record};
336	}	495	}
337		496
338	sub map_scroll {	497	sub map_scroll {
339	my ($self, $dx, $dy) = @_;	498	my ($self, $dx, $dy) = @_;
340		499
…		…
361	or return;	520	or return;
362		521
363	my ($hash, $x, $y, $w, $h) = @$map_info;	522	my ($hash, $x, $y, $w, $h) = @$map_info;
364		523
365	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	524	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	525	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	526	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368	}	527	}
369		528
370	sub map_clear {	529	sub map_clear {
371	my ($self) = @_;	530	my ($self) = @_;
…		…
375		534
376	$self->{map}->clear;	535	$self->{map}->clear;
377	delete $self->{map_widget}{magicmap};	536	delete $self->{map_widget}{magicmap};
378	}	537	}
379		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::exists tilecache => $id, sub {
		550	my ($exists) = @_;
		551
		552	return unless $self->{map}; # stop when destroyed
		553
		554	$self->have_tile ($id)
		555	if $exists;
		556
		557	$self->bg_fetch;
		558	};
		559	}
380		560
381	sub load_map($$$) {	561	sub load_map($$$) {
382	my ($self, $hash, $x, $y) = @_;	562	my ($self, $hash, $x, $y) = @_;
383		563
384	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) {
385	$data = Compress::LZF::decompress $data;	572	$data = Compress::LZF::decompress $data;
386	#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#
387	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388	my $data = $self->{tilecache}->get ($id)
389	or next;
390		574
391	$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;
392	}	578	}
393	}	579	};
394	}	580	}
395		581
396	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	582	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397	# (server resource,s latency, bandwidth), so this hack is warranted.	583	# (server resource,s latency, bandwidth), so this hack is warranted.
398	# 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
…		…
462		648
463	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	649	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	650	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465		651
466	} else {	652	} else {
		653	my $gen = $self->{map_change_gen};
467	$self->send_mapinfo ("spatial $path$tile", sub {	654	$self->send_mapinfo ("spatial $path$tile", sub {
		655	return unless $gen == $self->{map_change_gen};
		656
468	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	657	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469		658
470	return if $mode ne "spatial";	659	return if $mode ne "spatial";
471		660
472	$x += $self->{map}->ox;	661	$x += $self->{map}->ox;
…		…
486		675
487	sub map_change {	676	sub map_change {
488	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	677	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489		678
490	$self->flush_map;	679	$self->flush_map;
		680
		681	++$self->{map_change_gen};
491		682
492	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	683	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493		684
494	my $mapmapw = $self->{mapmap}->{w};	685	my $mapmapw = $self->{mapmap}->{w};
495	my $mapmaph = $self->{mapmap}->{h};	686	my $mapmaph = $self->{mapmap}->{h};
…		…
512	$self->load_map ($hash, $x, $y);	703	$self->load_map ($hash, $x, $y);
513	$self->flood_fill (0, 0, 0, "", $hash, $flags);	704	$self->flood_fill (0, 0, 0, "", $hash, $flags);
514	}	705	}
515		706
516	sub face_find {	707	sub face_find {
517	my ($self, $facenum, $face) = @_;	708	my ($self, $facenum, $face, $cb) = @_;
518		709
519	my $hash = "$face->{chksum},$face->{name}";	710	if ($face->{type} == 0) { # FT_FACE
		711	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
520		712
521	my $id = $self->{facemap}->get ($hash);	713	$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#	714	$self->{faceid}[$facenum] = $id;
548		715
549	my $face = $self->{tilecache}->get ($id);	716	$self->{map}->set_tileid ($facenum => $id);
550		717
551	if ($face) {	718	CFPlus::DB::get tilecache => $id, $cb;
552	#$self->face_prefetch;	719
553	$face	720	} elsif ($face->{type} & 1) { # with metadata
554	} else {	721	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
555	my $tex = $self->{noface};	722	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	};	723	}
559	}	724	}
560		725
561	sub face_update {	726	sub face_update {
562	my ($self, $facenum, $face, $changed) = @_;	727	my ($self, $facenum, $face, $changed) = @_;
563		728
564	$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;
565		732
566	$self->set_texture ($face->{id} => delete $face->{image});	733	$self->have_tile ($face->{id});
567	}
568		734
569	sub set_texture {	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});
		780	}
		781
		782	sub have_tile {
		783	my ($self, $tile) = @_;
		784
		785	return unless $self->{map};
		786
		787	$self->{texture}[$tile] \|\|= my $tex =
		788	new CFPlus::Texture
		789	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		790
		791	$_->() for @{(delete $self->{face_cb}{$tile}) \|\| []};
		792	}
		793
		794	sub connect_face_update {
570	my ($self, $id, $data) = @_;	795	my ($self, $id, $cb) = @_;
571		796
572	$self->{texture}[$id] \|\|= do {	797	push @{$self->{face_cb}{$id}}, $cb;
573	my $tex =
574	new_from_image CFPlus::Texture
575	$data, minify => 1, mipmap => 1;
576		798
577	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	799	CFPlus::guard {
578	$self->{map_widget}->update;	800	@{$self->{face_cb}{$id}}
579		801	= grep $_ != $cb,
580	$tex	802	@{$self->{face_cb}{$id}};
581	};	803	}
582	}	804	}
583		805
584	sub sound_play {	806	sub sound_play {
585	my ($self, $x, $y, $soundnum, $type) = @_;	807	my ($self, $type, $face, $dx, $dy, $vol) = @_;
586		808
587	$self->{sound_play}->($x, $y, $soundnum, $type);	809	&::audio_sound_play ($face, $dx, $dy, $vol)
		810	unless $type & 1; # odd types are silent for future expansion
588	}	811	}
589		812
590	my $LAST_QUERY; # server is stupid, stupid, stupid	813	my $LAST_QUERY; # server is stupid, stupid, stupid
591		814
592	sub query {	815	sub query {
…		…
596	$LAST_QUERY = $prompt;	819	$LAST_QUERY = $prompt;
597		820
598	$self->{query}-> ($self, $flags, $prompt);	821	$self->{query}-> ($self, $flags, $prompt);
599	}	822	}
600		823
601	sub drawinfo {	824	sub sanitise_xml($) {
602	my ($self, $color, $text) = @_;	825	local $_ = shift;
603		826
604	my @color = (	827	# we now weed out all tags we do not support
		828	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		829	# now all entities
		830	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		831
		832	# handle some elements
		833	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		834	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		835
		836	$_
		837	}
		838
		839	our %NAME_TO_COLOR = (
		840	black => 0,
		841	white => 1,
		842	darkblue => 2,
		843	red => 3,
		844	orange => 4,
		845	lightblue => 5,
		846	darkorange => 6,
		847	green => 7,
		848	darkgreen => 8,
		849	grey => 9,
		850	brown => 10,
		851	yellow => 11,
		852	tan => 12,
		853	);
		854
		855	our @CF_COLOR = (
605	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	856	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
606	[1.00, 1.00, 1.00],	857	[1.00, 1.00, 1.00],
607	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	858	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
608	[1.00, 0.00, 0.00],	859	[1.00, 0.00, 0.00],
609	[1.00, 0.54, 0.00],	860	[1.00, 0.54, 0.00],
610	[0.11, 0.56, 1.00],	861	[0.11, 0.56, 1.00],
611	[0.93, 0.46, 0.00],	862	[0.93, 0.46, 0.00],
612	[0.18, 0.54, 0.34],	863	[0.18, 0.54, 0.34],
613	[0.56, 0.73, 0.56],	864	[0.56, 0.73, 0.56],
614	[0.80, 0.80, 0.80],	865	[0.80, 0.80, 0.80],
615	[0.75, 0.61, 0.20],	866	[0.75, 0.61, 0.20],
616	[0.99, 0.77, 0.26],	867	[0.99, 0.77, 0.26],
617	[0.74, 0.65, 0.41],	868	[0.74, 0.65, 0.41],
618	);	869	);
619		870
		871	sub msg {
		872	my ($self, $color, $type, $text, @extra) = @_;
		873
		874	$text = sanitise_xml $text;
		875
		876	if (my $cb = $self->{cb_msg}{$type}) {
		877	$_->($self, $color, $type, $text, @extra) for values %$cb;
		878	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		879	$type =~ s/-/_/g;
		880	$self->{$type} = $text;
		881	} else {
620	$self->logprint ("info: ", $text);	882	$self->logprint ("msg: ", $text);
		883	return if $color < 0; # negative color == ignore if not understood
621		884
622	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	885	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
623		886
624	# try to create single paragraphs of multiple lines sent by the server	887	## try to create single paragraphs of multiple lines sent by the server
		888	# no longer neecssary with TRT servers
625	$text =~ s/(?<=\S)\n(?=\w)/ /g;	889	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
626		890
627	$text = CFPlus::asxml $text;	891	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
628	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	892	for split /\n/, $text;
629	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630		893
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,	894	$self->{statusbox}->add ($text,
636	group => $text,	895	group => $text,
637	fg => $color[$color],	896	fg => $fg,
638	timeout => $color >= 2 ? 180 : 10,	897	timeout => $color >= 2 ? 180 : 10,
639	tooltip_font => $::FONT_FIXED,	898	tooltip_font => $::FONT_FIXED,
640	);	899	);
641	}	900	}
642
643	sub drawextinfo {
644	my ($self, $color, $type, $subtype, $message) = @_;
645
646	$self->drawinfo ($color, $message);
647	}	901	}
648		902
649	sub spell_add {	903	sub spell_add {
650	my ($self, $spell) = @_;	904	my ($self, $spell) = @_;
651		905
652	# try to create single paragraphs out of the multiple lines sent by the server	906	# try to create single paragraphs out of the multiple lines sent by the server
653	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	907	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654	$spell->{message} =~ s/\n+$//;	908	$spell->{message} =~ s/\n+$//;
655	$spell->{message} \|\|= "Server did not provide a description for this spell.";	909	$spell->{message} \|\|= "Server did not provide a description for this spell.";
656		910
657	$::SPELL_PAGE->add_spell ($spell);	911	$::SPELL_LIST->add_spell ($spell);
658		912
659	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	913	$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});	914	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661	}	915	}
662		916
663	sub spell_delete {	917	sub spell_delete {
664	my ($self, $spell) = @_;	918	my ($self, $spell) = @_;
665		919
666	$::SPELL_PAGE->remove_spell ($spell);	920	$::SPELL_LIST->remove_spell ($spell);
		921	}
		922
		923	sub setup {
		924	my ($self, $setup) = @_;
		925
		926	$self->{map_widget}->set_tilesize ($self->{tilesize});
		927	$::MAP->resize ($self->{mapw}, $self->{maph});
667	}	928	}
668		929
669	sub addme_success {	930	sub addme_success {
670	my ($self) = @_;	931	my ($self) = @_;
671		932
…		…
692	$self->{map_widget}->clr_commands;	953	$self->{map_widget}->clr_commands;
693		954
694	::stop_game ();	955	::stop_game ();
695	}	956	}
696		957
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 {	958	sub update_floorbox {
732	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	959	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
733	return unless $::CONN;	960	return unless $::CONN;
734		961
735	$::FLOORBOX->clear;	962	$::FLOORBOX->clear;
		963
		964	my @add;
736		965
737	my $row;	966	my $row;
738	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	967	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
739	if ($row < 6) {	968	if ($row < 6) {
740	local $_->{face_widget}; # hack to force recreation of widget	969	local $_->{face_widget}; # hack to force recreation of widget
741	local $_->{desc_widget}; # hack to force recreation of widget	970	local $_->{desc_widget}; # hack to force recreation of widget
742	CFPlus::Item::update_widgets $_;	971	CFPlus::Item::update_widgets $_;
743		972
		973	push @add,
744	$::FLOORBOX->add (0, $row, $_->{face_widget});	974	0, $row, $_->{face_widget},
745	$::FLOORBOX->add (1, $row, $_->{desc_widget});	975	1, $row, $_->{desc_widget};
746		976
747	$row++;	977	$row++;
748	} else {	978	} else {
749	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	979	push @add, 1, $row, new CFPlus::UI::Button
750	text => "More...",	980	text => "More...",
751	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	981	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
752	);	982	;
753	last;	983	last;
754	}	984	}
755	}	985	}
756	if ($::CONN->{open_container}) {	986	if ($::CONN->{open_container}) {
757	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	987	push @add, 1, $row++, new CFPlus::UI::Button
758	text => "Close container",	988	text => "Close container",
759	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	989	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760	);	990	;
761	}	991	}
		992
		993	$::FLOORBOX->add_at (@add);
762	});	994	});
763		995
764	$::WANT_REFRESH++;	996	$::WANT_REFRESH++;
765	}	997	}
766		998
…		…
877	$::SERVER_INFO->set_markup (	1109	$::SERVER_INFO->set_markup (
878	"server <tt>$self->{host}:$self->{port}</tt>\n"	1110	"server <tt>$self->{host}:$self->{port}</tt>\n"
879	. "protocol version <tt>$self->{version}</tt>\n"	1111	. "protocol version <tt>$self->{version}</tt>\n"
880	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1112	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1113	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1114	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1115	. "editing support $yesno[!!$self->{editor_support}]\n"
882	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1116	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1117	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
883	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1118	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1119	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885	. "map size $self->{mapw}×$self->{maph}\n"	1120	. "map size $self->{mapw}×$self->{maph}\n"
886	);	1121	);
		1122
887	}	1123	}
888		1124
889	sub logged_in {	1125	sub logged_in {
890	my ($self) = @_;	1126	my ($self) = @_;
891		1127
892	$self->send_ext_req (cfplus_support => version => 1, sub {	1128	$self->send_ext_req (cfplus_support => version => 2, sub {
		1129	my (%msg) = @_;
		1130
893	$self->{cfplus_ext} = $_[0]{version};	1131	$self->{cfplus_ext} = $msg{version};
894	$self->update_server_info;	1132	$self->update_server_info;
		1133
		1134	if ($self->{cfplus_ext} >= 2) {
		1135	$self->send_ext_req ("editor_support", sub {
		1136	$self->{editor_support} = { @_ };
		1137	$self->update_server_info;
		1138
		1139	0
		1140	});
		1141	}
895		1142
896	0	1143	0
897	});	1144	});
898		1145
899	$self->update_server_info;	1146	$self->update_server_info;
900		1147
901	$self->send_command ("output-sync $::CFG->{output_sync}");	1148	$self->send_command ("output-sync $::CFG->{output_sync}");
902	$self->send_command ("output-count $::CFG->{output_count}");	1149	$self->send_command ("output-count $::CFG->{output_count}");
		1150	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
903	$self->send_command ("pickup $::CFG->{pickup}");	1151	$self->send_command ("pickup $::CFG->{pickup}");
904	}	1152	}
905		1153
906	sub lookat {	1154	sub lookat {
907	my ($self, $x, $y) = @_;	1155	my ($self, $x, $y) = @_;
908		1156
909	if ($self->{cfplus_ext}) {	1157	if ($self->{cfplus_ext}) {
910	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1158	$self->send_ext_req (lookat => $x, $y, sub {
911	my ($msg) = @_;	1159	my (%msg) = @_;
912		1160
913	if (exists $msg->{npc_dialog}) {	1161	if (exists $msg{npc_dialog}) {
914	# start npc chat dialog	1162	# start npc chat dialog
915	$self->{npc_dialog} = new CFPlus::NPCDialog::	1163	$self->{npc_dialog} = new CFPlus::NPCDialog::
916	dx => $x,	1164	token => $msg{npc_dialog},
917	dy => $y,
918	title => "$msg->{npc_dialog} (NPC)",	1165	title => "$msg{npc_dialog}[0] (NPC)",
919	conn => $self,	1166	conn => $self,
920	;	1167	;
921	}	1168	}
922	});	1169	});
923	}	1170	}
…		…
930		1177
931	(delete $self->{npc_dialog})->destroy	1178	(delete $self->{npc_dialog})->destroy
932	if $self->{npc_dialog};	1179	if $self->{npc_dialog};
933		1180
934	$self->SUPER::destroy;	1181	$self->SUPER::destroy;
		1182
		1183	%$self = ();
935	}	1184	}
936		1185
937	package CFPlus::NPCDialog;	1186	package CFPlus::NPCDialog;
938		1187
939	our @ISA = 'CFPlus::UI::Toplevel';	1188	our @ISA = 'CFPlus::UI::Toplevel';
…		…
951	kw => { hi => 0, yes => 0, no => 0 },	1200	kw => { hi => 0, yes => 0, no => 0 },
952	has_close_button => 1,	1201	has_close_button => 1,
953	@_,	1202	@_,
954	);	1203	);
955		1204
956	Scalar::Util::weaken (my $this = $self);	1205	CFPlus::weaken (my $this = $self);
957		1206
958	$self->connect (delete => sub { $this->destroy; 1 });	1207	$self->connect (delete => sub { $this->destroy; 1 });
959		1208
960	# better use a pane...	1209	# better use a pane...
961	$self->add (my $hbox = new CFPlus::UI::HBox);	1210	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
986	on_activate => sub { $this->destroy; 1 },	1235	on_activate => sub { $this->destroy; 1 },
987	;	1236	;
988		1237
989	$self->update_options;	1238	$self->update_options;
990		1239
991	$self->{id} = $self->{conn}->send_ext_req (	1240	$self->{id} = "npc-channel-" . $self->{conn}->token;
992	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1241	$self->{conn}->connect_ext ($self->{id} => sub {
993	sub { $this && $this->feed (@_) }	1242	$this->feed (@_) if $this;
994	);	1243	});
		1244
		1245	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
995		1246
996	$self->{entry}->grab_focus;	1247	$self->{entry}->grab_focus;
997		1248
998	$self->{textview}->add_paragraph ({	1249	$self->{textview}->add_paragraph ({
999	fg => [1, 1, 0, 1],	1250	fg => [1, 1, 0, 1],
…		…
1005	};	1256	};
1006		1257
1007	sub update_options {	1258	sub update_options {
1008	my ($self) = @_;	1259	my ($self) = @_;
1009		1260
1010	Scalar::Util::weaken $self;	1261	CFPlus::weaken $self;
1011		1262
1012	$self->{options}->clear;	1263	$self->{options}->clear;
1013	$self->{options}->add ($self->{bye_button});	1264	$self->{options}->add ($self->{bye_button});
1014		1265
1015	for my $kw (sort keys %{ $self->{kw} }) {	1266	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1022	);	1273	);
1023	}	1274	}
1024	}	1275	}
1025		1276
1026	sub feed {	1277	sub feed {
1027	my ($self, $msg) = @_;	1278	my ($self, $type, @arg) = @_;
1028		1279
1029	Scalar::Util::weaken $self;	1280	CFPlus::weaken $self;
1030		1281
1031	if ($msg->{msgtype} eq "reply") {	1282	if ($type eq "update") {
		1283	my (%info) = @arg;
		1284
1032	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1285	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1033	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1286	$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		1287
		1288	if (exists $info{msg}) {
		1289	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1290	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1291	my @link;
		1292	$text =~ s{
		1293	($match)
		1294	}{
		1295	my $kw = $1;
		1296
		1297	push @link, new CFPlus::UI::Label
		1298	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1299	can_hover => 1,
		1300	can_events => 1,
		1301	padding_x => 0,
		1302	padding_y => 0,
		1303	on_button_up => sub {
		1304	$self->send ($kw);
		1305	};
		1306
		1307	"\x{fffc}"
		1308	}giex;
		1309
1056	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1310	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1057	$self->{textview}->scroll_to_bottom;	1311	$self->{textview}->scroll_to_bottom;
		1312	}
		1313
1058	$self->update_options;	1314	$self->update_options;
1059	} else {	1315	} else {
1060	$self->destroy;	1316	$self->destroy;
1061	}	1317	}
1062		1318
…		…
1067	my ($self, $msg) = @_;	1323	my ($self, $msg) = @_;
1068		1324
1069	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1325	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1070	$self->{textview}->scroll_to_bottom;	1326	$self->{textview}->scroll_to_bottom;
1071		1327
1072	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1328	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1073	}	1329	}
1074		1330
1075	sub destroy {	1331	sub destroy {
1076	my ($self) = @_;	1332	my ($self) = @_;
1077		1333
1078	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1334	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1079		1335
1080	if ($self->{conn}) {	1336	if ($self->{conn}) {
1081	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1337	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1082	delete $self->{conn}{npc_dialog};	1338	delete $self->{conn}{npc_dialog};
1083	$self->{conn}->disconnect_ext ($self->{id});	1339	$self->{conn}->disconnect_ext ($self->{id});
1084	}	1340	}
1085		1341
1086	$self->SUPER::destroy;	1342	$self->SUPER::destroy;
1087	}	1343	}
1088		1344
1089	1	1345	1
		1346

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.146 by root, Mon Aug 6 05:06:33 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.146 by root, Mon Aug 6 05:06:33 2007 UTC