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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.66 by root, Sun Jul 23 16:48:48 2006 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.66 by root, Sun Jul 23 16:48:48 2006 UTC vs. Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.66 by root, Sun Jul 23 16:48:48 2006 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC