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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.80 by root, Fri Aug 18 03:20:00 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 (@_, setup_req => { extmap => 1 });	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	or die "tilecache: unable to open database table";
52	$self->{facemap} = CFPlus::db_table "facemap"
53	or die "facemap: unable to open database table";
54
55	# per server	249	# per server
56	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	250	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
57	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
58		251
59	$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	});
60	}	290	}
61		291
62	sub logprint {	292	sub logprint {
63	my ($self, @a) = @_;	293	my ($self, @a) = @_;
64		294
65	$self->{log_fh} \|\|= do {	295	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
66	my $path = "$Crossfire::VARDIR/log.$self->{host}";
67
68	open my $fh, ">>:utf8", $path
69	or die "Couldn't open logfile $path: $!";
70
71	$fh->autoflush (1);
72
73	$fh;
74	};
75
76	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
77
78	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
79	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
80
81	print {$self->{log_fh}} "$ts ", @a, "\n";
82	}	296	}
83		297
84	sub _stat_numdiff {	298	sub _stat_numdiff {
85	my ($self, $name, $old, $new) = @_;	299	my ($self, $name, $old, $new) = @_;
86		300
…		…
219	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	433	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
220	$::GAUGES->{food} ->set_value ($fo, $fo_m);	434	$::GAUGES->{food} ->set_value ($fo, $fo_m);
221	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	435	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
222	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	436	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	437	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224	my $rng = $stats->{+CS_STAT_RANGE};	438	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
225	$rng =~ s/^Range: //; # thank you so much dear server
226	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
227	my $title = $stats->{+CS_STAT_TITLE};	439	my $title = $stats->{+CS_STAT_TITLE};
228	$title =~ s/^Player: //;	440	$title =~ s/^Player: //;
229	$::STATWIDS->{title} ->set_text ("Title: " . $title);	441	$::STATWIDS->{title} ->set_text ("Title: " . $title);
230		442
231	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	443	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
251	my @skills = keys %{ $self->{skill_info} };	463	my @skills = keys %{ $self->{skill_info} };
252		464
253	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	465	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
254	$sktbl->clear;	466	$sktbl->clear;
255		467
		468	my @add;
		469
		470	push @add,
256	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	471	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	472	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	473	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
259	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	474	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	475	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
261	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	476	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		477	;
262		478
263	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>";
264		480
265	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);
266	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);
…		…
280	if ($ev->{button} == 1) {	496	if ($ev->{button} == 1) {
281	$::CONN->user_send ("ready_skill $name");	497	$::CONN->user_send ("ready_skill $name");
282	} elsif ($ev->{button} == 2) {	498	} elsif ($ev->{button} == 2) {
283	$::CONN->user_send ("use_skill $name");	499	$::CONN->user_send ("use_skill $name");
284	} elsif ($ev->{button} == 3) {	500	} elsif ($ev->{button} == 3) {
		501	my $shortname = CFPlus::shorten $name, 14;
285	(new CFPlus::UI::Menu	502	(new CFPlus::UI::Menu
286	items => [	503	items => [
287	["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"] }],
288	["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"] }],
289	],	506	],
290	)->popup ($ev);	507	)->popup ($ev);
291	} else {	508	} else {
292	return 0;	509	return 0;
293	}	510	}
294		511
295	1	512	1
296	};	513	};
297		514
		515	push @add,
298	$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
299	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),
300	$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
301	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),
302	$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,
303	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	;
304		523
305	$x++ and ($x, $y) = (0, $y + 1);	524	$x++ and ($x, $y) = (0, $y + 1);
306	}	525	}
		526
		527	$sktbl->add_at (@add);
307	}	528	}
308		529
309	for (grep exists $stats->{$_}, @skills) {	530	for (grep exists $stats->{$_}, @skills) {
310	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	531	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	532	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312	}	533	}
313	}	534	}
314		535
		536	sub macro_send {
		537	my ($self, $macro) = @_;
		538
		539	for my $cmd (@{ $macro->{action} }) {
		540	$self->send_command ($cmd);
		541	}
		542	}
		543
315	sub user_send {	544	sub user_send {
316	my ($self, $command) = @_;	545	my ($self, $command) = @_;
317		546
		547	$self->{record}->($command)
318	if ($self->{record}) {	548	if $self->{record};
319	push @{$self->{record}}, $command;
320	}
321		549
322	$self->logprint ("send: ", $command);	550	$self->logprint ("send: ", $command);
323	$self->send_command ($command);	551	$self->send_command ($command);
324	::status ($command);	552	::status ($command);
325	}	553	}
326		554
327	sub start_record {	555	sub record {
328	my ($self) = @_;	556	my ($self, $cb) = @_;
329		557
330	$self->{record} = [];	558	$self->{record} = $cb;
331	}
332
333	sub stop_record {
334	my ($self) = @_;
335	return delete $self->{record};
336	}	559	}
337		560
338	sub map_scroll {	561	sub map_scroll {
339	my ($self, $dx, $dy) = @_;	562	my ($self, $dx, $dy) = @_;
340		563
…		…
342	}	565	}
343		566
344	sub feed_map1a {	567	sub feed_map1a {
345	my ($self, $data) = @_;	568	my ($self, $data) = @_;
346		569
347	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	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 {
348	$self->{map_widget}->update;	598	$self->{map_widget}->update;
		599	}
349	}	600	}
350		601
351	sub magicmap {	602	sub magicmap {
352	my ($self, $w, $h, $x, $y, $data) = @_;	603	my ($self, $w, $h, $x, $y, $data) = @_;
353		604
…		…
360	my $map_info = delete $self->{map_info}	611	my $map_info = delete $self->{map_info}
361	or return;	612	or return;
362		613
363	my ($hash, $x, $y, $w, $h) = @$map_info;	614	my ($hash, $x, $y, $w, $h) = @$map_info;
364		615
365	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	616	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
366	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	617	$self->{map_cache_new}{$hash} = \$data;
367	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	618	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
368	}	619	}
369		620
370	sub map_clear {	621	sub map_clear {
371	my ($self) = @_;	622	my ($self) = @_;
372		623
…		…
375		626
376	$self->{map}->clear;	627	$self->{map}->clear;
377	delete $self->{map_widget}{magicmap};	628	delete $self->{map_widget}{magicmap};
378	}	629	}
379		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	}
380		654
381	sub load_map($$$) {	655	sub load_map($$$) {
382	my ($self, $hash, $x, $y) = @_;	656	my ($self, $hash, $x, $y) = @_;
383		657
384	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
385	$data = Compress::LZF::decompress $data;	668	my $data = Compress::LZF::decompress $data;
386	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
387	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388	my $data = $self->{tilecache}->get ($id)
389	or next;
390		669
391	$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;
392	}	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;
393	}	680	}
394	}	681	}
395		682
396	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	683	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397	# (server resource,s latency, bandwidth), so this hack is warranted.	684	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
462		749
463	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	750	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	751	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465		752
466	} else {	753	} else {
		754	my $gen = $self->{map_change_gen};
467	$self->send_mapinfo ("spatial $path$tile", sub {	755	$self->send_mapinfo ("spatial $path$tile", sub {
		756	return unless $gen == $self->{map_change_gen};
		757
468	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	758	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469		759
470	return if $mode ne "spatial";	760	return if $mode ne "spatial";
471		761
472	$x += $self->{map}->ox;	762	$x += $self->{map}->ox;
…		…
486		776
487	sub map_change {	777	sub map_change {
488	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	778	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489		779
490	$self->flush_map;	780	$self->flush_map;
		781
		782	++$self->{map_change_gen};
		783	$self->{map_cache_old} = delete $self->{map_cache_new};
491		784
492	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	785	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493		786
494	my $mapmapw = $self->{mapmap}->{w};	787	my $mapmapw = $self->{mapmap}->{w};
495	my $mapmaph = $self->{mapmap}->{h};	788	my $mapmaph = $self->{mapmap}->{h};
…		…
512	$self->load_map ($hash, $x, $y);	805	$self->load_map ($hash, $x, $y);
513	$self->flood_fill (0, 0, 0, "", $hash, $flags);	806	$self->flood_fill (0, 0, 0, "", $hash, $flags);
514	}	807	}
515		808
516	sub face_find {	809	sub face_find {
517	my ($self, $facenum, $face) = @_;	810	my ($self, $facenum, $face, $cb) = @_;
518		811
519	my $hash = "$face->{chksum},$face->{name}";	812	if ($face->{type} == 0) { # FT_FACE
		813	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
520		814
521	my $id = $self->{facemap}->get ($hash);	815	$face->{id} = $id;
522
523	unless ($id) {
524	# create new id for face
525	# I love transactions
526	for (1..100) {
527	my $txn = $CFPlus::DB_ENV->txn_begin;
528	my $status = $self->{facemap}->db_get (id => $id);
529	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
530	$id = ($id \|\| 64) + 1;
531	if ($self->{facemap}->put (id => $id) == 0
532	&& $self->{facemap}->put ($hash => $id) == 0) {
533	$txn->txn_commit;
534
535	goto gotid;
536	}
537	}
538	$txn->txn_abort;
539	}
540
541	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
542	}
543
544	gotid:
545	$face->{id} = $id;
546	$self->{map}->set_face ($facenum => $id);
547	$self->{faceid}[$facenum] = $id;#d#	816	$self->{faceid}[$facenum] = $id;
548		817
549	my $face = $self->{tilecache}->get ($id);	818	$self->{map}->set_tileid ($facenum => $id);
550		819
551	if ($face) {	820	CFPlus::DB::get tilecache => $id, $cb;
552	#$self->face_prefetch;	821
553	$face	822	} elsif ($face->{type} & 1) { # with metadata
554	} else {	823	CFPlus::DB::get res_meta => $face->{name}, $cb;
555	my $tex = $self->{noface};
556	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
557	undef
558	};	824	}
559	}	825	}
560		826
561	sub face_update {	827	sub face_update {
562	my ($self, $facenum, $face, $changed) = @_;	828	my ($self, $facenum, $face, $changed) = @_;
563		829
564	$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;
565		833
566	$self->set_texture ($face->{id} => delete $face->{image});	834	$self->have_tile ($face->{id});
567	}
568		835
569	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 {
570	my ($self, $id, $data) = @_;	887	my ($self, $id, $cb) = @_;
571		888
572	$self->{texture}[$id] \|\|= do {	889	push @{$self->{face_cb}{$id}}, $cb;
573	my $tex =
574	new_from_image CFPlus::Texture
575	$data, minify => 1, mipmap => 1;
576		890
577	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	891	CFPlus::guard {
578	$self->{map_widget}->update;	892	@{$self->{face_cb}{$id}}
579		893	= grep $_ != $cb,
580	$tex	894	@{$self->{face_cb}{$id}};
581	};	895	}
582	}	896	}
583		897
584	sub sound_play {	898	sub sound_play {
585	my ($self, $x, $y, $soundnum, $type) = @_;	899	my ($self, $type, $face, $dx, $dy, $vol) = @_;
586		900
587	$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
588	}	903	}
589		904
590	my $LAST_QUERY; # server is stupid, stupid, stupid	905	my $LAST_QUERY; # server is stupid, stupid, stupid
591		906
592	sub query {	907	sub query {
…		…
596	$LAST_QUERY = $prompt;	911	$LAST_QUERY = $prompt;
597		912
598	$self->{query}-> ($self, $flags, $prompt);	913	$self->{query}-> ($self, $flags, $prompt);
599	}	914	}
600		915
601	sub drawinfo {	916	sub sanitise_xml($) {
602	my ($self, $color, $text) = @_;	917	local $_ = shift;
603		918
604	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 = (
605	[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],
606	[1.00, 1.00, 1.00],	949	[1.00, 1.00, 1.00],
607	[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]
608	[1.00, 0.00, 0.00],	951	[1.00, 0.00, 0.00],
609	[1.00, 0.54, 0.00],	952	[1.00, 0.54, 0.00],
610	[0.11, 0.56, 1.00],	953	[0.11, 0.56, 1.00],
611	[0.93, 0.46, 0.00],	954	[0.93, 0.46, 0.00],
612	[0.18, 0.54, 0.34],	955	[0.18, 0.54, 0.34],
613	[0.56, 0.73, 0.56],	956	[0.56, 0.73, 0.56],
614	[0.80, 0.80, 0.80],	957	[0.80, 0.80, 0.80],
615	[0.75, 0.61, 0.20],	958	[0.75, 0.61, 0.20],
616	[0.99, 0.77, 0.26],	959	[0.99, 0.77, 0.26],
617	[0.74, 0.65, 0.41],	960	[0.74, 0.65, 0.41],
618	);	961	);
619		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 {
620	$self->logprint ("info: ", $text);	974	$self->logprint ("msg: ", $text);
		975	return if $color < 0; # negative color == ignore if not understood
621		976
622	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	977	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
623		978
624	# 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
625	$text =~ s/(?<=\S)\n(?=\w)/ /g;	981	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
626		982
627	$text = CFPlus::asxml $text;	983	::message ({
628	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	984	fg => $fg,
629	$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;
630		990
631	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
632	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
633	$self->{logview}->scroll_to_bottom;
634
635	$self->{statusbox}->add ($text,	991	$self->{statusbox}->add ($text,
636	group => $text,	992	group => $text,
637	fg => $color[$color],	993	fg => $fg,
638	timeout => $color >= 2 ? 180 : 10,	994	timeout => $color >= 2 ? 180 : 10,
639	tooltip_font => $::FONT_FIXED,	995	tooltip_font => $::FONT_FIXED,
640	);	996	);
641	}	997	}
642
643	sub drawextinfo {
644	my ($self, $color, $type, $subtype, $message) = @_;
645
646	$self->drawinfo ($color, $message);
647	}	998	}
648		999
649	sub spell_add {	1000	sub spell_add {
650	my ($self, $spell) = @_;	1001	my ($self, $spell) = @_;
651		1002
652	# 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
653	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1004	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654	$spell->{message} =~ s/\n+$//;	1005	$spell->{message} =~ s/\n+$//;
655	$spell->{message} \|\|= "Server did not provide a description for this spell.";	1006	$spell->{message} \|\|= "Server did not provide a description for this spell.";
656		1007
657	$::SPELL_PAGE->add_spell ($spell);	1008	$::SPELL_LIST->add_spell ($spell);
658		1009
659	$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});
660	$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});
661	}	1012	}
662		1013
663	sub spell_delete {	1014	sub spell_delete {
664	my ($self, $spell) = @_;	1015	my ($self, $spell) = @_;
665		1016
666	$::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});
667	}	1025	}
668		1026
669	sub addme_success {	1027	sub addme_success {
670	my ($self) = @_;	1028	my ($self) = @_;
671		1029
…		…
692	$self->{map_widget}->clr_commands;	1050	$self->{map_widget}->clr_commands;
693		1051
694	::stop_game ();	1052	::stop_game ();
695	}	1053	}
696		1054
697	sub image_info {
698	my ($self, $numfaces) = @_;
699
700	$self->{num_faces} = $numfaces;
701	$self->{face_prefetch} = [1 .. $numfaces];
702	$self->face_prefetch;
703	}
704
705	sub face_prefetch {
706	my ($self) = @_;
707
708	return unless $::CFG->{face_prefetch};
709
710	if ($self->{num_faces}) {
711	return if @{ $self->{send_queue} \|\| [] };
712	my $todo = @{ $self->{face_prefetch} }
713	or return;
714
715	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
716
717	$self->send ("requestinfo image_sums $face $face");
718
719	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
720	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
721	} elsif (!exists $self->{num_faces}) {
722	$self->send ("requestinfo image_info");
723
724	$self->{num_faces} = 0;
725
726	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
727	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
728	}
729	}
730
731	sub update_floorbox {	1055	sub update_floorbox {
732	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1056	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
733	return unless $::CONN;	1057	return unless $::CONN;
734		1058
735	$::FLOORBOX->clear;	1059	$::FLOORBOX->clear;
		1060
		1061	my @add;
736		1062
737	my $row;	1063	my $row;
738	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} }) {
739	if ($row < 6) {	1065	if ($row < 6) {
740	local $_->{face_widget}; # hack to force recreation of widget	1066	local $_->{face_widget}; # hack to force recreation of widget
741	local $_->{desc_widget}; # hack to force recreation of widget	1067	local $_->{desc_widget}; # hack to force recreation of widget
742	CFPlus::Item::update_widgets $_;	1068	CFPlus::Item::update_widgets $_;
743		1069
		1070	push @add,
744	$::FLOORBOX->add (0, $row, $_->{face_widget});	1071	0, $row, $_->{face_widget},
745	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1072	1, $row, $_->{desc_widget};
746		1073
747	$row++;	1074	$row++;
748	} else {	1075	} else {
749	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1076	push @add, 1, $row, new CFPlus::UI::Button
750	text => "More...",	1077	text => "More...",
751	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1078	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
752	);	1079	;
753	last;	1080	last;
754	}	1081	}
755	}	1082	}
756	if ($::CONN->{open_container}) {	1083	if ($::CONN->{open_container}) {
757	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1084	push @add, 1, $row++, new CFPlus::UI::Button
758	text => "Close container",	1085	text => "Close container",
759	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1086	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
760	);	1087	;
761	}	1088	}
762	});
763		1089
		1090	$::FLOORBOX->add_at (@add);
		1091	});
		1092
764	$::WANT_REFRESH++;	1093	$::WANT_REFRESH->start;
765	}	1094	}
766		1095
767	sub set_opencont {	1096	sub set_opencont {
768	my ($conn, $tag, $name) = @_;	1097	my ($conn, $tag, $name) = @_;
769	$conn->{open_container} = $tag;	1098	$conn->{open_container} = $tag;
770	update_floorbox;	1099	update_floorbox;
771		1100
772	$::INV_RIGHT_HB->clear ();	1101	$::INVR_HB->clear ();
773	$::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);
774		1103
775	if ($tag != 0) { # Floor isn't closable, is it?	1104	if ($tag != 0) { # Floor isn't closable, is it?
776	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1105	$::INVR_HB->add (new CFPlus::UI::Button
777	text => "Close container",	1106	text => "Close container",
778	tooltip => "Close the currently open container (if one is open)",	1107	tooltip => "Close the currently open container (if one is open)",
779	on_activate => sub {	1108	on_activate => sub {
780	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1109	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
781	if $tag != 0;	1110	if $tag != 0;
782	#if $CONN->{open_container} != 0;
783	0	1111	0
784	},	1112	},
785	);	1113	);
786	}	1114	}
787		1115
…		…
877	$::SERVER_INFO->set_markup (	1205	$::SERVER_INFO->set_markup (
878	"server <tt>$self->{host}:$self->{port}</tt>\n"	1206	"server <tt>$self->{host}:$self->{port}</tt>\n"
879	. "protocol version <tt>$self->{version}</tt>\n"	1207	. "protocol version <tt>$self->{version}</tt>\n"
880	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1208	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881	. "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"
882	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1212	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1213	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
883	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1214	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1215	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885	. "map size $self->{mapw}×$self->{maph}\n"	1216	. "map size $self->{mapw}×$self->{maph}\n"
886	);	1217	);
		1218
887	}	1219	}
888		1220
889	sub logged_in {	1221	sub logged_in {
890	my ($self) = @_;	1222	my ($self) = @_;
891		1223
892	$self->send_ext_req (cfplus_support => version => 1, sub {	1224	$self->send_ext_req (cfplus_support => version => 2, sub {
		1225	my (%msg) = @_;
		1226
893	$self->{cfplus_ext} = $_[0]{version};	1227	$self->{cfplus_ext} = $msg{version};
894	$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	}
895		1238
896	0	1239	0
897	});	1240	});
898		1241
899	$self->update_server_info;	1242	$self->update_server_info;
900		1243
901	$self->send_command ("output-sync $::CFG->{output_sync}");	1244	$self->send_command ("output-sync $::CFG->{output_sync}");
902	$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;
903	$self->send_command ("pickup $::CFG->{pickup}");	1247	$self->send_command ("pickup $::CFG->{pickup}");
904	}	1248	}
905		1249
906	sub lookat {	1250	sub lookat {
907	my ($self, $x, $y) = @_;	1251	my ($self, $x, $y) = @_;
908		1252
909	if ($self->{cfplus_ext}) {	1253	if ($self->{cfplus_ext}) {
910	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1254	$self->send_ext_req (lookat => $x, $y, sub {
911	my ($msg) = @_;	1255	my (%msg) = @_;
912		1256
913	if (exists $msg->{npc_dialog}) {	1257	if (exists $msg{npc_dialog}) {
914	# start npc chat dialog	1258	# start npc chat dialog
915	$self->{npc_dialog} = new CFPlus::NPCDialog::	1259	$self->{npc_dialog} = new CFPlus::NPCDialog::
916	dx => $x,	1260	token => $msg{npc_dialog},
917	dy => $y,
918	title => "$msg->{npc_dialog} (NPC)",	1261	title => "$msg{npc_dialog}[0] (NPC)",
919	conn => $self,	1262	conn => $self,
920	;	1263	;
921	}	1264	}
922	});	1265	});
923	}	1266	}
…		…
930		1273
931	(delete $self->{npc_dialog})->destroy	1274	(delete $self->{npc_dialog})->destroy
932	if $self->{npc_dialog};	1275	if $self->{npc_dialog};
933		1276
934	$self->SUPER::destroy;	1277	$self->SUPER::destroy;
		1278
		1279	%$self = ();
935	}	1280	}
936		1281
937	package CFPlus::NPCDialog;	1282	package CFPlus::NPCDialog;
938		1283
939	our @ISA = 'CFPlus::UI::Toplevel';	1284	our @ISA = 'CFPlus::UI::Toplevel';
…		…
951	kw => { hi => 0, yes => 0, no => 0 },	1296	kw => { hi => 0, yes => 0, no => 0 },
952	has_close_button => 1,	1297	has_close_button => 1,
953	@_,	1298	@_,
954	);	1299	);
955		1300
956	Scalar::Util::weaken (my $this = $self);	1301	CFPlus::weaken (my $this = $self);
957		1302
958	$self->connect (delete => sub { $this->destroy; 1 });	1303	$self->connect (delete => sub { $this->destroy; 1 });
959		1304
960	# better use a pane...	1305	# better use a pane...
961	$self->add (my $hbox = new CFPlus::UI::HBox);	1306	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
986	on_activate => sub { $this->destroy; 1 },	1331	on_activate => sub { $this->destroy; 1 },
987	;	1332	;
988		1333
989	$self->update_options;	1334	$self->update_options;
990		1335
991	$self->{id} = $self->{conn}->send_ext_req (	1336	$self->{id} = "npc-channel-" . $self->{conn}->token;
992	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1337	$self->{conn}->connect_ext ($self->{id} => sub {
993	sub { $this && $this->feed (@_) }	1338	$this->feed (@_) if $this;
994	);	1339	});
		1340
		1341	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
995		1342
996	$self->{entry}->grab_focus;	1343	$self->{entry}->grab_focus;
997		1344
998	$self->{textview}->add_paragraph ({	1345	$self->{textview}->add_paragraph ({
999	fg => [1, 1, 0, 1],	1346	fg => [1, 1, 0, 1],
…		…
1005	};	1352	};
1006		1353
1007	sub update_options {	1354	sub update_options {
1008	my ($self) = @_;	1355	my ($self) = @_;
1009		1356
1010	Scalar::Util::weaken $self;	1357	CFPlus::weaken $self;
1011		1358
1012	$self->{options}->clear;	1359	$self->{options}->clear;
1013	$self->{options}->add ($self->{bye_button});	1360	$self->{options}->add ($self->{bye_button});
1014		1361
1015	for my $kw (sort keys %{ $self->{kw} }) {	1362	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1022	);	1369	);
1023	}	1370	}
1024	}	1371	}
1025		1372
1026	sub feed {	1373	sub feed {
1027	my ($self, $msg) = @_;	1374	my ($self, $type, @arg) = @_;
1028		1375
1029	Scalar::Util::weaken $self;	1376	CFPlus::weaken $self;
1030		1377
1031	if ($msg->{msgtype} eq "reply") {	1378	if ($type eq "update") {
		1379	my (%info) = @arg;
		1380
1032	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1381	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1033	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1382	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1034
1035	my $text = "\n" . CFPlus::asxml $msg->{msg};
1036	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1037	my @link;
1038	$text =~ s{
1039	($match)
1040	}{
1041	my $kw = $1;
1042
1043	push @link, new CFPlus::UI::Label
1044	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1045	can_hover => 1,
1046	can_events => 1,
1047	padding_x => 0,
1048	padding_y => 0,
1049	on_button_up => sub {
1050	$self->send ($kw);
1051	};
1052
1053	"\x{fffc}"
1054	}giex;
1055		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
1056	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1406	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1057	$self->{textview}->scroll_to_bottom;	1407	$self->{textview}->scroll_to_bottom;
		1408	}
		1409
1058	$self->update_options;	1410	$self->update_options;
1059	} else {	1411	} else {
1060	$self->destroy;	1412	$self->destroy;
1061	}	1413	}
1062		1414
…		…
1067	my ($self, $msg) = @_;	1419	my ($self, $msg) = @_;
1068		1420
1069	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1421	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1070	$self->{textview}->scroll_to_bottom;	1422	$self->{textview}->scroll_to_bottom;
1071		1423
1072	$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);
1073	}	1425	}
1074		1426
1075	sub destroy {	1427	sub destroy {
1076	my ($self) = @_;	1428	my ($self) = @_;
1077		1429
1078	#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
1079		1431
1080	if ($self->{conn}) {	1432	if ($self->{conn}) {
1081	$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};
1082	delete $self->{conn}{npc_dialog};	1434	delete $self->{conn}{npc_dialog};
1083	$self->{conn}->disconnect_ext ($self->{id});	1435	$self->{conn}->disconnect_ext ($self->{id});
1084	}	1436	}
1085		1437
1086	$self->SUPER::destroy;	1438	$self->SUPER::destroy;
1087	}	1439	}
1088		1440
1089	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.80 by root, Fri Aug 18 03:20:00 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.80 by root, Fri Aug 18 03:20:00 2006 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC