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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.90 by root, Wed Dec 6 00:15:12 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;
11		14
12	use Crossfire::Protocol::Base 0.95;	15	use Crossfire::Protocol::Base 0.95;
13		16
14	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
15		18
16	sub new {	19	sub new {
17	my $class = shift;	20	my ($class, %arg) = @_;
18		21
19	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	);
20		30
21	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
22		32
23	my @cmd_help = map {	33	my @cmd_help = map {
24	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
…		…
35	for @args;	45	for @args;
36		46
37	map ["$cmd$_", $text],	47	map ["$cmd$_", $text],
38	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
39	@args	49	@args
40	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
41	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
42		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
43	$self->{map_widget}->add_command (@$_)	205	$self->{map_widget}->add_command (@$_)
44	for @cmd_help;	206	for @cmd_help;
45
46	$self->{noface} = new_from_file CFPlus::Texture
47	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48		207
49	{	208	{
50	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	209	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;	210	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	211	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53	}	212	}
54		213
		214	{
		215	$self->{noface} = my $tex = new_from_file CFPlus::Texture
		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	}
		219
55	$self->{open_container} = 0;	220	$self->{open_container} = 0;
56		221
57	# "global"
58	$self->{tilecache} = CFPlus::db_table "tilecache"
59	or die "tilecache: unable to open database table";
60	$self->{facemap} = CFPlus::db_table "facemap"
61	or die "facemap: unable to open database table";
62
63	# per server	222	# per server
64	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66		224
67	$self	225	$self
68	}	226	}
69		227
70	sub logprint {	228	sub logprint {
71	my ($self, @a) = @_;	229	my ($self, @a) = @_;
72		230
73	$self->{log_fh} \|\|= do {	231	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
74	my $path = "$Crossfire::VARDIR/log.$self->{host}";
75
76	open my $fh, ">>:utf8", $path
77	or die "Couldn't open logfile $path: $!";
78
79	$fh->autoflush (1);
80
81	$fh;
82	};
83
84	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
85
86	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
87	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
88
89	print {$self->{log_fh}} "$ts ", @a, "\n";
90	}	232	}
91		233
92	sub _stat_numdiff {	234	sub _stat_numdiff {
93	my ($self, $name, $old, $new) = @_;	235	my ($self, $name, $old, $new) = @_;
94		236
…		…
227	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	369	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
228	$::GAUGES->{food} ->set_value ($fo, $fo_m);	370	$::GAUGES->{food} ->set_value ($fo, $fo_m);
229	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	371	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
230	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	372	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
231	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	373	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
232	my $rng = $stats->{+CS_STAT_RANGE};	374	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
233	$rng =~ s/^Range: //; # thank you so much dear server
234	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
235	my $title = $stats->{+CS_STAT_TITLE};	375	my $title = $stats->{+CS_STAT_TITLE};
236	$title =~ s/^Player: //;	376	$title =~ s/^Player: //;
237	$::STATWIDS->{title} ->set_text ("Title: " . $title);	377	$::STATWIDS->{title} ->set_text ("Title: " . $title);
238		378
239	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	379	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
259	my @skills = keys %{ $self->{skill_info} };	399	my @skills = keys %{ $self->{skill_info} };
260		400
261	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	401	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
262	$sktbl->clear;	402	$sktbl->clear;
263		403
		404	my @add;
		405
		406	push @add,
264	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	407	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
265	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	408	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
266	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	409	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
267	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	410	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
268	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	411	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
269	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	412	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		413	;
270		414
271	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>";
272		416
273	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);
274	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);
…		…
291	$::CONN->user_send ("use_skill $name");	435	$::CONN->user_send ("use_skill $name");
292	} elsif ($ev->{button} == 3) {	436	} elsif ($ev->{button} == 3) {
293	my $shortname = CFPlus::shorten $name, 14;	437	my $shortname = CFPlus::shorten $name, 14;
294	(new CFPlus::UI::Menu	438	(new CFPlus::UI::Menu
295	items => [	439	items => [
296	["bind <i>ready_skill $shortname</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"] }],
297	["bind <i>use_skill $shortname</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"] }],
298	],	442	],
299	)->popup ($ev);	443	)->popup ($ev);
300	} else {	444	} else {
301	return 0;	445	return 0;
302	}	446	}
303		447
304	1	448	1
305	};	449	};
306		450
		451	push @add,
307	$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
308	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),
309	$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
310	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),
311	$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,
312	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	;
313		459
314	$x++ and ($x, $y) = (0, $y + 1);	460	$x++ and ($x, $y) = (0, $y + 1);
315	}	461	}
		462
		463	$sktbl->add_at (@add);
316	}	464	}
317		465
318	for (grep exists $stats->{$_}, @skills) {	466	for (grep exists $stats->{$_}, @skills) {
319	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	467	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
320	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	468	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
321	}	469	}
322	}	470	}
323		471
		472	sub macro_send {
		473	my ($self, $macro) = @_;
		474
		475	for my $cmd (@{ $macro->{action} }) {
		476	$self->send_command ($cmd);
		477	}
		478	}
		479
324	sub user_send {	480	sub user_send {
325	my ($self, $command) = @_;	481	my ($self, $command) = @_;
326		482
327	push @{$self->{record}}, $command	483	$self->{record}->($command)
328	if $self->{record};	484	if $self->{record};
329		485
330	$self->logprint ("send: ", $command);	486	$self->logprint ("send: ", $command);
331	$self->send_command ($command);	487	$self->send_command ($command);
332	::status ($command);	488	::status ($command);
333	}	489	}
334		490
335	sub start_record {	491	sub record {
336	my ($self) = @_;	492	my ($self, $cb) = @_;
337		493
338	$self->{record} = [];	494	$self->{record} = $cb;
339	}
340
341	sub stop_record {
342	my ($self) = @_;
343	return delete $self->{record};
344	}	495	}
345		496
346	sub map_scroll {	497	sub map_scroll {
347	my ($self, $dx, $dy) = @_;	498	my ($self, $dx, $dy) = @_;
348		499
…		…
369	or return;	520	or return;
370		521
371	my ($hash, $x, $y, $w, $h) = @$map_info;	522	my ($hash, $x, $y, $w, $h) = @$map_info;
372		523
373	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	524	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
374	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	525	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
375	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	526	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
376	}	527	}
377		528
378	sub map_clear {	529	sub map_clear {
379	my ($self) = @_;	530	my ($self) = @_;
…		…
383		534
384	$self->{map}->clear;	535	$self->{map}->clear;
385	delete $self->{map_widget}{magicmap};	536	delete $self->{map_widget}{magicmap};
386	}	537	}
387		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	}
388		560
389	sub load_map($$$) {	561	sub load_map($$$) {
390	my ($self, $hash, $x, $y) = @_;	562	my ($self, $hash, $x, $y) = @_;
391		563
392	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) {
393	$data = Compress::LZF::decompress $data;	572	$data = Compress::LZF::decompress $data;
394	#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#
395	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
396	my $data = $self->{tilecache}->get ($id)
397	or next;
398		574
399	$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;
400	}	578	}
401	}	579	};
402	}	580	}
403		581
404	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	582	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
405	# (server resource,s latency, bandwidth), so this hack is warranted.	583	# (server resource,s latency, bandwidth), so this hack is warranted.
406	# 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
…		…
470		648
471	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	649	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
472	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	650	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
473		651
474	} else {	652	} else {
		653	my $gen = $self->{map_change_gen};
475	$self->send_mapinfo ("spatial $path$tile", sub {	654	$self->send_mapinfo ("spatial $path$tile", sub {
		655	return unless $gen == $self->{map_change_gen};
		656
476	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	657	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
477		658
478	return if $mode ne "spatial";	659	return if $mode ne "spatial";
479		660
480	$x += $self->{map}->ox;	661	$x += $self->{map}->ox;
…		…
494		675
495	sub map_change {	676	sub map_change {
496	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	677	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
497		678
498	$self->flush_map;	679	$self->flush_map;
		680
		681	++$self->{map_change_gen};
499		682
500	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	683	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
501		684
502	my $mapmapw = $self->{mapmap}->{w};	685	my $mapmapw = $self->{mapmap}->{w};
503	my $mapmaph = $self->{mapmap}->{h};	686	my $mapmaph = $self->{mapmap}->{h};
…		…
520	$self->load_map ($hash, $x, $y);	703	$self->load_map ($hash, $x, $y);
521	$self->flood_fill (0, 0, 0, "", $hash, $flags);	704	$self->flood_fill (0, 0, 0, "", $hash, $flags);
522	}	705	}
523		706
524	sub face_find {	707	sub face_find {
525	my ($self, $facenum, $face) = @_;	708	my ($self, $facenum, $face, $cb) = @_;
526		709
527	my $hash = "$face->{chksum},$face->{name}";	710	if ($face->{type} == 0) { # FT_FACE
		711	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
528		712
529	my $id = $self->{facemap}->get ($hash);	713	$face->{id} = $id;
530
531	unless ($id) {
532	# create new id for face
533	# I love transactions
534	for (1..100) {
535	my $txn = $CFPlus::DB_ENV->txn_begin;
536	my $status = $self->{facemap}->db_get (id => $id);
537	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
538	$id = ($id \|\| 64) + 1;
539	if ($self->{facemap}->put (id => $id) == 0
540	&& $self->{facemap}->put ($hash => $id) == 0) {
541	$txn->txn_commit;
542
543	goto gotid;
544	}
545	}
546	$txn->txn_abort;
547	}
548
549	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
550	}
551
552	gotid:
553	$face->{id} = $id;
554	$self->{map}->set_face ($facenum => $id);
555	$self->{faceid}[$facenum] = $id;#d#	714	$self->{faceid}[$facenum] = $id;
556		715
557	my $face = $self->{tilecache}->get ($id);	716	$self->{map}->set_tileid ($facenum => $id);
558		717
559	if ($face) {	718	CFPlus::DB::get tilecache => $id, $cb;
560	#$self->face_prefetch;	719
561	$face	720	} elsif ($face->{type} & 1) { # with metadata
562	} else {	721	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
563	my $tex = $self->{noface};	722	CFPlus::DB::get res_meta => $face->{name}, $cb;
564	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
565	undef
566	};	723	}
567	}	724	}
568		725
569	sub face_update {	726	sub face_update {
570	my ($self, $facenum, $face, $changed) = @_;	727	my ($self, $facenum, $face, $changed) = @_;
571		728
572	$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;
573		732
574	$self->set_texture ($face->{id} => delete $face->{image});	733	$self->have_tile ($face->{id});
575	}
576		734
577	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 {
578	my ($self, $id, $data) = @_;	795	my ($self, $id, $cb) = @_;
579		796
580	$self->{texture}[$id] \|\|= do {	797	push @{$self->{face_cb}{$id}}, $cb;
581	my $tex =
582	new_from_image CFPlus::Texture
583	$data, minify => 1, mipmap => 1;
584		798
585	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	799	CFPlus::guard {
586	$self->{map_widget}->update;	800	@{$self->{face_cb}{$id}}
587		801	= grep $_ != $cb,
588	$tex	802	@{$self->{face_cb}{$id}};
589	};	803	}
590	}	804	}
591		805
592	sub sound_play {	806	sub sound_play {
593	my ($self, $x, $y, $soundnum, $type) = @_;	807	my ($self, $type, $face, $dx, $dy, $vol) = @_;
594		808
595	$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
596	}	811	}
597		812
598	my $LAST_QUERY; # server is stupid, stupid, stupid	813	my $LAST_QUERY; # server is stupid, stupid, stupid
599		814
600	sub query {	815	sub query {
…		…
604	$LAST_QUERY = $prompt;	819	$LAST_QUERY = $prompt;
605		820
606	$self->{query}-> ($self, $flags, $prompt);	821	$self->{query}-> ($self, $flags, $prompt);
607	}	822	}
608		823
609	sub drawinfo {	824	sub sanitise_xml($) {
610	my ($self, $color, $text) = @_;	825	local $_ = shift;
611		826
612	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 = (
613	[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],
614	[1.00, 1.00, 1.00],	857	[1.00, 1.00, 1.00],
615	[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]
616	[1.00, 0.00, 0.00],	859	[1.00, 0.00, 0.00],
617	[1.00, 0.54, 0.00],	860	[1.00, 0.54, 0.00],
618	[0.11, 0.56, 1.00],	861	[0.11, 0.56, 1.00],
619	[0.93, 0.46, 0.00],	862	[0.93, 0.46, 0.00],
620	[0.18, 0.54, 0.34],	863	[0.18, 0.54, 0.34],
621	[0.56, 0.73, 0.56],	864	[0.56, 0.73, 0.56],
622	[0.80, 0.80, 0.80],	865	[0.80, 0.80, 0.80],
623	[0.75, 0.61, 0.20],	866	[0.75, 0.61, 0.20],
624	[0.99, 0.77, 0.26],	867	[0.99, 0.77, 0.26],
625	[0.74, 0.65, 0.41],	868	[0.74, 0.65, 0.41],
626	);	869	);
627		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 {
628	$self->logprint ("info: ", $text);	882	$self->logprint ("msg: ", $text);
		883	return if $color < 0; # negative color == ignore if not understood
629		884
		885	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
		886
630	# 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
631	$text =~ s/(?<=\S)\n(?=\w)/ /g;	889	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
632		890
633	$text = CFPlus::asxml $text;	891	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
634	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
635	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
636
637	::message ({ fg => $color[$color], markup => $_ })
638	for split /\n/, $text;	892	for split /\n/, $text;
639		893
640	$self->{statusbox}->add ($text,	894	$self->{statusbox}->add ($text,
641	group => $text,	895	group => $text,
642	fg => $color[$color],	896	fg => $fg,
643	timeout => $color >= 2 ? 180 : 10,	897	timeout => $color >= 2 ? 180 : 10,
644	tooltip_font => $::FONT_FIXED,	898	tooltip_font => $::FONT_FIXED,
645	);	899	);
646	}	900	}
647
648	sub drawextinfo {
649	my ($self, $color, $type, $subtype, $message) = @_;
650
651	$self->drawinfo ($color, $message);
652	}	901	}
653		902
654	sub spell_add {	903	sub spell_add {
655	my ($self, $spell) = @_;	904	my ($self, $spell) = @_;
656		905
…		…
672	}	921	}
673		922
674	sub setup {	923	sub setup {
675	my ($self, $setup) = @_;	924	my ($self, $setup) = @_;
676		925
		926	$self->{map_widget}->set_tilesize ($self->{tilesize});
677	$::MAP->resize ($self->{mapw}, $self->{maph});	927	$::MAP->resize ($self->{mapw}, $self->{maph});
678	}	928	}
679		929
680	sub addme_success {	930	sub addme_success {
681	my ($self) = @_;	931	my ($self) = @_;
…		…
703	$self->{map_widget}->clr_commands;	953	$self->{map_widget}->clr_commands;
704		954
705	::stop_game ();	955	::stop_game ();
706	}	956	}
707		957
708	sub image_info {
709	my ($self, $numfaces) = @_;
710
711	$self->{num_faces} = $numfaces;
712	$self->{face_prefetch} = [1 .. $numfaces];
713	$self->face_prefetch;
714	}
715
716	sub face_prefetch {
717	my ($self) = @_;
718
719	return unless $::CFG->{face_prefetch};
720
721	if ($self->{num_faces}) {
722	return if @{ $self->{send_queue} \|\| [] };
723	my $todo = @{ $self->{face_prefetch} }
724	or return;
725
726	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
727
728	$self->send ("requestinfo image_sums $face $face");
729
730	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
731	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
732	} elsif (!exists $self->{num_faces}) {
733	$self->send ("requestinfo image_info");
734
735	$self->{num_faces} = 0;
736
737	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
738	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
739	}
740	}
741
742	sub update_floorbox {	958	sub update_floorbox {
743	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	959	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
744	return unless $::CONN;	960	return unless $::CONN;
745		961
746	$::FLOORBOX->clear;	962	$::FLOORBOX->clear;
		963
		964	my @add;
747		965
748	my $row;	966	my $row;
749	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} }) {
750	if ($row < 6) {	968	if ($row < 6) {
751	local $_->{face_widget}; # hack to force recreation of widget	969	local $_->{face_widget}; # hack to force recreation of widget
752	local $_->{desc_widget}; # hack to force recreation of widget	970	local $_->{desc_widget}; # hack to force recreation of widget
753	CFPlus::Item::update_widgets $_;	971	CFPlus::Item::update_widgets $_;
754		972
		973	push @add,
755	$::FLOORBOX->add (0, $row, $_->{face_widget});	974	0, $row, $_->{face_widget},
756	$::FLOORBOX->add (1, $row, $_->{desc_widget});	975	1, $row, $_->{desc_widget};
757		976
758	$row++;	977	$row++;
759	} else {	978	} else {
760	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	979	push @add, 1, $row, new CFPlus::UI::Button
761	text => "More...",	980	text => "More...",
762	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	981	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
763	);	982	;
764	last;	983	last;
765	}	984	}
766	}	985	}
767	if ($::CONN->{open_container}) {	986	if ($::CONN->{open_container}) {
768	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	987	push @add, 1, $row++, new CFPlus::UI::Button
769	text => "Close container",	988	text => "Close container",
770	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	989	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
771	);	990	;
772	}	991	}
		992
		993	$::FLOORBOX->add_at (@add);
773	});	994	});
774		995
775	$::WANT_REFRESH++;	996	$::WANT_REFRESH++;
776	}	997	}
777		998
…		…
888	$::SERVER_INFO->set_markup (	1109	$::SERVER_INFO->set_markup (
889	"server <tt>$self->{host}:$self->{port}</tt>\n"	1110	"server <tt>$self->{host}:$self->{port}</tt>\n"
890	. "protocol version <tt>$self->{version}</tt>\n"	1111	. "protocol version <tt>$self->{version}</tt>\n"
891	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1112	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
892	. "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"
893	. "editing support $yesno[!!$self->{editor_support}]\n"	1115	. "editing support $yesno[!!$self->{editor_support}]\n"
894	. "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"
895	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1118	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
896	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1119	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
897	. "map size $self->{mapw}×$self->{maph}\n"	1120	. "map size $self->{mapw}×$self->{maph}\n"
898	);	1121	);
899		1122
900	::setup_build_button ($self->{editor_support}->{builder_ui});
901	}	1123	}
902		1124
903	sub logged_in {	1125	sub logged_in {
904	my ($self) = @_;	1126	my ($self) = @_;
905		1127
906	$self->send_ext_req (cfplus_support => version => 1, sub {	1128	$self->send_ext_req (cfplus_support => version => 2, sub {
		1129	my (%msg) = @_;
		1130
907	$self->{cfplus_ext} = $_[0]{version};	1131	$self->{cfplus_ext} = $msg{version};
908	$self->update_server_info;	1132	$self->update_server_info;
909		1133
910	if ($self->{cfplus_ext} >= 2) {	1134	if ($self->{cfplus_ext} >= 2) {
911	$self->send_ext_req ("editor_support", sub {	1135	$self->send_ext_req ("editor_support", sub {
912	$self->{editor_support} = $_[0];	1136	$self->{editor_support} = { @_ };
913	$self->update_server_info;	1137	$self->update_server_info;
914		1138
915	0	1139	0
916	});	1140	});
917	}	1141	}
…		…
921		1145
922	$self->update_server_info;	1146	$self->update_server_info;
923		1147
924	$self->send_command ("output-sync $::CFG->{output_sync}");	1148	$self->send_command ("output-sync $::CFG->{output_sync}");
925	$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;
926	$self->send_command ("pickup $::CFG->{pickup}");	1151	$self->send_command ("pickup $::CFG->{pickup}");
927	}
928
929	sub buildat {
930	my ($self, $builditem, $x, $y) = @_;
931
932	if ($self->{cfplus_ext}) {
933	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934	}
935	}	1152	}
936		1153
937	sub lookat {	1154	sub lookat {
938	my ($self, $x, $y) = @_;	1155	my ($self, $x, $y) = @_;
939		1156
940	if ($self->{cfplus_ext}) {	1157	if ($self->{cfplus_ext}) {
941	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1158	$self->send_ext_req (lookat => $x, $y, sub {
942	my ($msg) = @_;	1159	my (%msg) = @_;
943		1160
944	if (exists $msg->{npc_dialog}) {	1161	if (exists $msg{npc_dialog}) {
945	# start npc chat dialog	1162	# start npc chat dialog
946	$self->{npc_dialog} = new CFPlus::NPCDialog::	1163	$self->{npc_dialog} = new CFPlus::NPCDialog::
947	dx => $x,	1164	token => $msg{npc_dialog},
948	dy => $y,
949	title => "$msg->{npc_dialog} (NPC)",	1165	title => "$msg{npc_dialog}[0] (NPC)",
950	conn => $self,	1166	conn => $self,
951	;	1167	;
952	}	1168	}
953	});	1169	});
954	}	1170	}
…		…
961		1177
962	(delete $self->{npc_dialog})->destroy	1178	(delete $self->{npc_dialog})->destroy
963	if $self->{npc_dialog};	1179	if $self->{npc_dialog};
964		1180
965	$self->SUPER::destroy;	1181	$self->SUPER::destroy;
		1182
		1183	%$self = ();
966	}	1184	}
967		1185
968	package CFPlus::NPCDialog;	1186	package CFPlus::NPCDialog;
969		1187
970	our @ISA = 'CFPlus::UI::Toplevel';	1188	our @ISA = 'CFPlus::UI::Toplevel';
…		…
982	kw => { hi => 0, yes => 0, no => 0 },	1200	kw => { hi => 0, yes => 0, no => 0 },
983	has_close_button => 1,	1201	has_close_button => 1,
984	@_,	1202	@_,
985	);	1203	);
986		1204
987	Scalar::Util::weaken (my $this = $self);	1205	CFPlus::weaken (my $this = $self);
988		1206
989	$self->connect (delete => sub { $this->destroy; 1 });	1207	$self->connect (delete => sub { $this->destroy; 1 });
990		1208
991	# better use a pane...	1209	# better use a pane...
992	$self->add (my $hbox = new CFPlus::UI::HBox);	1210	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
1017	on_activate => sub { $this->destroy; 1 },	1235	on_activate => sub { $this->destroy; 1 },
1018	;	1236	;
1019		1237
1020	$self->update_options;	1238	$self->update_options;
1021		1239
1022	$self->{id} = $self->{conn}->send_ext_req (	1240	$self->{id} = "npc-channel-" . $self->{conn}->token;
1023	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1241	$self->{conn}->connect_ext ($self->{id} => sub {
1024	sub { $this && $this->feed (@_) }	1242	$this->feed (@_) if $this;
1025	);	1243	});
		1244
		1245	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1026		1246
1027	$self->{entry}->grab_focus;	1247	$self->{entry}->grab_focus;
1028		1248
1029	$self->{textview}->add_paragraph ({	1249	$self->{textview}->add_paragraph ({
1030	fg => [1, 1, 0, 1],	1250	fg => [1, 1, 0, 1],
…		…
1036	};	1256	};
1037		1257
1038	sub update_options {	1258	sub update_options {
1039	my ($self) = @_;	1259	my ($self) = @_;
1040		1260
1041	Scalar::Util::weaken $self;	1261	CFPlus::weaken $self;
1042		1262
1043	$self->{options}->clear;	1263	$self->{options}->clear;
1044	$self->{options}->add ($self->{bye_button});	1264	$self->{options}->add ($self->{bye_button});
1045		1265
1046	for my $kw (sort keys %{ $self->{kw} }) {	1266	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1053	);	1273	);
1054	}	1274	}
1055	}	1275	}
1056		1276
1057	sub feed {	1277	sub feed {
1058	my ($self, $msg) = @_;	1278	my ($self, $type, @arg) = @_;
1059		1279
1060	Scalar::Util::weaken $self;	1280	CFPlus::weaken $self;
1061		1281
1062	if ($msg->{msgtype} eq "reply") {	1282	if ($type eq "update") {
		1283	my (%info) = @arg;
		1284
1063	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1285	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1064	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1286	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1065
1066	my $text = "\n" . CFPlus::asxml $msg->{msg};
1067	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1068	my @link;
1069	$text =~ s{
1070	($match)
1071	}{
1072	my $kw = $1;
1073
1074	push @link, new CFPlus::UI::Label
1075	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1076	can_hover => 1,
1077	can_events => 1,
1078	padding_x => 0,
1079	padding_y => 0,
1080	on_button_up => sub {
1081	$self->send ($kw);
1082	};
1083
1084	"\x{fffc}"
1085	}giex;
1086		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
1087	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1310	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1088	$self->{textview}->scroll_to_bottom;	1311	$self->{textview}->scroll_to_bottom;
		1312	}
		1313
1089	$self->update_options;	1314	$self->update_options;
1090	} else {	1315	} else {
1091	$self->destroy;	1316	$self->destroy;
1092	}	1317	}
1093		1318
…		…
1098	my ($self, $msg) = @_;	1323	my ($self, $msg) = @_;
1099		1324
1100	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1325	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1101	$self->{textview}->scroll_to_bottom;	1326	$self->{textview}->scroll_to_bottom;
1102		1327
1103	$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);
1104	}	1329	}
1105		1330
1106	sub destroy {	1331	sub destroy {
1107	my ($self) = @_;	1332	my ($self) = @_;
1108		1333
1109	#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
1110		1335
1111	if ($self->{conn}) {	1336	if ($self->{conn}) {
1112	$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};
1113	delete $self->{conn}{npc_dialog};	1338	delete $self->{conn}{npc_dialog};
1114	$self->{conn}->disconnect_ext ($self->{id});	1339	$self->{conn}->disconnect_ext ($self->{id});
1115	}	1340	}
1116		1341
1117	$self->SUPER::destroy;	1342	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.90 by root, Wed Dec 6 00:15:12 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.90 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 2007 UTC