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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 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 = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {	33	my @cmd_help = map {
22	my ($pom) = @_;
23
24	my @cmd_help;
25
26	for my $head2 ($pom->head1->[-2]->head2) {
27	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
28	or next;	35	or die "unparseable command help: $_->{kw}[0]";
29		36
30	my $cmd = $1;	37	my $cmd = $1;
31	my @args = split /\\|/, $2;	38	my @args = split /\\|/, $2;
32	@args = (".*") unless @args;	39	@args = (".*") unless @args;
33		40
		41	my (undef, @par) = CFPlus::Pod::section_of $_;
		42	my $text = CFPlus::Pod::as_label @par;
		43
34	$_ = $_ eq ".*" ? "" : " $_"	44	$_ = $_ eq ".*" ? "" : " $_"
35	for @args;	45	for @args;
36		46
37	my $text = CFPlus::Pod::as_markup $head2->content;	47	map ["$cmd$_", $text],
38
39	push @cmd_help, ["$cmd$_", $text]
40	for sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
41	@args;	49	@args
		50	} sort { $a->{par} <=> $b->{par} }
		51	CFPlus::Pod::find command => "*";
		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	$self->send_exti_req (resource => "exp_table", sub {
		65	my ($exp_table) = @_;
		66
		67	$self->register_face_handler ($exp_table, sub {
		68	my ($face) = @_;
		69
		70	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		71	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		72	});
		73
		74	()
		75	});
		76
		77	if (my $ts = $cap{tileset}) {
		78	if (my ($default) = grep $_->[2] & 1, @$ts) {
		79	$self->{tileset} = $default;
		80	$self->{tilesize} = $default->[3];
		81	$self->setup_req (tileset => $default->[0]);
		82
		83	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		84	my $h = int $self->{maph} * 32 / $self->{tilesize};
		85
		86	$self->setup_req (mapsize => "${w}x${h}");
		87	}
		88	}
		89	});
		90
		91	$self->{json_coder}
		92	->convert_blessed
		93	->filter_json_single_key_object (__w_ => sub {
		94	$self->{widget}{$_[0]}
		95	});
		96
		97	# widgetset new
		98	$self->connect_ext (ws_n => sub {
		99	my ($id) = @_;
		100
		101	$self->{widgetset}{$id} = {
		102	w => {},
42	}	103	};
43
44	\@cmd_help
45	};	104	});
		105
		106	# widgetset destroy
		107	$self->connect_ext (ws_d => sub {
		108	my ($id) = @_;
		109
		110	my $ws = delete $self->{widgetset}{$id}
		111	or return;
		112
		113	$_->destroy
		114	for values %{$ws->{w}};
		115	});
		116
		117	# widgetset create
		118	$self->connect_ext (ws_c => sub {
		119	my ($ws, $id, $class, $args) = @_;
		120
		121	for my $ev (grep /^on_/, keys %$args) {
		122	my $rid = $args->{$ev};
		123	$args->{$ev} = sub {
		124	my $id = shift->{s_id};
		125	$self->send_exti_msg (w_e => $id, $rid, @_);
		126
		127	1
		128	};
		129	}
		130
		131	$self->widget_associate (
		132	$ws, $id => scalar eval {
		133	local $SIG{__DIE__};
		134	"CFPlus::UI::$class"->new (%$args)
		135	}
		136	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		137	});
		138
		139	# widgetset associate
		140	$self->connect_ext (ws_a => sub {
		141	my (%ass) = @_;
		142
		143	# everything that has a name, wether conceivably useful or not
		144	my %wkw = (
		145	root => $CFPlus::UI::ROOT,
		146	tooltip => $CFPlus::UI::TOOLTIP,
		147
		148	mapwidget => $::MAPWIDGET,
		149	buttonbar => $::BUTTONBAR,
		150	metaserver => $::METASERVER,
		151	buttonbar => $::BUTTONBAR,
		152	login_button => $::LOGIN_BUTTON,
		153	quit_dialog => $::QUIT_DIALOG,
		154	host_entry => $::HOST_ENTRY,
		155	metaserver => $::METASERVER,
		156	server_info => $::SERVER_INFO,
		157
		158	setup_dialog => $::SETUP_DIALOG,
		159	setup_notebook => $::SETUP_NOTEBOOK,
		160	setup_server => $::SETUP_SERVER,
		161	setup_keyboard => $::SETUP_KEYBOARD,
		162
		163	pl_notebook => $::PL_NOTEBOOK,
		164	pl_window => $::PL_WINDOW,
		165	inventory_page => $::INVENTORY_PAGE,
		166	stats_page => $::STATS_PAGE,
		167	skill_page => $::SKILL_PAGE,
		168	spell_page => $::SPELL_PAGE,
		169	spell_list => $::SPELL_LIST,
		170
		171	floorbox => $::FLOORBOX,
		172	help_window => $::HELP_WINDOW,
		173	message_window => $::MESSAGE_WINDOW,
		174	statusbox => $::SDTATUSBOX,
		175
		176	inv => $::INV,
		177	invr => $::INVR,
		178	invr_hb => $::INVR_HB,
		179	);
		180
		181	while (my ($id, $name) = each %ass) {
		182	$self->widget_associate (undef, $id => $wkw{$name})
		183	or warn "server failed to associate non-existent well-known widget $name\n";
		184	}
		185	});
		186
		187	# widget call
		188	$self->connect_ext (w_c => sub {
		189	my ($id, $rid, $method, @args) = @_;
		190
		191	my $w = $self->{widget}{$id}
		192	or return;
		193
		194	if ($rid) {
		195	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		196	} else {
		197	$w->$method (@args);
		198	}
		199	});
		200
		201	# widget set
		202	$self->connect_ext (w_s => sub {
		203	my ($id, $attr) = @_;
		204
		205	my $w = $self->{widget}{$id}
		206	or return;
		207
		208	for (my $i = 0; $i < $#$attr; $i += 2) {
		209	my ($member, $value) = @$attr[$i, $i+1];
		210	if (defined $value) {
		211	$w->{$member} = $value;
		212	} else {
		213	delete $w->{$member};
		214	}
		215	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		216	}
		217	});
		218
		219	# widget get
		220	$self->connect_ext (w_g => sub {
		221	my ($id, $rid, $attr) = @_;
		222
		223	my $w = $self->{widget}{$id}
		224	or return;
		225
		226	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		227	});
		228
		229	# message window
		230	$self->connect_ext (channel_info => sub {
		231	my ($info) = @_;
		232	$self->{channels}->{$info->{id}} = $info;
		233	$::MESSAGE_WINDOW->add_channel ($info);
		234	});
		235
		236	# destroy widgets on logout
		237	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		238	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		239	$_->destroy
		240	for values %{delete $ws->{w} \|\| {}};
		241	}
		242	});
46		243
47	$self->{map_widget}->add_command (@$_)	244	$self->{map_widget}->add_command (@$_)
48	for @$cmd_help;	245	for @cmd_help;
49		246
		247	{
		248	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		249	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		250	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		251	}
		252
		253	{
50	$self->{noface} = new_from_file CFPlus::Texture	254	$self->{noface} = my $tex = new_from_file CFPlus::Texture
51	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	255	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		256	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		257	}
52		258
53	$self->{open_container} = 0;	259	$self->{open_container} = 0;
54		260
55	# "global"
56	$self->{tilecache} = CFPlus::db_table "tilecache";
57	$self->{facemap} = CFPlus::db_table "facemap";
58
59	# per server	261	# per server
60	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	262	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61		263
62	$self	264	$self
		265	}
		266
		267	sub widget_associate {
		268	my ($self, $ws, $id, $widget) = @_;
		269
		270	if ($widget) {
		271	$widget->{s_id} = $id;
		272	$self->{widget}{$id} = $widget;
		273
		274	if ($ws) {
		275	$widget->{s_ws} = $ws;
		276	$self->{widgetset}{$ws}{w}{$id} = $widget;
		277	}
		278
		279	$widget->connect (on_destroy => sub {
		280	my ($widget) = @_;
		281
		282	delete $self->{widget}{$widget->{s_id}};
		283	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		284	if exists $widget->{s_ws};
		285	});
		286
		287	1
		288	} else {
		289	$self->send_exti_msg (w_e => $id, undef);
		290
		291	0
		292	}
		293	}
		294
		295	sub update_fx_want {
		296	my ($self) = @_;
		297
		298	$self->send_exti_msg (fx_want => {
		299	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		300	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		301	6 => 1, # FT_RSRC
		302	});
63	}	303	}
64		304
65	sub logprint {	305	sub logprint {
66	my ($self, @a) = @_;	306	my ($self, @a) = @_;
67		307
68	$self->{log_fh} \|\|= do {	308	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
69	my $path = "$Crossfire::VARDIR/log.$self->{host}";
70
71	open my $fh, ">>:utf8", $path
72	or die "Couldn't open logfile $path: $!";
73
74	$fh->autoflush (1);
75
76	$fh;
77	};
78
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84	print {$self->{log_fh}} "$ts ", @a, "\n";
85	}	309	}
86		310
87	sub _stat_numdiff {	311	sub _stat_numdiff {
88	my ($self, $name, $old, $new) = @_;	312	my ($self, $name, $old, $new) = @_;
89		313
…		…
222	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	446	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
223	$::GAUGES->{food} ->set_value ($fo, $fo_m);	447	$::GAUGES->{food} ->set_value ($fo, $fo_m);
224	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	448	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
225	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	449	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	450	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227	my $rng = $stats->{+CS_STAT_RANGE};	451	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
228	$rng =~ s/^Range: //; # thank you so much dear server	452	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
229	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
230	my $title = $stats->{+CS_STAT_TITLE};	453	my $title = $stats->{+CS_STAT_TITLE};
231	$title =~ s/^Player: //;	454	$title =~ s/^Player: //;
232	$::STATWIDS->{title} ->set_text ("Title: " . $title);	455	$::STATWIDS->{title} ->set_text ("Title: " . $title);
233		456
234	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	457	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
254	my @skills = keys %{ $self->{skill_info} };	477	my @skills = keys %{ $self->{skill_info} };
255		478
256	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	479	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
257	$sktbl->clear;	480	$sktbl->clear;
258		481
		482	my $sw = $self->{skillwid}{""} \|\|= [
259	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	483	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
260	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	484	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		485	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
261	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	486	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
262	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	487	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
263	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	488	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		489	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
264	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	490	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		491	];
		492
		493	my @add = @$sw;
265		494
266	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	495	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267		496
268	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	497	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	498	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270	my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271		499
272	my ($x, $y) = (0, 1);	500	my ($x, $y) = (0, 1);
273	for (	501	for (
274	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }	502	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275	map [$_, $self->{skill_info}{$_}],	503	map [$_, $self->{skill_info}{$_}],
…		…
284	if ($ev->{button} == 1) {	512	if ($ev->{button} == 1) {
285	$::CONN->user_send ("ready_skill $name");	513	$::CONN->user_send ("ready_skill $name");
286	} elsif ($ev->{button} == 2) {	514	} elsif ($ev->{button} == 2) {
287	$::CONN->user_send ("use_skill $name");	515	$::CONN->user_send ("use_skill $name");
288	} elsif ($ev->{button} == 3) {	516	} elsif ($ev->{button} == 3) {
		517	my $shortname = CFPlus::shorten $name, 14;
289	(new CFPlus::UI::Menu	518	(new CFPlus::UI::Menu
290	items => [	519	items => [
291	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	520	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	521	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293	],	522	],
294	)->popup ($ev);	523	)->popup ($ev);
295	} else {	524	} else {
296	return 0;	525	return 0;
297	}	526	}
298		527
299	1	528	1
300	};	529	};
301		530
302	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	531	my $sw = $self->{skillwid}{$idx} \|\|= [
		532	# exp
		533	(new CFPlus::UI::Label
303	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	534	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
304	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	535
		536	# level
		537	(new CFPlus::UI::Label
305	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	538	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		539
		540	# progress
		541	(new CFPlus::UI::ExperienceProgress),
		542
		543	# label
306	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);	544	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		545	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		546	];
		547
		548	push @add,
		549	$x * 4 + 0, $y, $sw->[0],
		550	$x * 4 + 1, $y, $sw->[1],
		551	$x * 4 + 2, $y, $sw->[2],
		552	$x * 4 + 3, $y, $sw->[3],
		553	;
307		554
308	$x++ and ($x, $y) = (0, $y + 1);	555	$x++ and ($x, $y) = (0, $y + 1);
309	}	556	}
		557
		558	$sktbl->add_at (@add);
310	}	559	}
311		560
312	for (grep exists $stats->{$_}, @skills) {	561	for (grep exists $stats->{$_}, @skills) {
		562	my $sw = $self->{skillwid}{$_};
313	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	563	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
314	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	564	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		565	$sw->[2]->set_value (@{$stats->{$_}});
		566	}
		567	}
		568
		569	sub macro_send {
		570	my ($self, $macro) = @_;
		571
		572	for my $cmd (@{ $macro->{action} }) {
		573	$self->send_command ($cmd);
315	}	574	}
316	}	575	}
317		576
318	sub user_send {	577	sub user_send {
319	my ($self, $command) = @_;	578	my ($self, $command) = @_;
320		579
		580	$self->{record}->($command)
321	if ($self->{record}) {	581	if $self->{record};
322	push @{$self->{record}}, $command;
323	}
324		582
325	$self->logprint ("send: ", $command);	583	$self->logprint ("send: ", $command);
326	$self->send_command ($command);	584	$self->send_command ($command);
327	::status ($command);	585	::status ($command);
328	}	586	}
329		587
330	sub start_record {	588	sub record {
331	my ($self) = @_;	589	my ($self, $cb) = @_;
332		590
333	$self->{record} = [];	591	$self->{record} = $cb;
334	}
335
336	sub stop_record {
337	my ($self) = @_;
338	return delete $self->{record};
339	}	592	}
340		593
341	sub map_scroll {	594	sub map_scroll {
342	my ($self, $dx, $dy) = @_;	595	my ($self, $dx, $dy) = @_;
343		596
…		…
345	}	598	}
346		599
347	sub feed_map1a {	600	sub feed_map1a {
348	my ($self, $data) = @_;	601	my ($self, $data) = @_;
349		602
350	$self->{map}->map1a_update ($data);	603	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		604	my $delay;
		605
		606	for my $tile (@$missing) {
		607	next if $self->{delay}{$tile};
		608
		609	$delay = 1;
		610
		611	if (my $tex = $::CONN->{texture}[$tile]) {
		612	$tex->upload;
		613	} else {
		614	$self->{delay}{$tile} = 1;
		615
		616	# we assume the face is in-flight and will eventually come
		617	push @{$self->{tile_cb}{$tile}}, sub {
		618	delete $self->{delay}{$tile};
		619	$_[0]->upload;
		620	};
		621	}
		622	}
		623
		624	if ($delay) {
		625	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		626	Event->timer (after => 0.03, cb => sub {
		627	$_[0]->w->cancel;
		628	$self->{map_widget}->update;
		629	});
		630	} else {
351	$self->{map_widget}->update;	631	$self->{map_widget}->update;
		632	}
352	}	633	}
353		634
354	sub magicmap {	635	sub magicmap {
355	my ($self, $w, $h, $x, $y, $data) = @_;	636	my ($self, $w, $h, $x, $y, $data) = @_;
356		637
…		…
363	my $map_info = delete $self->{map_info}	644	my $map_info = delete $self->{map_info}
364	or return;	645	or return;
365		646
366	my ($hash, $x, $y, $w, $h) = @$map_info;	647	my ($hash, $x, $y, $w, $h) = @$map_info;
367		648
368	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	649	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
369	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	650	$self->{map_cache_new}{$hash} = \$data;
370	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	651	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
371	}	652	}
372		653
373	sub map_clear {	654	sub map_clear {
374	my ($self) = @_;	655	my ($self) = @_;
375		656
…		…
378		659
379	$self->{map}->clear;	660	$self->{map}->clear;
380	delete $self->{map_widget}{magicmap};	661	delete $self->{map_widget}{magicmap};
381	}	662	}
382		663
		664	sub bg_fetch {
		665	my ($self) = @_;
		666
		667	my $tile;
		668
		669	do {
		670	$tile = pop @{$self->{bg_fetch}}
		671	or return;
		672	} while $self->{texture}[$tile];
		673
		674	CFPlus::DB::get tilecache => $tile, sub {
		675	my ($data) = @_;
		676
		677	return unless $self->{map}; # stop when destroyed
		678
		679	if (defined $data) {
		680	$self->have_tile ($tile, $data);
		681	$self->{texture}[$tile]->upload;
		682	}
		683
		684	$self->bg_fetch;
		685	};
		686	}
383		687
384	sub load_map($$$) {	688	sub load_map($$$) {
385	my ($self, $hash, $x, $y) = @_;	689	my ($self, $hash, $x, $y) = @_;
386		690
387	if (defined (my $data = $self->{mapcache}->get ($hash))) {	691	my $gen = $self->{map_change_gen};
		692
		693	my $cb = sub {
		694	return unless $gen == $self->{map_change_gen};
		695
		696	my ($data) = @_;
		697
		698	if (defined $data) {
		699	$self->{map_cache_new}{$hash} = \$data;
		700
388	$data = Compress::LZF::decompress $data;	701	my $data = Compress::LZF::decompress $data;
389	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391	my $data = $self->{tilecache}->get ($id)
392	or next;
393		702
394	$self->set_texture ($id => $data);	703	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		704	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		705	$self->bg_fetch unless $inprogress;
395	}	706	}
		707	};
		708
		709	if (my $rdata = $self->{map_cache_old}{$hash}) {
		710	$cb->($$rdata);
		711	} else {
		712	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
396	}	713	}
397	}	714	}
398		715
399	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	716	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400	# (server resource,s latency, bandwidth), so this hack is warranted.	717	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
465		782
466	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	783	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	784	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468		785
469	} else {	786	} else {
		787	my $gen = $self->{map_change_gen};
470	$self->send_mapinfo ("spatial $path$tile", sub {	788	$self->send_mapinfo ("spatial $path$tile", sub {
		789	return unless $gen == $self->{map_change_gen};
		790
471	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	791	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472		792
473	return if $mode ne "spatial";	793	return if $mode ne "spatial";
474		794
475	$x += $self->{map}->ox;	795	$x += $self->{map}->ox;
…		…
489		809
490	sub map_change {	810	sub map_change {
491	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	811	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492		812
493	$self->flush_map;	813	$self->flush_map;
		814
		815	++$self->{map_change_gen};
		816	$self->{map_cache_old} = delete $self->{map_cache_new};
494		817
495	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	818	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496		819
497	my $mapmapw = $self->{mapmap}->{w};	820	my $mapmapw = $self->{mapmap}->{w};
498	my $mapmaph = $self->{mapmap}->{h};	821	my $mapmaph = $self->{mapmap}->{h};
…		…
515	$self->load_map ($hash, $x, $y);	838	$self->load_map ($hash, $x, $y);
516	$self->flood_fill (0, 0, 0, "", $hash, $flags);	839	$self->flood_fill (0, 0, 0, "", $hash, $flags);
517	}	840	}
518		841
519	sub face_find {	842	sub face_find {
520	my ($self, $facenum, $face) = @_;	843	my ($self, $facenum, $face, $cb) = @_;
521		844
522	my $hash = "$face->{chksum},$face->{name}";	845	if ($face->{type} == 0) { # FT_FACE
		846	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
523		847
524	my $id = $self->{facemap}->get ($hash);
525
526	unless ($id) {
527	# create new id for face
528	# I love transactions
529	for (1..100) {
530	my $txn = $CFPlus::DB_ENV->txn_begin;
531	my $status = $self->{facemap}->db_get (id => $id);
532	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
533	$id = ($id \|\| 64) + 1;
534	if ($self->{facemap}->put (id => $id) == 0
535	&& $self->{facemap}->put ($hash => $id) == 0) {
536	$txn->txn_commit;
537
538	goto gotid;
539	}
540	}
541	$txn->txn_abort;
542	}
543
544	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545	}
546
547	gotid:
548	$face->{id} = $id;	848	$face->{id} = $id;
549	$self->{map}->set_face ($facenum => $id);	849	$self->{map}->set_tileid ($facenum => $id);
550	$self->{faceid}[$facenum] = $id;#d#
551		850
552	my $face = $self->{tilecache}->get ($id);	851	CFPlus::DB::get tilecache => $id, $cb;
553		852
554	if ($face) {	853	} elsif ($face->{type} & 1) { # with metadata
555	#$self->face_prefetch;	854	CFPlus::DB::get res_meta => $face->{name}, $cb;
556	$face	855
557	} else {	856	} else { # no metadata
558	my $tex = $self->{noface};	857	CFPlus::DB::get res_data => $face->{name}, $cb;
559	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560	undef
561	};	858	}
562	}	859	}
563		860
564	sub face_update {	861	sub face_update {
565	my ($self, $facenum, $face, $changed) = @_;	862	my ($self, $facenum, $face, $changed) = @_;
566		863
567	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	864	if ($face->{type} == 0) {
		865	# image, FT_FACE
		866	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		867	if $changed;
568		868
569	$self->set_texture ($face->{id} => delete $face->{image});	869	$self->have_tile ($face->{id}, delete $face->{data});
570	}
571		870
572	sub set_texture {	871	} elsif ($face->{type} & 1) {
		872	# split metadata case, FT_MUSIC, FT_SOUND
		873	if ($changed) { # new data
		874	my ($meta, $data) = unpack "(w/a)", $face->{data};
		875	$face->{data} = $meta;
		876
		877	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		878	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		879	}
		880
		881	$face->{data} = $self->{json_coder}->decode ($face->{data});
		882
		883	::add_license ($face);
		884
		885	if ($face->{type} == 3) { # FT_MUSIC
		886	::message ({ markup => "downloaded song #$facenum" })
		887	if $changed;
		888
		889	&::audio_music_push ($facenum);
		890	} elsif ($face->{type} == 5) { # FT_SOUND
		891	::message ({ markup => "downloaded sound #$facenum" })
		892	if $changed;
		893
		894	&::audio_sound_push ($facenum);
		895	}
		896
		897	} else {
		898	# flat resource case, FT_RSRC
		899	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		900	if $changed;
		901	}
		902
		903	if (my $cbs = $self->{face_cb}{$facenum}) {
		904	$_->($face, $changed) for @$cbs;
		905	}
		906	}
		907
		908	sub smooth_update {
		909	my ($self, $facenum, $face) = @_;
		910
		911	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		912	}
		913
		914	sub have_tile {
573	my ($self, $id, $data) = @_;	915	my ($self, $tile, $data) = @_;
574		916
575	$self->{texture}[$id] \|\|= do {	917	return unless $self->{map};
576	my $tex =	918
		919	my $tex = $self->{texture}[$tile] \|\|=
577	new_from_image CFPlus::Texture	920	new CFPlus::Texture
		921	tile => $tile,
		922	image => $data, delete_image => 1,
578	$data, minify => 1, mipmap => 1;	923	minify => 1, mipmap => 1;
579		924
580	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	925	if (my $cbs = delete $self->{tile_cb}{$tile}) {
581	$self->{map_widget}->update;	926	$_->($tex) for @$cbs;
582
583	$tex
584	};	927	}
		928	}
		929
		930	# call in non-void context registers a temporary
		931	# hook with handle, otherwise its permanent
		932	sub on_face_change {
		933	my ($self, $num, $cb) = @_;
		934
		935	push @{$self->{face_cb}{$num}}, $cb;
		936
		937	defined wantarray
		938	? CFPlus::guard {
		939	@{$self->{face_cb}{$num}}
		940	= grep $_ != $cb,
		941	@{$self->{face_cb}{$num}};
		942	}
		943	: ()
		944	}
		945
		946	# call in non-void context registers a temporary
		947	# hook with handle, otherwise its permanent
		948	sub register_face_handler {
		949	my ($self, $num, $cb) = @_;
		950
		951	return unless $num;
		952
		953	# invoke if available right now
		954	$cb->($self->{face}[$num], 0)
		955	unless exists $self->{face}[$num]{loading};
		956
		957	# future changes
		958	$self->on_face_change ($num => $cb)
585	}	959	}
586		960
587	sub sound_play {	961	sub sound_play {
588	my ($self, $x, $y, $soundnum, $type) = @_;	962	my ($self, $type, $face, $dx, $dy, $vol) = @_;
589		963
590	$self->{sound_play}->($x, $y, $soundnum, $type);	964	&::audio_sound_play ($face, $dx, $dy, $vol)
		965	unless $type & 1; # odd types are silent for future expansion
591	}	966	}
592		967
593	my $LAST_QUERY; # server is stupid, stupid, stupid	968	my $LAST_QUERY; # server is stupid, stupid, stupid
594		969
595	sub query {	970	sub query {
…		…
599	$LAST_QUERY = $prompt;	974	$LAST_QUERY = $prompt;
600		975
601	$self->{query}-> ($self, $flags, $prompt);	976	$self->{query}-> ($self, $flags, $prompt);
602	}	977	}
603		978
604	sub drawinfo {	979	sub sanitise_xml($) {
605	my ($self, $color, $text) = @_;	980	local $_ = shift;
606		981
607	my @color = (	982	# we now weed out all tags we do not support
		983	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		984	# now all entities
		985	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		986
		987	# handle some elements
		988	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		989	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		990
		991	$_
		992	}
		993
		994	our %NAME_TO_COLOR = (
		995	black => 0,
		996	white => 1,
		997	darkblue => 2,
		998	red => 3,
		999	orange => 4,
		1000	lightblue => 5,
		1001	darkorange => 6,
		1002	green => 7,
		1003	darkgreen => 8,
		1004	grey => 9,
		1005	brown => 10,
		1006	yellow => 11,
		1007	tan => 12,
		1008	);
		1009
		1010	our @CF_COLOR = (
608	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1011	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609	[1.00, 1.00, 1.00],	1012	[1.00, 1.00, 1.00],
610	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1013	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611	[1.00, 0.00, 0.00],	1014	[1.00, 0.00, 0.00],
612	[1.00, 0.54, 0.00],	1015	[1.00, 0.54, 0.00],
613	[0.11, 0.56, 1.00],	1016	[0.11, 0.56, 1.00],
614	[0.93, 0.46, 0.00],	1017	[0.93, 0.46, 0.00],
615	[0.18, 0.54, 0.34],	1018	[0.18, 0.54, 0.34],
616	[0.56, 0.73, 0.56],	1019	[0.56, 0.73, 0.56],
617	[0.80, 0.80, 0.80],	1020	[0.80, 0.80, 0.80],
618	[0.75, 0.61, 0.20],	1021	[0.75, 0.61, 0.20],
619	[0.99, 0.77, 0.26],	1022	[0.99, 0.77, 0.26],
620	[0.74, 0.65, 0.41],	1023	[0.74, 0.65, 0.41],
621	);	1024	);
622		1025
		1026	sub msg {
		1027	my ($self, $color, $type, $text, @extra) = @_;
		1028
		1029	$text = sanitise_xml $text;
		1030
		1031	if (my $cb = $self->{cb_msg}{$type}) {
		1032	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1033	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		1034	$type =~ s/-/_/g;
		1035	$self->{$type} = $text;
		1036	} else {
623	$self->logprint ("info: ", $text);	1037	$self->logprint ("msg: ", $text);
		1038	return if $color < 0; # negative color == ignore if not understood
624		1039
625	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	1040	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
626		1041
627	# try to create single paragraphs of multiple lines sent by the server	1042	## try to create single paragraphs of multiple lines sent by the server
		1043	# no longer neecssary with TRT servers
628	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1044	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
629		1045
630	$text = CFPlus::asxml $text;	1046	::message ({
631	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1047	fg => $fg,
632	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1048	markup => $_,
		1049	type => $type,
		1050	extra => [@extra],
		1051	color_flags => $color
		1052	}) for split /\n/, $text;
633		1053
634	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636	$self->{logview}->scroll_to_bottom;
637
638	$self->{statusbox}->add ($text,	1054	$self->{statusbox}->add ($text,
639	group => $text,	1055	group => $text,
640	fg => $color[$color],	1056	fg => $fg,
641	timeout => $color >= 2 ? 60 : 10,	1057	timeout => $color >= 2 ? 180 : 10,
642	tooltip_font => $::FONT_FIXED,	1058	tooltip_font => $::FONT_FIXED,
643	);	1059	);
644	}	1060	}
645
646	sub drawextinfo {
647	my ($self, $color, $type, $subtype, $message) = @_;
648
649	$self->drawinfo ($color, $message);
650	}	1061	}
651		1062
652	sub spell_add {	1063	sub spell_add {
653	my ($self, $spell) = @_;	1064	my ($self, $spell) = @_;
654		1065
655	# try to create single paragraphs out of the multiple lines sent by the server	1066	# try to create single paragraphs out of the multiple lines sent by the server
656	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1067	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657	$spell->{message} =~ s/\n+$//;	1068	$spell->{message} =~ s/\n+$//;
658	$spell->{message} \|\|= "Server did not provide a description for this spell.";	1069	$spell->{message} \|\|= "Server did not provide a description for this spell.";
659		1070
660	$::SPELL_PAGE->add_spell ($spell);	1071	$::SPELL_LIST->add_spell ($spell);
661		1072
662	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1073	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	1074	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664	}	1075	}
665		1076
666	sub spell_delete {	1077	sub spell_delete {
667	my ($self, $spell) = @_;	1078	my ($self, $spell) = @_;
668		1079
669	$::SPELL_PAGE->remove_spell ($spell);	1080	$::SPELL_LIST->remove_spell ($spell);
		1081	}
		1082
		1083	sub setup {
		1084	my ($self, $setup) = @_;
		1085
		1086	$self->{map_widget}->set_tilesize ($self->{tilesize});
		1087	$::MAP->resize ($self->{mapw}, $self->{maph});
670	}	1088	}
671		1089
672	sub addme_success {	1090	sub addme_success {
673	my ($self) = @_;	1091	my ($self) = @_;
674		1092
675	my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676	my ($pom) = @_;
677
678	my %skill_help;	1093	my %skill_help;
679		1094
680	for my $head2 ($pom->head1->[3]->head2) {	1095	for my $node (CFPlus::Pod::find skill_description => "*") {
681	$skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;	1096	my (undef, @par) = CFPlus::Pod::section_of $node;
682	}	1097	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684	\%skill_help
685	};	1098	};
686		1099
687	for my $skill (values %{$self->{skill_info}}) {	1100	for my $skill (values %{$self->{skill_info}}) {
688	$self->{map_widget}->add_command ("ready_skill $skill",	1101	$self->{map_widget}->add_command ("ready_skill $skill",
689	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1102	(CFPlus::asxml "Ready the skill '$skill'\n\n")
690	. $skill_help->{$skill});	1103	. $skill_help{$skill});
691	$self->{map_widget}->add_command ("use_skill $skill",	1104	$self->{map_widget}->add_command ("use_skill $skill",
692	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1105	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693	. $skill_help->{$skill});	1106	. $skill_help{$skill});
694	}	1107	}
695	}	1108	}
696		1109
697	sub eof {	1110	sub eof {
698	my ($self) = @_;	1111	my ($self) = @_;
699		1112
700	$self->{map_widget}->clr_commands;	1113	$self->{map_widget}->clr_commands;
701		1114
702	::stop_game ();	1115	::stop_game ();
703	}
704
705	sub image_info {
706	my ($self, $numfaces) = @_;
707
708	$self->{num_faces} = $numfaces;
709	$self->{face_prefetch} = [1 .. $numfaces];
710	$self->face_prefetch;
711	}
712
713	sub face_prefetch {
714	my ($self) = @_;
715
716	return unless $::CFG->{face_prefetch};
717
718	if ($self->{num_faces}) {
719	return if @{ $self->{send_queue} \|\| [] };
720	my $todo = @{ $self->{face_prefetch} }
721	or return;
722
723	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
724
725	$self->send ("requestinfo image_sums $face $face");
726
727	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
728	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
729	} elsif (!exists $self->{num_faces}) {
730	$self->send ("requestinfo image_info");
731
732	$self->{num_faces} = 0;
733
734	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
735	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
736	}
737	}	1116	}
738		1117
739	sub update_floorbox {	1118	sub update_floorbox {
740	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1119	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
741	return unless $::CONN;	1120	return unless $::CONN;
742		1121
743	$::FLOORBOX->clear;	1122	$::FLOORBOX->clear;
		1123
		1124	my @add;
744		1125
745	my $row;	1126	my $row;
746	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1127	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
747	if ($row < 6) {	1128	if ($row < 6) {
748	local $_->{face_widget}; # hack to force recreation of widget	1129	local $_->{face_widget}; # hack to force recreation of widget
749	local $_->{desc_widget}; # hack to force recreation of widget	1130	local $_->{desc_widget}; # hack to force recreation of widget
750	CFPlus::Item::update_widgets $_;	1131	CFPlus::Item::update_widgets $_;
751		1132
		1133	push @add,
752	$::FLOORBOX->add (0, $row, $_->{face_widget});	1134	0, $row, $_->{face_widget},
753	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1135	1, $row, $_->{desc_widget};
754		1136
755	$row++;	1137	$row++;
756	} else {	1138	} else {
757	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1139	push @add, 1, $row, new CFPlus::UI::Button
758	text => "More...",	1140	text => "More...",
759	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1141	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
760	);	1142	;
761	last;	1143	last;
762	}	1144	}
763	}	1145	}
764	if ($::CONN->{open_container}) {	1146	if ($::CONN->{open_container}) {
765	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1147	push @add, 1, $row++, new CFPlus::UI::Button
766	text => "Close container",	1148	text => "Close container",
767	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1149	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
768	);	1150	;
769	}	1151	}
770	});
771		1152
		1153	$::FLOORBOX->add_at (@add);
		1154	});
		1155
772	$::WANT_REFRESH++;	1156	$::WANT_REFRESH->start;
773	}	1157	}
774		1158
775	sub set_opencont {	1159	sub set_opencont {
776	my ($conn, $tag, $name) = @_;	1160	my ($conn, $tag, $name) = @_;
777	$conn->{open_container} = $tag;	1161	$conn->{open_container} = $tag;
778	update_floorbox;	1162	update_floorbox;
779		1163
780	$::INV_RIGHT_HB->clear ();	1164	$::INVR_HB->clear ();
781	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1165	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
782		1166
783	if ($tag != 0) { # Floor isn't closable, is it?	1167	if ($tag != 0) { # Floor isn't closable, is it?
784	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1168	$::INVR_HB->add (new CFPlus::UI::Button
785	text => "Close container",	1169	text => "Close container",
786	tooltip => "Close the currently open container (if one is open)",	1170	tooltip => "Close the currently open container (if one is open)",
787	on_activate => sub {	1171	on_activate => sub {
788	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1172	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
789	if $tag != 0;	1173	if $tag != 0;
790	#if $CONN->{open_container} != 0;
791	0	1174	0
792	},	1175	},
793	);	1176	);
794	}	1177	}
795		1178
…		…
885	$::SERVER_INFO->set_markup (	1268	$::SERVER_INFO->set_markup (
886	"server <tt>$self->{host}:$self->{port}</tt>\n"	1269	"server <tt>$self->{host}:$self->{port}</tt>\n"
887	. "protocol version <tt>$self->{version}</tt>\n"	1270	. "protocol version <tt>$self->{version}</tt>\n"
888	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1271	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1272	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1273	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1274	. "editing support $yesno[!!$self->{editor_support}]\n"
		1275	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1276	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1277	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1278	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892	. "map size $self->{mapw}×$self->{maph}\n"	1279	. "map size $self->{mapw}×$self->{maph}\n"
893	);	1280	);
		1281
894	}	1282	}
895		1283
896	sub logged_in {	1284	sub logged_in {
897	my ($self) = @_;	1285	my ($self) = @_;
898		1286
899	$self->send_ext_req (cfplus_support => "1", sub {	1287	$self->send_ext_req (cfplus_support => version => 2, sub {
		1288	my (%msg) = @_;
		1289
900	$self->{cfplus_ext} = $_[0];	1290	$self->{cfplus_ext} = $msg{version};
901	$self->update_server_info;	1291	$self->update_server_info;
		1292
		1293	if ($self->{cfplus_ext} >= 2) {
		1294	$self->send_ext_req ("editor_support", sub {
		1295	$self->{editor_support} = { @_ };
		1296	$self->update_server_info;
		1297
		1298	0
		1299	});
		1300	}
		1301
		1302	0
902	});	1303	});
903		1304
904	$self->update_server_info;	1305	$self->update_server_info;
905		1306
906	$self->send_command ("output-sync $::CFG->{output_sync}");	1307	$self->send_command ("output-sync $::CFG->{output_sync}");
907	$self->send_command ("output-count $::CFG->{output_count}");	1308	$self->send_command ("output-count $::CFG->{output_count}");
		1309	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908	$self->send_command ("pickup $::CFG->{pickup}");	1310	$self->send_command ("pickup $::CFG->{pickup}");
909	}	1311	}
910		1312
911	sub lookat {	1313	sub lookat {
912	my ($self, $x, $y) = @_;	1314	my ($self, $x, $y) = @_;
913		1315
914	if ($self->{cfplus_ext}) {	1316	if ($self->{cfplus_ext}) {
915	$self->send_ext_req (lookat => "$x $y", sub {	1317	$self->send_ext_req (lookat => $x, $y, sub {
916	my %res = split /\x00/, $_[0];	1318	my (%msg) = @_;
917		1319
918	if (exists $res{npc_dialog}) {	1320	if (exists $msg{npc_dialog}) {
919	# start npc chat dialog	1321	# start npc chat dialog
920	$self->{npc_dialog} = new CFPlus::NPCDialog::	1322	$self->{npc_dialog} = new CFPlus::NPCDialog::
921	dx => $x,	1323	token => $msg{npc_dialog},
922	dy => $y,
923	title => "$res{npc_dialog} (NPC)",	1324	title => "$msg{npc_dialog}[0] (NPC)",
924	conn => $self,	1325	conn => $self,
925	;	1326	;
926	}	1327	}
927	});	1328	});
928	}	1329	}
…		…
931	}	1332	}
932		1333
933	sub destroy {	1334	sub destroy {
934	my ($self) = @_;	1335	my ($self) = @_;
935		1336
936	$self->{npc_dialog}->destroy	1337	(delete $self->{npc_dialog})->destroy
937	if $self->{npc_dialog};	1338	if $self->{npc_dialog};
938		1339
939	$self->SUPER::destroy;	1340	$self->SUPER::destroy;
		1341
		1342	%$self = ();
940	}	1343	}
941		1344
942	package CFPlus::NPCDialog;	1345	package CFPlus::NPCDialog;
943		1346
944	our @ISA = 'CFPlus::UI::FancyFrame';	1347	our @ISA = 'CFPlus::UI::Toplevel';
945		1348
946	sub new {	1349	sub new {
947	my $class = shift;	1350	my $class = shift;
948		1351
949	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
…		…
956	kw => { hi => 0, yes => 0, no => 0 },	1359	kw => { hi => 0, yes => 0, no => 0 },
957	has_close_button => 1,	1360	has_close_button => 1,
958	@_,	1361	@_,
959	);	1362	);
960		1363
961	Scalar::Util::weaken (my $this = $self);	1364	CFPlus::weaken (my $this = $self);
962		1365
963	$self->connect (delete => sub { $this->destroy; 1 });	1366	$self->connect (delete => sub { $this->destroy; 1 });
964		1367
965	# better use a pane...	1368	# better use a pane...
966	$self->add (my $hbox = new CFPlus::UI::HBox);	1369	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
968		1371
969	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1372	$hbox->add (my $vbox = new CFPlus::UI::VBox);
970		1373
971	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1374	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1375	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
973	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1376	tooltip => "#npc_message_entry",
974	. "Sometimes you have to tell an NPC something you cannot find out during "
975	. "a normal conversation (such as a password). In those cases you have to use "
976	. "this text entry. You can also enter responses manually instead of using the response "
977	. "buttons below.",
978	on_activate => sub {	1377	on_activate => sub {
979	my ($entry, $text) = @_;	1378	my ($entry, $text) = @_;
980		1379
981	return unless $text =~ /\S/;	1380	return unless $text =~ /\S/;
982		1381
…		…
995	on_activate => sub { $this->destroy; 1 },	1394	on_activate => sub { $this->destroy; 1 },
996	;	1395	;
997		1396
998	$self->update_options;	1397	$self->update_options;
999		1398
1000	$self->{token} = $self->{conn}->ext_token;	1399	$self->{id} = "npc-channel-" . $self->{conn}->token;
1001	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1400	$self->{conn}->connect_ext ($self->{id} => sub {
1002	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1401	$this->feed (@_) if $this;
		1402	});
		1403
		1404	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1003		1405
1004	$self->{entry}->grab_focus;	1406	$self->{entry}->grab_focus;
1005		1407
1006	$self->{textview}->add_paragraph ({	1408	$self->{textview}->add_paragraph ({
1007	fg => [1, 1, 0, 1],	1409	fg => [1, 1, 0, 1],
…		…
1013	};	1415	};
1014		1416
1015	sub update_options {	1417	sub update_options {
1016	my ($self) = @_;	1418	my ($self) = @_;
1017		1419
1018	Scalar::Util::weaken $self;	1420	CFPlus::weaken $self;
1019		1421
1020	$self->{options}->clear;	1422	$self->{options}->clear;
1021	$self->{options}->add ($self->{bye_button});	1423	$self->{options}->add ($self->{bye_button});
1022		1424
1023	for my $kw (sort keys %{ $self->{kw} }) {	1425	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1030	);	1432	);
1031	}	1433	}
1032	}	1434	}
1033		1435
1034	sub feed {	1436	sub feed {
1035	my ($self, $data) = @_;	1437	my ($self, $type, @arg) = @_;
1036		1438
1037	Scalar::Util::weaken $self;	1439	CFPlus::weaken $self;
1038		1440
1039	my ($type, $msg) = split / /, $data, 2;
1040
1041	if ($type eq "msg") {	1441	if ($type eq "update") {
1042	my ($msg, @kw) = split /\x00/, $msg;	1442	my (%info) = @arg;
1043		1443
1044	utf8::decode $_ for ($msg, @kw);	1444	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
		1445	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1045		1446
1046	$self->{kw}{$_} = 1 for @kw;	1447	if (exists $info{msg}) {
1047		1448	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1048	$msg = "\n" . CFPlus::UI::asxml $msg;
1049	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1449	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050	my @link;	1450	my @link;
1051	$msg =~ s{	1451	$text =~ s{
1052	($match)	1452	($match)
1053	}{	1453	}{
1054	my $kw = $1;	1454	my $kw = $1;
1055		1455
1056	push @link, new CFPlus::UI::Label	1456	push @link, new CFPlus::UI::Label
1057	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",	1457	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1058	can_hover => 1,	1458	can_hover => 1,
1059	can_events => 1,	1459	can_events => 1,
1060	padding_x => 0,	1460	padding_x => 0,
1061	padding_y => 0,	1461	padding_y => 0,
1062	on_button_up => sub {	1462	on_button_up => sub {
1063	$self->send ($kw);	1463	$self->send ($kw);
1064	};	1464	};
1065		1465
1066	chr 0xfffc	1466	"\x{fffc}"
1067	}giex;	1467	}giex;
1068		1468
1069	$self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });	1469	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070	$self->{textview}->scroll_to_bottom;	1470	$self->{textview}->scroll_to_bottom;
		1471	}
		1472
1071	$self->update_options;	1473	$self->update_options;
1072	} else {	1474	} else {
1073	$self->destroy;	1475	$self->destroy;
1074	}	1476	}
1075		1477
…		…
1080	my ($self, $msg) = @_;	1482	my ($self, $msg) = @_;
1081		1483
1082	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1484	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083	$self->{textview}->scroll_to_bottom;	1485	$self->{textview}->scroll_to_bottom;
1084		1486
1085	utf8::encode $msg;
1086	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1487	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1087	}	1488	}
1088		1489
1089	sub destroy {	1490	sub destroy {
1090	my ($self) = @_;	1491	my ($self) = @_;
1091		1492
1092	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1493	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093		1494
		1495	if ($self->{conn}) {
1094	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};	1496	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1095	delete $self->{conn}{npc_dialog};	1497	delete $self->{conn}{npc_dialog};
1096	$self->{conn}->disconnect_ext ($self->{token});	1498	$self->{conn}->disconnect_ext ($self->{id});
		1499	}
1097		1500
1098	$self->SUPER::destroy;	1501	$self->SUPER::destroy;
1099	}	1502	}
1100		1503
1101	1	1504	1
		1505

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC