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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.147 by root, Thu Aug 9 03:40:01 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs. Revision 1.147 by root, Thu Aug 9 03:40:01 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.147 by root, Thu Aug 9 03:40:01 2007 UTC