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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.161 by root, Wed Aug 22 16:52:34 2007 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC vs. Revision 1.161 by root, Wed Aug 22 16:52:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.161 by root, Wed Aug 22 16:52:34 2007 UTC