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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.77 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18: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	xwidget1 => 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	$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	my $rid = $args->{$ev};
		110	$args->{$ev} = sub {
		111	my $id = shift->{s_id};
		112	$self->send_exti_msg (w_e => $id, $rid, @_);
		113
		114	1
		115	};
		116	}
		117
		118	$self->widget_associate (
		119	$ws, $id => scalar eval {
		120	local $SIG{__DIE__};
		121	"CFPlus::UI::$class"->new (%$args)
		122	}
		123	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		124	});
		125
		126	# widgetset associate
		127	$self->connect_ext (ws_a => sub {
		128	my (%ass) = @_;
		129
		130	# everything that has a name, wether conceivably useful or not
		131	my %wkw = (
		132	root => $CFPlus::UI::ROOT,
		133	tooltip => $CFPlus::UI::TOOLTIP,
		134
		135	mapwidget => $::MAPWIDGET,
		136	buttonbar => $::BUTTONBAR,
		137	metaserver => $::METASERVER,
		138	buttonbar => $::BUTTONBAR,
		139	login_button => $::LOGIN_BUTTON,
		140	quit_dialog => $::QUIT_DIALOG,
		141	host_entry => $::HOST_ENTRY,
		142	metaserver => $::METASERVER,
		143	server_info => $::SERVER_INFO,
		144
		145	setup_dialog => $::SETUP_DIALOG,
		146	setup_notebook => $::SETUP_NOTEBOOK,
		147	setup_server => $::SETUP_SERVER,
		148	setup_keyboard => $::SETUP_KEYBOARD,
		149
		150	pl_notebook => $::PL_NOTEBOOK,
		151	pl_window => $::PL_WINDOW,
		152	inventory_page => $::INVENTORY_PAGE,
		153	stats_page => $::STATS_PAGE,
		154	skill_page => $::SKILL_PAGE,
		155	spell_page => $::SPELL_PAGE,
		156	spell_list => $::SPELL_LIST,
		157
		158	floorbox => $::FLOORBOX,
		159	help_window => $::HELP_WINDOW,
		160	message_window => $::MESSAGE_WINDOW,
		161	statusbox => $::SDTATUSBOX,
		162
		163	inv => $::INV,
		164	invr => $::INVR,
		165	invr_hb => $::INVR_HB,
		166
		167	);
		168
		169	while (my ($id, $name) = each %ass) {
		170	$self->widget_associate (undef, $id => $wkw{$name})
		171	or warn "server failed to associate non-existent well-known widget $name\n";
		172	}
		173	});
		174
		175	# widget call
		176	$self->connect_ext (w_c => sub {
		177	my ($id, $rid, $method, @args) = @_;
		178
		179	my $w = $self->{widget}{$id}
		180	or return;
		181
		182	if ($rid) {
		183	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		184	} else {
		185	$w->$method (@args);
		186	}
		187	});
		188
		189	# widget set
		190	$self->connect_ext (w_s => sub {
		191	my ($id, $attr) = @_;
		192
		193	my $w = $self->{widget}{$id}
		194	or return;
		195
		196	for (my $i = 0; $i < $#$attr; $i += 2) {
		197	my ($member, $value) = @$attr[$i, $i+1];
		198	if (defined $value) {
		199	$w->{$member} = $value;
		200	} else {
		201	delete $w->{$member};
		202	}
		203	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		204	}
		205	});
		206
		207	# widget get
		208	$self->connect_ext (w_g => sub {
		209	my ($id, $rid, $attr) = @_;
		210
		211	my $w = $self->{widget}{$id}
		212	or return;
		213
		214	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		215	});
		216
		217	# message window
		218	$self->connect_ext (channel_info => sub {
		219	my ($info) = @_;
		220	$self->{channels}->{$info->{id}} = $info;
		221	$::MESSAGE_WINDOW->add_channel ($info);
		222	});
		223
		224	# destroy widgets on logout
		225	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		226	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		227	$_->destroy
		228	for values %{delete $ws->{w} \|\| {}};
		229	}
		230	});
		231
41	$self->{map_widget}->add_command (@$_)	232	$self->{map_widget}->add_command (@$_)
42	for @cmd_help;	233	for @cmd_help;
43		234
		235	{
		236	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		237	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		238	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		239	}
		240
		241	{
44	$self->{noface} = new_from_file CFPlus::Texture	242	$self->{noface} = my $tex = new_from_file CFPlus::Texture
45	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	243	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		244	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		245	}
46		246
47	$self->{open_container} = 0;	247	$self->{open_container} = 0;
48		248
49	# "global"
50	$self->{tilecache} = CFPlus::db_table "tilecache";
51	$self->{facemap} = CFPlus::db_table "facemap";
52
53	# per server	249	# per server
54	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	250	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55		251
56	$self	252	$self
		253	}
		254
		255	sub widget_associate {
		256	my ($self, $ws, $id, $widget) = @_;
		257
		258	if ($widget) {
		259	$widget->{s_id} = $id;
		260	$self->{widget}{$id} = $widget;
		261
		262	if ($ws) {
		263	$widget->{s_ws} = $ws;
		264	$self->{widgetset}{$ws}{w}{$id} = $widget;
		265	}
		266
		267	$widget->connect (on_destroy => sub {
		268	my ($widget) = @_;
		269
		270	delete $self->{widget}{$widget->{s_id}};
		271	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		272	if exists $widget->{s_ws};
		273	});
		274
		275	1
		276	} else {
		277	$self->send_exti_msg (w_e => $id, undef);
		278
		279	0
		280	}
		281	}
		282
		283	sub update_fx_want {
		284	my ($self) = @_;
		285
		286	$self->send_exti_msg (fx_want => {
		287	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		288	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		289	});
57	}	290	}
58		291
59	sub logprint {	292	sub logprint {
60	my ($self, @a) = @_;	293	my ($self, @a) = @_;
61		294
62	$self->{log_fh} \|\|= do {	295	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	}	296	}
80		297
81	sub _stat_numdiff {	298	sub _stat_numdiff {
82	my ($self, $name, $old, $new) = @_;	299	my ($self, $name, $old, $new) = @_;
83		300
…		…
216	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	433	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
217	$::GAUGES->{food} ->set_value ($fo, $fo_m);	434	$::GAUGES->{food} ->set_value ($fo, $fo_m);
218	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	435	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
219	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	436	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	437	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221	my $rng = $stats->{+CS_STAT_RANGE};	438	$::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};	439	my $title = $stats->{+CS_STAT_TITLE};
225	$title =~ s/^Player: //;	440	$title =~ s/^Player: //;
226	$::STATWIDS->{title} ->set_text ("Title: " . $title);	441	$::STATWIDS->{title} ->set_text ("Title: " . $title);
227		442
228	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	443	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
248	my @skills = keys %{ $self->{skill_info} };	463	my @skills = keys %{ $self->{skill_info} };
249		464
250	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	465	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
251	$sktbl->clear;	466	$sktbl->clear;
252		467
		468	my @add;
		469
		470	push @add,
253	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	471	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
254	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	472	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
255	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	473	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
256	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	474	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	475	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	476	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		477	;
259		478
260	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	479	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
261		480
262	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	481	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);	482	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) {	496	if ($ev->{button} == 1) {
278	$::CONN->user_send ("ready_skill $name");	497	$::CONN->user_send ("ready_skill $name");
279	} elsif ($ev->{button} == 2) {	498	} elsif ($ev->{button} == 2) {
280	$::CONN->user_send ("use_skill $name");	499	$::CONN->user_send ("use_skill $name");
281	} elsif ($ev->{button} == 3) {	500	} elsif ($ev->{button} == 3) {
		501	my $shortname = CFPlus::shorten $name, 14;
282	(new CFPlus::UI::Menu	502	(new CFPlus::UI::Menu
283	items => [	503	items => [
284	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	504	["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"]) }],	505	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286	],	506	],
287	)->popup ($ev);	507	)->popup ($ev);
288	} else {	508	} else {
289	return 0;	509	return 0;
290	}	510	}
291		511
292	1	512	1
293	};	513	};
294		514
		515	push @add,
295	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	516	$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);	517	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	518	$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);	519	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,	520	$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);	521	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		522	;
301		523
302	$x++ and ($x, $y) = (0, $y + 1);	524	$x++ and ($x, $y) = (0, $y + 1);
303	}	525	}
		526
		527	$sktbl->add_at (@add);
304	}	528	}
305		529
306	for (grep exists $stats->{$_}, @skills) {	530	for (grep exists $stats->{$_}, @skills) {
307	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	531	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
308	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	532	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
309	}	533	}
310	}	534	}
311		535
		536	sub macro_send {
		537	my ($self, $macro) = @_;
		538
		539	for my $cmd (@{ $macro->{action} }) {
		540	$self->send_command ($cmd);
		541	}
		542	}
		543
312	sub user_send {	544	sub user_send {
313	my ($self, $command) = @_;	545	my ($self, $command) = @_;
314		546
		547	$self->{record}->($command)
315	if ($self->{record}) {	548	if $self->{record};
316	push @{$self->{record}}, $command;
317	}
318		549
319	$self->logprint ("send: ", $command);	550	$self->logprint ("send: ", $command);
320	$self->send_command ($command);	551	$self->send_command ($command);
321	::status ($command);	552	::status ($command);
322	}	553	}
323		554
324	sub start_record {	555	sub record {
325	my ($self) = @_;	556	my ($self, $cb) = @_;
326		557
327	$self->{record} = [];	558	$self->{record} = $cb;
328	}
329
330	sub stop_record {
331	my ($self) = @_;
332	return delete $self->{record};
333	}	559	}
334		560
335	sub map_scroll {	561	sub map_scroll {
336	my ($self, $dx, $dy) = @_;	562	my ($self, $dx, $dy) = @_;
337		563
…		…
339	}	565	}
340		566
341	sub feed_map1a {	567	sub feed_map1a {
342	my ($self, $data) = @_;	568	my ($self, $data) = @_;
343		569
344	$self->{map}->map1a_update ($data);	570	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		571	my $delay;
		572
		573	for my $tile (@$missing) {
		574	next if $self->{delay}{$tile};
		575
		576	$delay = 1;
		577
		578	if (my $tex = $::CONN->{texture}[$tile]) {
		579	$tex->upload;
		580	} else {
		581	$self->{delay}{$tile} = 1;
		582
		583	# we assume the face is in-flight and will eventually come
		584	push @{$self->{face_cb}{$tile}}, sub {
		585	delete $self->{delay}{$tile};
		586	$_[0]->upload;
		587	};
		588	}
		589	}
		590
		591	if ($delay) {
		592	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		593	Event->timer (after => 0.03, cb => sub {
		594	$_[0]->w->cancel;
		595	$self->{map_widget}->update;
		596	});
		597	} else {
345	$self->{map_widget}->update;	598	$self->{map_widget}->update;
		599	}
346	}	600	}
347		601
348	sub magicmap {	602	sub magicmap {
349	my ($self, $w, $h, $x, $y, $data) = @_;	603	my ($self, $w, $h, $x, $y, $data) = @_;
350		604
…		…
357	my $map_info = delete $self->{map_info}	611	my $map_info = delete $self->{map_info}
358	or return;	612	or return;
359		613
360	my ($hash, $x, $y, $w, $h) = @$map_info;	614	my ($hash, $x, $y, $w, $h) = @$map_info;
361		615
362	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	616	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
363	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	617	$self->{map_cache_new}{$hash} = \$data;
364	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	618	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
365	}	619	}
366		620
367	sub map_clear {	621	sub map_clear {
368	my ($self) = @_;	622	my ($self) = @_;
369		623
…		…
372		626
373	$self->{map}->clear;	627	$self->{map}->clear;
374	delete $self->{map_widget}{magicmap};	628	delete $self->{map_widget}{magicmap};
375	}	629	}
376		630
		631	sub bg_fetch {
		632	my ($self) = @_;
		633
		634	my $id;
		635
		636	do {
		637	$id = pop @{$self->{bg_fetch}}
		638	or return;
		639	} while $self->{texture}[$id];
		640
		641	CFPlus::DB::exists tilecache => $id, sub {
		642	my ($exists) = @_;
		643
		644	return unless $self->{map}; # stop when destroyed
		645
		646	if ($exists) {
		647	$self->have_tile ($id);
		648	$self->{texture}[$id]->upload;
		649	}
		650
		651	$self->bg_fetch;
		652	};
		653	}
377		654
378	sub load_map($$$) {	655	sub load_map($$$) {
379	my ($self, $hash, $x, $y) = @_;	656	my ($self, $hash, $x, $y) = @_;
380		657
381	if (defined (my $data = $self->{mapcache}->get ($hash))) {	658	my $gen = $self->{map_change_gen};
		659
		660	my $cb = sub {
		661	return unless $gen == $self->{map_change_gen};
		662
		663	my ($data) = @_;
		664
		665	if (defined $data) {
		666	$self->{map_cache_new}{$hash} = \$data;
		667
382	$data = Compress::LZF::decompress $data;	668	my $data = Compress::LZF::decompress $data;
383	#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		669
388	$self->set_texture ($id => $data);	670	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		671	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		672	$self->bg_fetch unless $inprogress;
389	}	673	}
		674	};
		675
		676	if (my $rdata = $self->{map_cache_old}{$hash}) {
		677	$cb->($$rdata);
		678	} else {
		679	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
390	}	680	}
391	}	681	}
392		682
393	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	683	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394	# (server resource,s latency, bandwidth), so this hack is warranted.	684	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
459		749
460	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	750	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	751	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462		752
463	} else {	753	} else {
		754	my $gen = $self->{map_change_gen};
464	$self->send_mapinfo ("spatial $path$tile", sub {	755	$self->send_mapinfo ("spatial $path$tile", sub {
		756	return unless $gen == $self->{map_change_gen};
		757
465	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	758	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466		759
467	return if $mode ne "spatial";	760	return if $mode ne "spatial";
468		761
469	$x += $self->{map}->ox;	762	$x += $self->{map}->ox;
…		…
483		776
484	sub map_change {	777	sub map_change {
485	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	778	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486		779
487	$self->flush_map;	780	$self->flush_map;
		781
		782	++$self->{map_change_gen};
		783	$self->{map_cache_old} = delete $self->{map_cache_new};
488		784
489	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	785	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490		786
491	my $mapmapw = $self->{mapmap}->{w};	787	my $mapmapw = $self->{mapmap}->{w};
492	my $mapmaph = $self->{mapmap}->{h};	788	my $mapmaph = $self->{mapmap}->{h};
…		…
509	$self->load_map ($hash, $x, $y);	805	$self->load_map ($hash, $x, $y);
510	$self->flood_fill (0, 0, 0, "", $hash, $flags);	806	$self->flood_fill (0, 0, 0, "", $hash, $flags);
511	}	807	}
512		808
513	sub face_find {	809	sub face_find {
514	my ($self, $facenum, $face) = @_;	810	my ($self, $facenum, $face, $cb) = @_;
515		811
516	my $hash = "$face->{chksum},$face->{name}";	812	if ($face->{type} == 0) { # FT_FACE
		813	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
517		814
518	my $id = $self->{facemap}->get ($hash);	815	$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#	816	$self->{faceid}[$facenum] = $id;
545		817
546	my $face = $self->{tilecache}->get ($id);	818	$self->{map}->set_tileid ($facenum => $id);
547		819
548	if ($face) {	820	CFPlus::DB::get tilecache => $id, $cb;
549	#$self->face_prefetch;	821
550	$face	822	} elsif ($face->{type} & 1) { # with metadata
551	} else {	823	CFPlus::DB::get res_meta => $face->{name}, $cb;
552	my $tex = $self->{noface};
553	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554	undef
555	};	824	}
556	}	825	}
557		826
558	sub face_update {	827	sub face_update {
559	my ($self, $facenum, $face, $changed) = @_;	828	my ($self, $facenum, $face, $changed) = @_;
560		829
561	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	830	if ($face->{type} == 0) { # FT_FACE
		831	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		832	if $changed;
562		833
563	$self->set_texture ($face->{id} => delete $face->{image});	834	$self->have_tile ($face->{id});
564	}
565		835
566	sub set_texture {	836	} elsif ($face->{type} & 1) { # split metadata
		837	if ($changed) { # new data
		838	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		839	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		840
		841	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		842	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		843	} else {
		844	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		845	}
		846
		847	::add_license ($face);
		848
		849	if ($face->{type} == 3) { # FT_MUSIC
		850	$self->{music_meta}{$facenum} = $face;
		851
		852	::message ({ markup => "downloaded song #$facenum" })
		853	if $changed;
		854
		855	&::audio_music_push ($facenum);
		856	} elsif ($face->{type} == 5) { # FT_SOUND
		857	$self->{sound_meta}{$facenum} = $face;
		858
		859	::message ({ markup => "downloaded sound #$facenum" })
		860	if $changed;
		861
		862	&::audio_sound_push ($facenum);
		863	}
		864
		865	}
		866	}
		867
		868	sub smooth_update {
		869	my ($self, $facenum, $face) = @_;
		870
		871	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		872	}
		873
		874	sub have_tile {
		875	my ($self, $tile) = @_;
		876
		877	return unless $self->{map};
		878
		879	my $tex = $self->{texture}[$tile] \|\|=
		880	new CFPlus::Texture
		881	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		882
		883	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
		884	}
		885
		886	sub connect_face_update {
567	my ($self, $id, $data) = @_;	887	my ($self, $id, $cb) = @_;
568		888
569	$self->{texture}[$id] \|\|= do {	889	push @{$self->{face_cb}{$id}}, $cb;
570	my $tex =
571	new_from_image CFPlus::Texture
572	$data, minify => 1, mipmap => 1;
573		890
574	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	891	CFPlus::guard {
575	$self->{map_widget}->update;	892	@{$self->{face_cb}{$id}}
576		893	= grep $_ != $cb,
577	$tex	894	@{$self->{face_cb}{$id}};
578	};	895	}
579	}	896	}
580		897
581	sub sound_play {	898	sub sound_play {
582	my ($self, $x, $y, $soundnum, $type) = @_;	899	my ($self, $type, $face, $dx, $dy, $vol) = @_;
583		900
584	$self->{sound_play}->($x, $y, $soundnum, $type);	901	&::audio_sound_play ($face, $dx, $dy, $vol)
		902	unless $type & 1; # odd types are silent for future expansion
585	}	903	}
586		904
587	my $LAST_QUERY; # server is stupid, stupid, stupid	905	my $LAST_QUERY; # server is stupid, stupid, stupid
588		906
589	sub query {	907	sub query {
…		…
593	$LAST_QUERY = $prompt;	911	$LAST_QUERY = $prompt;
594		912
595	$self->{query}-> ($self, $flags, $prompt);	913	$self->{query}-> ($self, $flags, $prompt);
596	}	914	}
597		915
598	sub drawinfo {	916	sub sanitise_xml($) {
599	my ($self, $color, $text) = @_;	917	local $_ = shift;
600		918
601	my @color = (	919	# we now weed out all tags we do not support
		920	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		921	# now all entities
		922	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		923
		924	# handle some elements
		925	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		926	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		927
		928	$_
		929	}
		930
		931	our %NAME_TO_COLOR = (
		932	black => 0,
		933	white => 1,
		934	darkblue => 2,
		935	red => 3,
		936	orange => 4,
		937	lightblue => 5,
		938	darkorange => 6,
		939	green => 7,
		940	darkgreen => 8,
		941	grey => 9,
		942	brown => 10,
		943	yellow => 11,
		944	tan => 12,
		945	);
		946
		947	our @CF_COLOR = (
602	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	948	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
603	[1.00, 1.00, 1.00],	949	[1.00, 1.00, 1.00],
604	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	950	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
605	[1.00, 0.00, 0.00],	951	[1.00, 0.00, 0.00],
606	[1.00, 0.54, 0.00],	952	[1.00, 0.54, 0.00],
607	[0.11, 0.56, 1.00],	953	[0.11, 0.56, 1.00],
608	[0.93, 0.46, 0.00],	954	[0.93, 0.46, 0.00],
609	[0.18, 0.54, 0.34],	955	[0.18, 0.54, 0.34],
610	[0.56, 0.73, 0.56],	956	[0.56, 0.73, 0.56],
611	[0.80, 0.80, 0.80],	957	[0.80, 0.80, 0.80],
612	[0.75, 0.61, 0.20],	958	[0.75, 0.61, 0.20],
613	[0.99, 0.77, 0.26],	959	[0.99, 0.77, 0.26],
614	[0.74, 0.65, 0.41],	960	[0.74, 0.65, 0.41],
615	);	961	);
616		962
		963	sub msg {
		964	my ($self, $color, $type, $text, @extra) = @_;
		965
		966	$text = sanitise_xml $text;
		967
		968	if (my $cb = $self->{cb_msg}{$type}) {
		969	$_->($self, $color, $type, $text, @extra) for values %$cb;
		970	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		971	$type =~ s/-/_/g;
		972	$self->{$type} = $text;
		973	} else {
617	$self->logprint ("info: ", $text);	974	$self->logprint ("msg: ", $text);
		975	return if $color < 0; # negative color == ignore if not understood
618		976
619	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	977	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
620		978
621	# try to create single paragraphs of multiple lines sent by the server	979	## try to create single paragraphs of multiple lines sent by the server
		980	# no longer neecssary with TRT servers
622	$text =~ s/(?<=\S)\n(?=\w)/ /g;	981	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
623		982
624	$text = CFPlus::asxml $text;	983	::message ({
625	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	984	fg => $fg,
626	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	985	markup => $_,
		986	type => $type,
		987	extra => [@extra],
		988	color_flags => $color
		989	}) for split /\n/, $text;
627		990
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,	991	$self->{statusbox}->add ($text,
633	group => $text,	992	group => $text,
634	fg => $color[$color],	993	fg => $fg,
635	timeout => $color >= 2 ? 180 : 10,	994	timeout => $color >= 2 ? 180 : 10,
636	tooltip_font => $::FONT_FIXED,	995	tooltip_font => $::FONT_FIXED,
637	);	996	);
638	}	997	}
639
640	sub drawextinfo {
641	my ($self, $color, $type, $subtype, $message) = @_;
642
643	$self->drawinfo ($color, $message);
644	}	998	}
645		999
646	sub spell_add {	1000	sub spell_add {
647	my ($self, $spell) = @_;	1001	my ($self, $spell) = @_;
648		1002
649	# try to create single paragraphs out of the multiple lines sent by the server	1003	# try to create single paragraphs out of the multiple lines sent by the server
650	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1004	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651	$spell->{message} =~ s/\n+$//;	1005	$spell->{message} =~ s/\n+$//;
652	$spell->{message} \|\|= "Server did not provide a description for this spell.";	1006	$spell->{message} \|\|= "Server did not provide a description for this spell.";
653		1007
654	$::SPELL_PAGE->add_spell ($spell);	1008	$::SPELL_LIST->add_spell ($spell);
655		1009
656	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1010	$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});	1011	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
658	}	1012	}
659		1013
660	sub spell_delete {	1014	sub spell_delete {
661	my ($self, $spell) = @_;	1015	my ($self, $spell) = @_;
662		1016
663	$::SPELL_PAGE->remove_spell ($spell);	1017	$::SPELL_LIST->remove_spell ($spell);
		1018	}
		1019
		1020	sub setup {
		1021	my ($self, $setup) = @_;
		1022
		1023	$self->{map_widget}->set_tilesize ($self->{tilesize});
		1024	$::MAP->resize ($self->{mapw}, $self->{maph});
664	}	1025	}
665		1026
666	sub addme_success {	1027	sub addme_success {
667	my ($self) = @_;	1028	my ($self) = @_;
668		1029
…		…
689	$self->{map_widget}->clr_commands;	1050	$self->{map_widget}->clr_commands;
690		1051
691	::stop_game ();	1052	::stop_game ();
692	}	1053	}
693		1054
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 {	1055	sub update_floorbox {
729	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1056	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
730	return unless $::CONN;	1057	return unless $::CONN;
731		1058
732	$::FLOORBOX->clear;	1059	$::FLOORBOX->clear;
		1060
		1061	my @add;
733		1062
734	my $row;	1063	my $row;
735	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1064	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
736	if ($row < 6) {	1065	if ($row < 6) {
737	local $_->{face_widget}; # hack to force recreation of widget	1066	local $_->{face_widget}; # hack to force recreation of widget
738	local $_->{desc_widget}; # hack to force recreation of widget	1067	local $_->{desc_widget}; # hack to force recreation of widget
739	CFPlus::Item::update_widgets $_;	1068	CFPlus::Item::update_widgets $_;
740		1069
		1070	push @add,
741	$::FLOORBOX->add (0, $row, $_->{face_widget});	1071	0, $row, $_->{face_widget},
742	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1072	1, $row, $_->{desc_widget};
743		1073
744	$row++;	1074	$row++;
745	} else {	1075	} else {
746	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1076	push @add, 1, $row, new CFPlus::UI::Button
747	text => "More...",	1077	text => "More...",
748	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1078	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
749	);	1079	;
750	last;	1080	last;
751	}	1081	}
752	}	1082	}
753	if ($::CONN->{open_container}) {	1083	if ($::CONN->{open_container}) {
754	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1084	push @add, 1, $row++, new CFPlus::UI::Button
755	text => "Close container",	1085	text => "Close container",
756	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1086	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
757	);	1087	;
758	}	1088	}
759	});
760		1089
		1090	$::FLOORBOX->add_at (@add);
		1091	});
		1092
761	$::WANT_REFRESH++;	1093	$::WANT_REFRESH->start;
762	}	1094	}
763		1095
764	sub set_opencont {	1096	sub set_opencont {
765	my ($conn, $tag, $name) = @_;	1097	my ($conn, $tag, $name) = @_;
766	$conn->{open_container} = $tag;	1098	$conn->{open_container} = $tag;
767	update_floorbox;	1099	update_floorbox;
768		1100
769	$::INV_RIGHT_HB->clear ();	1101	$::INVR_HB->clear ();
770	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1102	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
771		1103
772	if ($tag != 0) { # Floor isn't closable, is it?	1104	if ($tag != 0) { # Floor isn't closable, is it?
773	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1105	$::INVR_HB->add (new CFPlus::UI::Button
774	text => "Close container",	1106	text => "Close container",
775	tooltip => "Close the currently open container (if one is open)",	1107	tooltip => "Close the currently open container (if one is open)",
776	on_activate => sub {	1108	on_activate => sub {
777	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1109	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
778	if $tag != 0;	1110	if $tag != 0;
779	#if $CONN->{open_container} != 0;
780	0	1111	0
781	},	1112	},
782	);	1113	);
783	}	1114	}
784		1115
…		…
874	$::SERVER_INFO->set_markup (	1205	$::SERVER_INFO->set_markup (
875	"server <tt>$self->{host}:$self->{port}</tt>\n"	1206	"server <tt>$self->{host}:$self->{port}</tt>\n"
876	. "protocol version <tt>$self->{version}</tt>\n"	1207	. "protocol version <tt>$self->{version}</tt>\n"
877	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1208	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1209	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1210	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1211	. "editing support $yesno[!!$self->{editor_support}]\n"
		1212	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1213	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1214	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1215	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881	. "map size $self->{mapw}×$self->{maph}\n"	1216	. "map size $self->{mapw}×$self->{maph}\n"
882	);	1217	);
		1218
883	}	1219	}
884		1220
885	sub logged_in {	1221	sub logged_in {
886	my ($self) = @_;	1222	my ($self) = @_;
887		1223
888	$self->send_ext_req (cfplus_support => version => 1, sub {	1224	$self->send_ext_req (cfplus_support => version => 2, sub {
		1225	my (%msg) = @_;
		1226
889	$self->{cfplus_ext} = $_[0]{version};	1227	$self->{cfplus_ext} = $msg{version};
890	$self->update_server_info;	1228	$self->update_server_info;
		1229
		1230	if ($self->{cfplus_ext} >= 2) {
		1231	$self->send_ext_req ("editor_support", sub {
		1232	$self->{editor_support} = { @_ };
		1233	$self->update_server_info;
		1234
		1235	0
		1236	});
		1237	}
891		1238
892	0	1239	0
893	});	1240	});
894		1241
895	$self->update_server_info;	1242	$self->update_server_info;
896		1243
897	$self->send_command ("output-sync $::CFG->{output_sync}");	1244	$self->send_command ("output-sync $::CFG->{output_sync}");
898	$self->send_command ("output-count $::CFG->{output_count}");	1245	$self->send_command ("output-count $::CFG->{output_count}");
		1246	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
899	$self->send_command ("pickup $::CFG->{pickup}");	1247	$self->send_command ("pickup $::CFG->{pickup}");
900	}	1248	}
901		1249
902	sub lookat {	1250	sub lookat {
903	my ($self, $x, $y) = @_;	1251	my ($self, $x, $y) = @_;
904		1252
905	if ($self->{cfplus_ext}) {	1253	if ($self->{cfplus_ext}) {
906	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1254	$self->send_ext_req (lookat => $x, $y, sub {
907	my ($msg) = @_;	1255	my (%msg) = @_;
908		1256
909	if (exists $msg->{npc_dialog}) {	1257	if (exists $msg{npc_dialog}) {
910	# start npc chat dialog	1258	# start npc chat dialog
911	$self->{npc_dialog} = new CFPlus::NPCDialog::	1259	$self->{npc_dialog} = new CFPlus::NPCDialog::
912	dx => $x,	1260	token => $msg{npc_dialog},
913	dy => $y,
914	title => "$msg->{npc_dialog} (NPC)",	1261	title => "$msg{npc_dialog}[0] (NPC)",
915	conn => $self,	1262	conn => $self,
916	;	1263	;
917	}	1264	}
918	});	1265	});
919	}	1266	}
…		…
922	}	1269	}
923		1270
924	sub destroy {	1271	sub destroy {
925	my ($self) = @_;	1272	my ($self) = @_;
926		1273
927	$self->{npc_dialog}->destroy	1274	(delete $self->{npc_dialog})->destroy
928	if $self->{npc_dialog};	1275	if $self->{npc_dialog};
929		1276
930	$self->SUPER::destroy;	1277	$self->SUPER::destroy;
		1278
		1279	%$self = ();
931	}	1280	}
932		1281
933	package CFPlus::NPCDialog;	1282	package CFPlus::NPCDialog;
934		1283
935	our @ISA = 'CFPlus::UI::Toplevel';	1284	our @ISA = 'CFPlus::UI::Toplevel';
…		…
947	kw => { hi => 0, yes => 0, no => 0 },	1296	kw => { hi => 0, yes => 0, no => 0 },
948	has_close_button => 1,	1297	has_close_button => 1,
949	@_,	1298	@_,
950	);	1299	);
951		1300
952	Scalar::Util::weaken (my $this = $self);	1301	CFPlus::weaken (my $this = $self);
953		1302
954	$self->connect (delete => sub { $this->destroy; 1 });	1303	$self->connect (delete => sub { $this->destroy; 1 });
955		1304
956	# better use a pane...	1305	# better use a pane...
957	$self->add (my $hbox = new CFPlus::UI::HBox);	1306	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
982	on_activate => sub { $this->destroy; 1 },	1331	on_activate => sub { $this->destroy; 1 },
983	;	1332	;
984		1333
985	$self->update_options;	1334	$self->update_options;
986		1335
987	$self->{id} = $self->{conn}->send_ext_req (	1336	$self->{id} = "npc-channel-" . $self->{conn}->token;
988	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1337	$self->{conn}->connect_ext ($self->{id} => sub {
989	sub { $this && $this->feed (@_) }	1338	$this->feed (@_) if $this;
990	);	1339	});
		1340
		1341	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
991		1342
992	$self->{entry}->grab_focus;	1343	$self->{entry}->grab_focus;
993		1344
994	$self->{textview}->add_paragraph ({	1345	$self->{textview}->add_paragraph ({
995	fg => [1, 1, 0, 1],	1346	fg => [1, 1, 0, 1],
…		…
1001	};	1352	};
1002		1353
1003	sub update_options {	1354	sub update_options {
1004	my ($self) = @_;	1355	my ($self) = @_;
1005		1356
1006	Scalar::Util::weaken $self;	1357	CFPlus::weaken $self;
1007		1358
1008	$self->{options}->clear;	1359	$self->{options}->clear;
1009	$self->{options}->add ($self->{bye_button});	1360	$self->{options}->add ($self->{bye_button});
1010		1361
1011	for my $kw (sort keys %{ $self->{kw} }) {	1362	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1018	);	1369	);
1019	}	1370	}
1020	}	1371	}
1021		1372
1022	sub feed {	1373	sub feed {
1023	my ($self, $msg) = @_;	1374	my ($self, $type, @arg) = @_;
1024		1375
1025	Scalar::Util::weaken $self;	1376	CFPlus::weaken $self;
1026		1377
1027	if ($msg->{msgtype} eq "reply") {	1378	if ($type eq "update") {
		1379	my (%info) = @arg;
		1380
1028	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1381	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1029	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1382	$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		1383
		1384	if (exists $info{msg}) {
		1385	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1386	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1387	my @link;
		1388	$text =~ s{
		1389	($match)
		1390	}{
		1391	my $kw = $1;
		1392
		1393	push @link, new CFPlus::UI::Label
		1394	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1395	can_hover => 1,
		1396	can_events => 1,
		1397	padding_x => 0,
		1398	padding_y => 0,
		1399	on_button_up => sub {
		1400	$self->send ($kw);
		1401	};
		1402
		1403	"\x{fffc}"
		1404	}giex;
		1405
1052	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1406	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053	$self->{textview}->scroll_to_bottom;	1407	$self->{textview}->scroll_to_bottom;
		1408	}
		1409
1054	$self->update_options;	1410	$self->update_options;
1055	} else {	1411	} else {
1056	$self->destroy;	1412	$self->destroy;
1057	}	1413	}
1058		1414
…		…
1063	my ($self, $msg) = @_;	1419	my ($self, $msg) = @_;
1064		1420
1065	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1421	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1066	$self->{textview}->scroll_to_bottom;	1422	$self->{textview}->scroll_to_bottom;
1067		1423
1068	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1424	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1069	}	1425	}
1070		1426
1071	sub destroy {	1427	sub destroy {
1072	my ($self) = @_;	1428	my ($self) = @_;
1073		1429
1074	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1430	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1075		1431
1076	if ($self->{conn}) {	1432	if ($self->{conn}) {
1077	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1433	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1078	delete $self->{conn}{npc_dialog};	1434	delete $self->{conn}{npc_dialog};
1079	$self->{conn}->disconnect_ext ($self->{id});	1435	$self->{conn}->disconnect_ext ($self->{id});
1080	}	1436	}
1081		1437
1082	$self->SUPER::destroy;	1438	$self->SUPER::destroy;
1083	}	1439	}
1084		1440
1085	1	1441	1
		1442

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.77 by root, Mon Aug 14 04:15:04 2006 UTC vs. Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.77 by root, Mon Aug 14 04:15:04 2006 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC