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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.84 by root, Fri Sep 29 00:56:06 2006 UTC vs. Revision 1.145 by root, Mon Aug 6 02:11:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.84 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.145 by root, Mon Aug 6 02:11:45 2007 UTC