ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.151 by root, Sun Aug 12 09:39:49 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 CFPlus;
		9	use CFPlus::DB;
8	use CFClient::UI;	10	use CFPlus::UI;
		11	use CFPlus::Pod;
		12	use CFPlus::Macro;
		13	use CFPlus::Item;
		14
		15	use Crossfire::Protocol::Base 0.95;
9		16
10	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
11		18
12	sub new {	19	sub new {
13	my $class = shift;	20	my ($class, %arg) = @_;
14		21
15	my $self = $class->SUPER::new (@_);	22	my $self = $class->SUPER::new (%arg,
		23	setup_req => {
		24	extmap => 1,
		25	excmd => 1,
		26	ywidget => 1,#d#
		27	%{$arg{setup_req} || {}},
		28	},
		29	);
16		30
17	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
18		32
19	my $parser = new Pod::POM;	33	my @cmd_help = map {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
21
22	for my $head2 ($pod->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
24	or next;	35	or die "unparseable command help: $_->{kw}[0]";
25		36
26	my $cmd = $1;	37	my $cmd = $1;
27	my @args = split /\|/, $2;	38	my @args = split /\|/, $2;
28	@args = (".*") unless @args;	39	@args = (".*") unless @args;
29		40
		41	my (undef, @par) = CFPlus::Pod::section_of $_;
		42	my $text = CFPlus::Pod::as_label @par;
		43
30	$_ = $_ eq ".*" ? "" : " $_"	44	$_ = $_ eq ".*" ? "" : " $_"
31	for @args;	45	for @args;
32		46
33	my $text = CFClient::pod_to_pango $head2->content;	47	map ["$cmd$_", $text],
34
35	$self->{map_widget}->add_command ("$cmd$_", $text)
36	for sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
37	@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);
38	}	56	});
39		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		63
		64	if (my $ts = $cap{tileset}) {
		65	if (my ($default) = grep $_->[2] & 1, @$ts) {
		66	$self->{tileset} = $default;
		67	$self->{tilesize} = $default->[3];
		68	$self->setup_req (tileset => $default->[0]);
		69
		70	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		71	my $h = int $self->{maph} * 32 / $self->{tilesize};
		72
		73	$self->setup_req (mapsize => "${w}x${h}");
		74	}
		75	}
		76	});
		77
		78	$self->{json_coder}
		79	->convert_blessed
		80	->filter_json_single_key_object (__w_ => sub {
		81	$self->{widget}{$_[0]}
		82	});
		83
		84	# widgetset new
		85	$self->connect_ext (ws_n => sub {
		86	my ($id) = @_;
		87
		88	$self->{widgetset}{$id} = {
		89	w => {},
		90	};
		91	});
		92
		93	# widgetset destroy
		94	$self->connect_ext (ws_d => sub {
		95	my ($id) = @_;
		96
		97	my $ws = delete $self->{widgetset}{$id}
		98	or return;
		99
		100	$_->destroy
		101	for values %{$ws->{w}};
		102	});
		103
		104	# widgetset create
		105	$self->connect_ext (ws_c => sub {
		106	my ($ws, $id, $class, $args) = @_;
		107
		108	for my $ev (grep /^on_/, keys %$args) {
		109	$args->{$ev} = sub {
		110	my $id = shift->{s_id};
		111	$self->send_exti_msg (w_e => $id, $ev, \@_);
		112
		113	1
		114	};
		115	}
		116
		117	if (my $widget = eval {
		118	local $SIG{__DIE__};
		119	"CFPlus::UI::$class"->new (
		120	%$args,
		121	s_ws => $ws,
		122	s_id => $id,
		123	)
		124	}
		125	) {
		126	$self->{widget}{$id}
		127	= $self->{widgetset}{$ws}{w}{$id}
		128	= $widget;
		129
		130	$widget->connect (on_destroy => sub {
		131	my ($widget) = @_;
		132
		133	delete $self->{widget}{$widget->{s_id}};
		134	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
		135	});
		136	} else {
		137	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		138	$self->send_exti_msg (w_e => $id, "destroy");
		139	}
		140	});
		141
		142	# widget call
		143	$self->connect_ext (w_c => sub {
		144	my ($id, $rid, $method, $args) = @_;
		145
		146	my $w = $self->{widget}{$id}
		147	or return;
		148
		149	$args ||= [];
		150
		151	if ($rid) {
		152	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
		153	} else {
		154	$w->$method (@$args);
		155	}
		156	});
		157
		158	# widget set
		159	$self->connect_ext (w_s => sub {
		160	my ($id, $attr) = @_;
		161
		162	my $w = $self->{widget}{$id}
		163	or return;
		164
		165	for (my $i = 0; $i < $#$attr; $i += 2) {
		166	my ($member, $value) = @$attr[$i, $i+1];
		167	if (defined $value) {
		168	$w->{$member} = $value;
		169	} else {
		170	delete $w->{$member};
		171	}
		172	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		173	}
		174	});
		175
		176	# widget get
		177	$self->connect_ext (w_g => sub {
		178	my ($id, $rid, $attr) = @_;
		179
		180	my $w = $self->{widget}{$id}
		181	or return;
		182
		183	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		184	});
		185
		186	# message window
		187	$self->connect_ext (channel_info => sub {
		188	my ($info) = @_;
		189	$self->{channels}->{$info->{id}} = $info;
		190	$::MESSAGE_WINDOW->add_channel ($info);
		191	});
		192
		193	# destroy widgets on logout
		194	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		195	for my $ws (values %{delete $self->{widgetset} || {}}) {
		196	$_->destroy
		197	for values %{delete $ws->{w} || {}};
		198	}
		199	});
		200
		201	$self->{map_widget}->add_command (@$_)
		202	for @cmd_help;
		203
		204	{
		205	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		206	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		207	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		208	}
		209
		210	{
40	$self->{noface} = new_from_file CFClient::Texture	211	$self->{noface} = my $tex = new_from_file CFPlus::Texture
41	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	212	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		213	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		214	}
42		215
43	$self->{open_container} = 0;	216	$self->{open_container} = 0;
44		217
45	# "global"
46	$self->{tilecache} = CFClient::db_table "tilecache";
47	$self->{facemap} = CFClient::db_table "facemap";
48
49	# per server	218	# per server
50	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	219	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
51		220
52	$self	221	$self
53	}	222	}
		223
		224	sub update_fx_want {
		225	my ($self) = @_;
		226
		227	$self->send_exti_msg (fx_want => {
		228	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		229	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		230	});
		231	}
		232
		233	sub logprint {
		234	my ($self, @a) = @_;
		235
		236	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
		237	}
		238
		239	sub _stat_numdiff {
		240	my ($self, $name, $old, $new) = @_;
		241
		242	my $diff = $new - $old;
		243
		244	$diff = 0.01 * int $diff * 100;
		245
		246	0.1 >= abs $diff ? ()
		247	: $diff < 0 ? "$name$diff" : "$name+$diff"
		248	}
		249
		250	sub _stat_skillmaskdiff {
		251	my ($self, $name, $old, $new) = @_;
		252
		253	my $diff = $old ^ $new
		254	or return;
		255
		256	my @diff = map
		257	{
		258	$diff & $_
		259	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		260	: ()
		261	}
		262	sort { $a <=> $b } keys %{$self->{spell_paths}};
		263
		264	join "", @diff
		265	}
		266
		267	# all stats that are chacked against changes
		268	my @statchange = (
		269	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		270	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		271	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		272	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		273	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		274	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		275	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		276	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		277	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		278	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		279	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		280	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		281	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		282	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		283	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		284	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		285	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		286	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		287	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		288	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		289	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		290	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		291	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		292	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		293	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		294	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		295	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		296	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		297	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		298	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		299	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		300	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		301	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		302	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		303	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		304	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		305	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		306	);
54		307
55	sub stats_update {	308	sub stats_update {
56	my ($self, $stats) = @_;	309	my ($self, $stats) = @_;
57		310
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	311	my $prev = $self->{prev_stats} || { };
59	my $diff = $exp - $self->{prev_exp};	312
		313	if (my @diffs =
		314	(
		315	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		316	map {
		317	$stats->{$_} && $prev->{$_}
		318	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		319	} sort { $a <=> $b } keys %{$self->{skill_info}}
		320	)
		321	) {
		322	my $msg = join " ", @diffs;
60	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	323	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61	if exists $self->{prev_exp} && $diff;
62	$self->{prev_exp} = $exp;
63	}	324	}
64		325
		326	if (
		327	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		328	) {
		329	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		330	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		331	}
		332
65	::update_stats_window ($stats);	333	$self->update_stats_window ($stats, $prev);
		334
		335	$self->{prev_stats} = { %$stats };
		336	}
		337
		338	my %RES_TBL = (
		339	phys => CS_STAT_RES_PHYS,
		340	magic => CS_STAT_RES_MAG,
		341	fire => CS_STAT_RES_FIRE,
		342	elec => CS_STAT_RES_ELEC,
		343	cold => CS_STAT_RES_COLD,
		344	conf => CS_STAT_RES_CONF,
		345	acid => CS_STAT_RES_ACID,
		346	drain => CS_STAT_RES_DRAIN,
		347	ghit => CS_STAT_RES_GHOSTHIT,
		348	pois => CS_STAT_RES_POISON,
		349	slow => CS_STAT_RES_SLOW,
		350	para => CS_STAT_RES_PARA,
		351	tund => CS_STAT_TURN_UNDEAD,
		352	fear => CS_STAT_RES_FEAR,
		353	depl => CS_STAT_RES_DEPLETE,
		354	deat => CS_STAT_RES_DEATH,
		355	holyw => CS_STAT_RES_HOLYWORD,
		356	blind => CS_STAT_RES_BLIND,
		357	);
		358
		359	sub update_stats_window {
		360	my ($self, $stats, $prev) = @_;
		361
		362	# I love text protocols...
		363
		364	my $hp = $stats->{+CS_STAT_HP} * 1;
		365	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		366	my $sp = $stats->{+CS_STAT_SP} * 1;
		367	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		368	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		369	my $fo_m = 999;
		370	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		371	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		372
		373	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		374	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		375	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		376	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		377	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		378	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		379	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
		380	my $title = $stats->{+CS_STAT_TITLE};
		381	$title =~ s/^Player: //;
		382	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		383
		384	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		385	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		386	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		387	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		388	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		389	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		390	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		391	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		392	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		393	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		394	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		395	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		396	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		397
		398	$self->update_weight;
		399
		400	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		401	for keys %RES_TBL;
		402
		403	my $sktbl = $::STATWIDS->{skill_tbl};
		404	my @skills = keys %{ $self->{skill_info} };
		405
		406	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		407	$sktbl->clear;
		408
		409	my @add;
		410
		411	push @add,
		412	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
		413	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		414	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		415	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
		416	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		417	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		418	;
		419
		420	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		421
		422	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		423	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		424
		425	my ($x, $y) = (0, 1);
		426	for (
		427	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		428	map [$_, $self->{skill_info}{$_}],
		429	grep exists $stats->{$_},
		430	@skills
		431	) {
		432	my ($idx, $name) = @$_;
		433
		434	my $spell_cb = sub {
		435	my ($widget, $ev) = @_;
		436
		437	if ($ev->{button} == 1) {
		438	$::CONN->user_send ("ready_skill $name");
		439	} elsif ($ev->{button} == 2) {
		440	$::CONN->user_send ("use_skill $name");
		441	} elsif ($ev->{button} == 3) {
		442	my $shortname = CFPlus::shorten $name, 14;
		443	(new CFPlus::UI::Menu
		444	items => [
		445	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
		446	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
		447	],
		448	)->popup ($ev);
		449	} else {
		450	return 0;
		451	}
		452
		453	1
		454	};
		455
		456	push @add,
		457	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		458	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
		459	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		460	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		461	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		462	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		463	;
		464
		465	$x++ and ($x, $y) = (0, $y + 1);
		466	}
		467
		468	$sktbl->add_at (@add);
		469	}
		470
		471	for (grep exists $stats->{$_}, @skills) {
		472	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		473	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		474	}
		475	}
		476
		477	sub macro_send {
		478	my ($self, $macro) = @_;
		479
		480	for my $cmd (@{ $macro->{action} }) {
		481	$self->send_command ($cmd);
		482	}
66	}	483	}
67		484
68	sub user_send {	485	sub user_send {
69	my ($self, $command) = @_;	486	my ($self, $command) = @_;
70		487
		488	$self->{record}->($command)
		489	if $self->{record};
		490
		491	$self->logprint ("send: ", $command);
71	$self->send_command ($command);	492	$self->send_command ($command);
72	::status $command;	493	::status ($command);
		494	}
		495
		496	sub record {
		497	my ($self, $cb) = @_;
		498
		499	$self->{record} = $cb;
73	}	500	}
74		501
75	sub map_scroll {	502	sub map_scroll {
76	my ($self, $dx, $dy) = @_;	503	my ($self, $dx, $dy) = @_;
77		504
…		…
79	}	506	}
80		507
81	sub feed_map1a {	508	sub feed_map1a {
82	my ($self, $data) = @_;	509	my ($self, $data) = @_;
83		510
84	$self->{map}->map1a_update ($data);	511	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		512	my $delay;
		513
		514	for my $tile (@$missing) {
		515	next if $self->{delay}{$tile};
		516
		517	$delay = 1;
		518
		519	if (my $tex = $::CONN->{texture}[$tile]) {
		520	$tex->upload;
		521	} else {
		522	$self->{delay}{$tile} = 1;
		523
		524	# we assume the face is in-flight and will eventually come
		525	push @{$self->{face_cb}{$tile}}, sub {
		526	delete $self->{delay}{$tile};
		527	$_[0]->upload;
		528	};
		529	}
		530	}
		531
		532	if ($delay) {
		533	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		534	Event->timer (after => 0.03, cb => sub {
		535	$_[0]->w->cancel;
		536	$self->{map_widget}->update;
		537	});
		538	} else {
85	$self->{map_widget}->update;	539	$self->{map_widget}->update;
		540	}
		541	}
		542
		543	sub magicmap {
		544	my ($self, $w, $h, $x, $y, $data) = @_;
		545
		546	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
86	}	547	}
87		548
88	sub flush_map {	549	sub flush_map {
89	my ($self) = @_;	550	my ($self) = @_;
90		551
…		…
92	or return;	553	or return;
93		554
94	my ($hash, $x, $y, $w, $h) = @$map_info;	555	my ($hash, $x, $y, $w, $h) = @$map_info;
95		556
96	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	557	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
97	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	558	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
98	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	559	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
99	}	560	}
100		561
101	sub map_clear {	562	sub map_clear {
102	my ($self) = @_;	563	my ($self) = @_;
103		564
104	$self->flush_map;	565	$self->flush_map;
105	delete $self->{neigh_map};	566	delete $self->{neigh_map};
106		567
107	$self->{map}->clear;	568	$self->{map}->clear;
		569	delete $self->{map_widget}{magicmap};
108	}	570	}
109		571
		572	sub bg_fetch {
		573	my ($self) = @_;
		574
		575	my $id;
		576
		577	do {
		578	$id = pop @{$self->{bg_fetch}}
		579	or return;
		580	} while $self->{texture}[$id];
		581
		582	CFPlus::DB::exists tilecache => $id, sub {
		583	my ($exists) = @_;
		584
		585	return unless $self->{map}; # stop when destroyed
		586
		587	if ($exists) {
		588	$self->have_tile ($id);
		589	$self->{texture}[$id]->upload;
		590	}
		591
		592	$self->bg_fetch;
		593	};
		594	}
110		595
111	sub load_map($$$) {	596	sub load_map($$$) {
112	my ($self, $hash, $x, $y) = @_;	597	my ($self, $hash, $x, $y) = @_;
113		598
114	if (defined (my $data = $self->{mapcache}->get ($hash))) {	599	my $gen = $self->{map_change_gen};
		600
		601	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		602	return unless $gen == $self->{map_change_gen};
		603
		604	my ($data) = @_;
		605
		606	if (defined $data) {
115	$data = Compress::LZF::decompress $data;	607	$data = Compress::LZF::decompress $data;
116	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	608	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
117	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
118	my $data = $self->{tilecache}->get ($id)
119	or next;
120		609
121	$self->set_texture ($id => $data);	610	my $inprogress = @{ $self->{bg_fetch} || [] };
		611	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		612	$self->bg_fetch unless $inprogress;
122	}	613	}
123	}	614	};
124	}	615	}
125		616
126	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	617	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
127	# (server resource,s latency, bandwidth), so this hack is warranted.	618	# (server resource,s latency, bandwidth), so this hack is warranted.
128	# the right fix is to make real tiled maps with an overview file	619	# the right fix is to make real tiled maps with an overview file
…		…
192		683
193	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	684	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
194	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	685	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
195		686
196	} else {	687	} else {
		688	my $gen = $self->{map_change_gen};
197	$self->send_mapinfo ("spatial $path$tile", sub {	689	$self->send_mapinfo ("spatial $path$tile", sub {
		690	return unless $gen == $self->{map_change_gen};
		691
198	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	692	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
199		693
200	return if $mode ne "spatial";	694	return if $mode ne "spatial";
201		695
202	$x += $self->{map}->ox;	696	$x += $self->{map}->ox;
…		…
216		710
217	sub map_change {	711	sub map_change {
218	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	712	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
219		713
220	$self->flush_map;	714	$self->flush_map;
		715
		716	++$self->{map_change_gen};
221		717
222	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	718	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
223		719
224	my $mapmapw = $self->{mapmap}->{w};	720	my $mapmapw = $self->{mapmap}->{w};
225	my $mapmaph = $self->{mapmap}->{h};	721	my $mapmaph = $self->{mapmap}->{h};
…		…
242	$self->load_map ($hash, $x, $y);	738	$self->load_map ($hash, $x, $y);
243	$self->flood_fill (0, 0, 0, "", $hash, $flags);	739	$self->flood_fill (0, 0, 0, "", $hash, $flags);
244	}	740	}
245		741
246	sub face_find {	742	sub face_find {
		743	my ($self, $facenum, $face, $cb) = @_;
		744
		745	if ($face->{type} == 0) { # FT_FACE
		746	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
		747
		748	$face->{id} = $id;
		749	$self->{faceid}[$facenum] = $id;
		750
		751	$self->{map}->set_tileid ($facenum => $id);
		752
		753	CFPlus::DB::get tilecache => $id, $cb;
		754
		755	} elsif ($face->{type} & 1) { # with metadata
		756	CFPlus::DB::get res_meta => $face->{name}, $cb;
		757	}
		758	}
		759
		760	sub face_update {
		761	my ($self, $facenum, $face, $changed) = @_;
		762
		763	if ($face->{type} == 0) { # FT_FACE
		764	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		765	if $changed;
		766
		767	$self->have_tile ($face->{id});
		768
		769	} elsif ($face->{type} & 1) { # split metadata
		770	if ($changed) { # new data
		771	my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
		772	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		773
		774	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		775	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		776	} else {
		777	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		778	}
		779
		780	::add_license ($face);
		781
		782	if ($face->{type} == 3) { # FT_MUSIC
		783	$self->{music_meta}{$facenum} = $face;
		784
		785	::message ({ markup => "downloaded song #$facenum" })
		786	if $changed;
		787
		788	&::audio_music_push ($facenum);
		789	} elsif ($face->{type} == 5) { # FT_SOUND
		790	$self->{sound_meta}{$facenum} = $face;
		791
		792	::message ({ markup => "downloaded sound #$facenum" })
		793	if $changed;
		794
		795	&::audio_sound_push ($facenum);
		796	}
		797
		798	}
		799	}
		800
		801	sub smooth_update {
247	my ($self, $facenum, $face) = @_;	802	my ($self, $facenum, $face) = @_;
248		803
249	my $hash = "$face->{chksum},$face->{name}";	804	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
250
251	my $id = $self->{facemap}->get ($hash);
252
253	unless ($id) {
254	# create new id for face
255	# I love transactions
256	for (1..100) {
257	my $txn = $CFClient::DB_ENV->txn_begin;
258	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);
259	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
260	$id = ($id || 16) + 1;
261	if ($self->{facemap}->put (id => $id) == 0
262	&& $self->{facemap}->put ($hash => $id) == 0) {
263	$txn->txn_commit;
264
265	goto gotid;
266	}
267	}
268	$txn->abort;
269	}
270
271	CFClient::fatal "maximum number of transaction retries reached - database problems?";
272	}
273
274	gotid:
275	$face->{id} = $id;
276	$self->{map}->set_face ($facenum => $id);
277	$self->{faceid}[$facenum] = $id;#d#
278
279	my $face = $self->{tilecache}->get ($id);
280
281	if ($face) {
282	#$self->face_prefetch;
283	$face
284	} else {
285	my $tex = $self->{noface};
286	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
287	undef
288	};
289	}	805	}
290		806
		807	sub have_tile {
		808	my ($self, $tile) = @_;
		809
		810	return unless $self->{map};
		811
		812	my $tex = $self->{texture}[$tile] ||=
		813	new CFPlus::Texture
		814	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		815
		816	$_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
		817	}
		818
291	sub face_update {	819	sub connect_face_update {
292	my ($self, $facenum, $face) = @_;
293
294	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
295
296	$self->set_texture ($face->{id} => delete $face->{image});
297	}
298
299	sub set_texture {
300	my ($self, $id, $data) = @_;	820	my ($self, $id, $cb) = @_;
301		821
302	$self->{texture}[$id] ||= do {	822	push @{$self->{face_cb}{$id}}, $cb;
303	my $tex =
304	new_from_image CFClient::Texture
305	$data, minify => 1, mipmap => 1;
306		823
307	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	824	CFPlus::guard {
308	$self->{map_widget}->update;	825	@{$self->{face_cb}{$id}}
309		826	= grep $_ != $cb,
310	$tex	827	@{$self->{face_cb}{$id}};
311	};	828	}
312	}	829	}
313		830
314	sub sound_play {	831	sub sound_play {
315	my ($self, $x, $y, $soundnum, $type) = @_;	832	my ($self, $type, $face, $dx, $dy, $vol) = @_;
316		833
317	$self->{sound_play}->($x, $y, $soundnum, $type);	834	&::audio_sound_play ($face, $dx, $dy, $vol)
		835	unless $type & 1; # odd types are silent for future expansion
318	}	836	}
319		837
320	my $LAST_QUERY; # server is stupid, stupid, stupid	838	my $LAST_QUERY; # server is stupid, stupid, stupid
321		839
322	sub query {	840	sub query {
323	my ($self, $flags, $prompt) = @_;	841	my ($self, $flags, $prompt) = @_;
324		842
325	$prompt = $LAST_QUERY unless length $prompt;	843	$prompt = $LAST_QUERY unless length $prompt;
326	$LAST_QUERY = $prompt;	844	$LAST_QUERY = $prompt;
327		845
328	my $dialog = new CFClient::UI::FancyFrame	846	$self->{query}-> ($self, $flags, $prompt);
329	title => "Query",	847	}
330	child => my $vbox = new CFClient::UI::VBox;
331		848
332	$vbox->add (new CFClient::UI::Label	849	sub sanitise_xml($) {
333	max_w => $::WIDTH * 0.4,	850	local $_ = shift;
334	ellipsise => 0,
335	text => $prompt);
336		851
337	if ($flags & CS_QUERY_YESNO) {	852	# we now weed out all tags we do not support
338	$vbox->add (my $hbox = new CFClient::UI::HBox);	853	s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
339	$hbox->add (new CFClient::UI::Button	854	# now all entities
340	text => "No",	855	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
341	connect_activate => sub {	856
342	$self->send ("reply n");	857	# handle some elements
343	$dialog->destroy;	858	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
344	$self->{map_widget}->focus_in;	859	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
345	}	860
		861	$_
		862	}
		863
		864	our %NAME_TO_COLOR = (
		865	black => 0,
		866	white => 1,
		867	darkblue => 2,
		868	red => 3,
		869	orange => 4,
		870	lightblue => 5,
		871	darkorange => 6,
		872	green => 7,
		873	darkgreen => 8,
		874	grey => 9,
		875	brown => 10,
		876	yellow => 11,
		877	tan => 12,
		878	);
		879
		880	our @CF_COLOR = (
		881	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		882	[1.00, 1.00, 1.00],
		883	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
		884	[1.00, 0.00, 0.00],
		885	[1.00, 0.54, 0.00],
		886	[0.11, 0.56, 1.00],
		887	[0.93, 0.46, 0.00],
		888	[0.18, 0.54, 0.34],
		889	[0.56, 0.73, 0.56],
		890	[0.80, 0.80, 0.80],
		891	[0.75, 0.61, 0.20],
		892	[0.99, 0.77, 0.26],
		893	[0.74, 0.65, 0.41],
		894	);
		895
		896	sub msg {
		897	my ($self, $color, $type, $text, @extra) = @_;
		898
		899	$text = sanitise_xml $text;
		900
		901	if (my $cb = $self->{cb_msg}{$type}) {
		902	$_->($self, $color, $type, $text, @extra) for values %$cb;
		903	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		904	$type =~ s/-/_/g;
		905	$self->{$type} = $text;
		906	} else {
		907	$self->logprint ("msg: ", $text);
		908	return if $color < 0; # negative color == ignore if not understood
		909
		910	my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
		911
		912	## try to create single paragraphs of multiple lines sent by the server
		913	# no longer neecssary with TRT servers
		914	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
		915
		916	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
		917	for split /\n/, $text;
		918
		919	$self->{statusbox}->add ($text,
		920	group => $text,
		921	fg => $fg,
		922	timeout => $color >= 2 ? 180 : 10,
		923	tooltip_font => $::FONT_FIXED,
346	);	924	);
347	$hbox->add (new CFClient::UI::Button
348	text => "Yes",
349	connect_activate => sub {
350	$self->send ("reply y");
351	$dialog->destroy;
352	},
353	);
354
355	$dialog->focus_in;
356
357	} elsif ($flags & CS_QUERY_SINGLECHAR) {
358	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
359	$vbox->add (my $entry = new CFClient::UI::Entry
360	connect_changed => sub {
361	$self->send ("reply $_[1]");
362	$dialog->destroy;
363	},
364	);
365
366	$entry->focus_in;
367
368	} else {
369	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
370
371	$vbox->add (my $entry = new CFClient::UI::Entry
372	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
373	connect_activate => sub {
374	$self->send ("reply $_[1]");
375	$dialog->destroy;
376	},
377	);
378
379	$entry->focus_in;
380	}	925	}
381
382	$dialog->show_centered;
383	}
384
385	sub drawinfo {
386	my ($self, $color, $text) = @_;
387
388	my @color = (
389	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
390	[1.00, 1.00, 1.00],
391	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
392	[1.00, 0.00, 0.00],
393	[1.00, 0.54, 0.00],
394	[0.11, 0.56, 1.00],
395	[0.93, 0.46, 0.00],
396	[0.18, 0.54, 0.34],
397	[0.56, 0.73, 0.56],
398	[0.80, 0.80, 0.80],
399	[0.55, 0.41, 0.13],
400	[0.99, 0.77, 0.26],
401	[0.74, 0.65, 0.41],
402	);
403
404	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
405
406	$text = CFClient::UI::Label::escape $text;
407	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409
410	$self->{logview}->add_paragraph ($color[$color],
411	join "\n", map "$time $_", split /\n/, $text);
412
413	$self->{statusbox}->add ($text,
414	group => $text,
415	fg => $color[$color],
416	timeout => 10,
417	tooltip_font => $::FONT_FIXED,
418	);
419	}
420
421	sub drawextinfo {
422	my ($self, $color, $type, $subtype, $message) = @_;
423
424	$self->drawinfo ($color, $message);
425	}	926	}
426		927
427	sub spell_add {	928	sub spell_add {
428	my ($self, $spell) = @_;	929	my ($self, $spell) = @_;
429		930
430	# TODO	931	# try to create single paragraphs out of the multiple lines sent by the server
431	# create a widget dynamically, using spell face (CF::Protocol downloads them)	932	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		933	$spell->{message} =~ s/\n+$//;
		934	$spell->{message} ||= "Server did not provide a description for this spell.";
		935
		936	$::SPELL_LIST->add_spell ($spell);
		937
432	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	938	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
433	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	939	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
434	}	940	}
435		941
436	sub spell_delete {	942	sub spell_delete {
437	my ($self, $spell) = @_;	943	my ($self, $spell) = @_;
		944
		945	$::SPELL_LIST->remove_spell ($spell);
		946	}
		947
		948	sub setup {
		949	my ($self, $setup) = @_;
		950
		951	$self->{map_widget}->set_tilesize ($self->{tilesize});
		952	$::MAP->resize ($self->{mapw}, $self->{maph});
438	}	953	}
439		954
440	sub addme_success {	955	sub addme_success {
441	my ($self) = @_;	956	my ($self) = @_;
442		957
443	$self->send ("command output-sync $::CFG->{output_sync}");
444	$self->send ("command output-count $::CFG->{output_count}");
445
446	my $parser = new Pod::POM;
447	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449	my %skill_tooltip;	958	my %skill_help;
450		959
451	for my $head2 ($pod->head1->[-2]->head2) {	960	for my $node (CFPlus::Pod::find skill_description => "*") {
452	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	961	my (undef, @par) = CFPlus::Pod::section_of $node;
		962	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
453	}	963	};
454		964
455	for my $skill (values %{$self->{skill_info}}) {	965	for my $skill (values %{$self->{skill_info}}) {
456	$self->{map_widget}->add_command ("ready_skill $skill",	966	$self->{map_widget}->add_command ("ready_skill $skill",
457	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	967	(CFPlus::asxml "Ready the skill '$skill'\n\n")
458	. $skill_tooltip{$skill});	968	. $skill_help{$skill});
459	$self->{map_widget}->add_command ("use_skill $skill",	969	$self->{map_widget}->add_command ("use_skill $skill",
460	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	970	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
461	. $skill_tooltip{$skill});	971	. $skill_help{$skill});
462	}	972	}
463	}	973	}
464		974
465	sub eof {	975	sub eof {
466	my ($self) = @_;	976	my ($self) = @_;
…		…
468	$self->{map_widget}->clr_commands;	978	$self->{map_widget}->clr_commands;
469		979
470	::stop_game ();	980	::stop_game ();
471	}	981	}
472		982
473	sub image_info {
474	my ($self, $numfaces) = @_;
475
476	$self->{num_faces} = $numfaces;
477	$self->{face_prefetch} = [1 .. $numfaces];
478	$self->face_prefetch;
479	}
480
481	sub face_prefetch {
482	my ($self) = @_;
483
484	return unless $::CFG->{face_prefetch};
485
486	if ($self->{num_faces}) {
487	return if @{ $self->{send_queue} || [] };
488	my $todo = @{ $self->{face_prefetch} }
489	or return;
490
491	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492
493	$self->send ("requestinfo image_sums $face $face");
494
495	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
497	} elsif (!exists $self->{num_faces}) {
498	$self->send ("requestinfo image_info");
499
500	$self->{num_faces} = 0;
501
502	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
504	}
505	}
506
507	sub update_floorbox {	983	sub update_floorbox {
508	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	984	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
509	return unless $::CONN;	985	return unless $::CONN;
510		986
511	$::FLOORBOX->clear;	987	$::FLOORBOX->clear;
512		988
		989	my @add;
		990
513	my $row;	991	my $row;
514	for (@{ $::CONN->{container}{0} }) {	992	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
515	if ($row < 7) {	993	if ($row < 6) {
516	local $_->{face_widget}; # hack to force recreation of widget	994	local $_->{face_widget}; # hack to force recreation of widget
517	local $_->{desc_widget}; # hack to force recreation of widget	995	local $_->{desc_widget}; # hack to force recreation of widget
518	CFClient::Item::update_widgets $_;	996	CFPlus::Item::update_widgets $_;
519		997
		998	push @add,
520	$::FLOORBOX->add (0, $row, $_->{face_widget});	999	0, $row, $_->{face_widget},
521	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1000	1, $row, $_->{desc_widget};
522		1001
523	$row++;	1002	$row++;
524	} else {	1003	} else {
525	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	1004	push @add, 1, $row, new CFPlus::UI::Button
		1005	text => "More...",
		1006	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		1007	;
526	last;	1008	last;
527	}	1009	}
528	}	1010	}
		1011	if ($::CONN->{open_container}) {
		1012	push @add, 1, $row++, new CFPlus::UI::Button
		1013	text => "Close container",
		1014	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		1015	;
		1016	}
		1017
		1018	$::FLOORBOX->add_at (@add);
529	});	1019	});
530		1020
531	$::WANT_REFRESH++;	1021	$::WANT_REFRESH->start;
532	}	1022	}
533		1023
534	sub set_opencont {	1024	sub set_opencont {
535	my ($conn, $tag, $name) = @_;	1025	my ($conn, $tag, $name) = @_;
536	$conn->{open_container} = $tag;	1026	$conn->{open_container} = $tag;
537	$::INVR_LBL->set_text ($name);	1027	update_floorbox;
		1028
		1029	$::INV_RIGHT_HB->clear ();
		1030	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
		1031
		1032	if ($tag != 0) { # Floor isn't closable, is it?
		1033	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
		1034	text => "Close container",
		1035	tooltip => "Close the currently open container (if one is open)",
		1036	on_activate => sub {
		1037	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
		1038	if $tag != 0;
		1039	#if $CONN->{open_container} != 0;
		1040	0
		1041	},
		1042	);
		1043	}
		1044
538	$::INVR->set_items ($conn->{container}{$tag});	1045	$::INVR->set_items ($conn->{container}{$tag});
539	}	1046	}
540		1047
541	sub update_container {	1048	sub update_containers {
542	my ($tag) = @_;	1049	my ($self) = @_;
543		1050
544	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	1051	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		1052	my $todo = delete $self->{update_container}
		1053	or return;
		1054
		1055	for my $tag (keys %$todo) {
		1056	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		1057	if ($tag == 0) {
		1058	$::INVR->set_items ($self->{container}{0})
545	if $tag == $::CONN->{open_container};	1059	if $tag == $self->{open_container};
		1060	} elsif ($tag == $self->{player}{tag}) {
		1061	$::INV->set_items ($self->{container}{$tag})
		1062	} else {
		1063	$::INVR->set_items ($self->{container}{$tag})
		1064	if $tag == $self->{open_container};
		1065	}
		1066	}
		1067	});
546	}	1068	}
547		1069
548	sub container_add {	1070	sub container_add {
549	my ($self, $tag, $items) = @_;	1071	my ($self, $tag, $items) = @_;
550		1072
551	#d# print "container_add: container $tag ($self->{player}{tag})\n";	1073	$self->{update_container}{$tag}++;
552		1074	$self->update_containers;
553	if ($tag == 0) {
554	update_floorbox;
555	update_container (0);
556	} elsif ($tag == $self->{player}{tag}) {
557	$::INV->set_items ($self->{container}{$self->{player}{tag}})
558	} else {
559	update_container ($tag);
560	}
561
562	# $self-<{player}{tag} => player inv
563	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
564	}	1075	}
565		1076
566	sub container_clear {	1077	sub container_clear {
567	my ($self, $tag) = @_;	1078	my ($self, $tag) = @_;
568		1079
569	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	1080	$self->{update_container}{$tag}++;
570		1081	$self->update_containers;
571	if ($tag == 0) {
572	update_floorbox;
573	update_container (0);
574	} elsif ($tag == $self->{player}{tag}) {
575	$::INV->set_items ($self->{container}{$tag})
576	}
577
578	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579	}	1082	}
580		1083
581	sub item_delete {	1084	sub item_delete {
582	my ($self, @items) = @_;	1085	my ($self, @items) = @_;
583		1086
		1087	$self->{update_container}{$_->{container}}++
584	for (@items) {	1088	for @items;
585	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
586
587	if ($_->{container} == 0) {
588	update_floorbox;
589	update_container ($_->{tag});
590	} elsif ($_->{container} == $self->{player}{tag}) {
591	$::INV->set_items ($self->{container}{$self->{player}{tag}})
592	} else {
593	update_container ($_->{tag});
594	}
595	}	1089
		1090	$self->update_containers;
596	}	1091	}
597		1092
598	sub item_update {	1093	sub item_update {
599	my ($self, $item) = @_;	1094	my ($self, $item) = @_;
600		1095
601	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1096	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
602		1097
603	if ($item->{tag} == $self->{player}{tag}) {
604	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
605	return;
606	}
607
608	CFClient::Item::update_widgets $item;	1098	CFPlus::Item::update_widgets $item;
609		1099
610	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1100	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
611	set_opencont ($::CONN, 0, "Floor");	1101	set_opencont ($::CONN, 0, "Floor");
612		1102
613	} elsif ($item->{flags} & F_OPEN) {	1103	} elsif ($item->{flags} & F_OPEN) {
614	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	1104	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		1105
615	} else {	1106	} else {
616	if ($item->{container} == 0) {	1107	$self->{update_container}{$item->{container}}++;
617	update_floorbox;
618	update_container (0);	1108	$self->update_containers;
619	} elsif ($item->{container} == $self->{player}{tag}) {
620	$::INV->set_items ($self->{container}{$item->{container}})
621	}
622	}	1109	}
623	}	1110	}
624		1111
625	sub player_update {	1112	sub player_update {
626	my ($self, $player) = @_;	1113	my ($self, $player) = @_;
		1114
		1115	$self->update_weight;
		1116	}
		1117
		1118	sub update_weight {
		1119	my ($self) = @_;
		1120
		1121	my $weight = .001 * $self->{player}{weight};
		1122	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		1123
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	1124	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		1125	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		1126	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
628	}	1127	}
629		1128
630	1;	1129	sub update_server_info {
		1130	my ($self) = @_;
		1131
		1132	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		1133
		1134	$::SERVER_INFO->set_markup (
		1135	"server <tt>$self->{host}:$self->{port}</tt>\n"
		1136	. "protocol version <tt>$self->{version}</tt>\n"
		1137	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		1138	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1139	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1140	. "editing support $yesno[!!$self->{editor_support}]\n"
		1141	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1142	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
		1143	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		1144	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		1145	. "map size $self->{mapw}×$self->{maph}\n"
		1146	);
		1147
		1148	}
		1149
		1150	sub logged_in {
		1151	my ($self) = @_;
		1152
		1153	$self->send_ext_req (cfplus_support => version => 2, sub {
		1154	my (%msg) = @_;
		1155
		1156	$self->{cfplus_ext} = $msg{version};
		1157	$self->update_server_info;
		1158
		1159	if ($self->{cfplus_ext} >= 2) {
		1160	$self->send_ext_req ("editor_support", sub {
		1161	$self->{editor_support} = { @_ };
		1162	$self->update_server_info;
		1163
		1164	0
		1165	});
		1166	}
		1167
		1168	0
		1169	});
		1170
		1171	$self->update_server_info;
		1172
		1173	$self->send_command ("output-sync $::CFG->{output_sync}");
		1174	$self->send_command ("output-count $::CFG->{output_count}");
		1175	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
		1176	$self->send_command ("pickup $::CFG->{pickup}");
		1177	}
		1178
		1179	sub lookat {
		1180	my ($self, $x, $y) = @_;
		1181
		1182	if ($self->{cfplus_ext}) {
		1183	$self->send_ext_req (lookat => $x, $y, sub {
		1184	my (%msg) = @_;
		1185
		1186	if (exists $msg{npc_dialog}) {
		1187	# start npc chat dialog
		1188	$self->{npc_dialog} = new CFPlus::NPCDialog::
		1189	token => $msg{npc_dialog},
		1190	title => "$msg{npc_dialog}[0] (NPC)",
		1191	conn => $self,
		1192	;
		1193	}
		1194	});
		1195	}
		1196
		1197	$self->send ("lookat $x $y");
		1198	}
		1199
		1200	sub destroy {
		1201	my ($self) = @_;
		1202
		1203	(delete $self->{npc_dialog})->destroy
		1204	if $self->{npc_dialog};
		1205
		1206	$self->SUPER::destroy;
		1207
		1208	%$self = ();
		1209	}
		1210
		1211	package CFPlus::NPCDialog;
		1212
		1213	our @ISA = 'CFPlus::UI::Toplevel';
		1214
		1215	sub new {
		1216	my $class = shift;
		1217
		1218	my $self = $class->SUPER::new (
		1219	x => 'center',
		1220	y => 'center',
		1221	name => "npc_dialog",
		1222	force_w => $::WIDTH * 0.7,
		1223	force_h => $::HEIGHT * 0.7,
		1224	title => "NPC Dialog",
		1225	kw => { hi => 0, yes => 0, no => 0 },
		1226	has_close_button => 1,
		1227	@_,
		1228	);
		1229
		1230	CFPlus::weaken (my $this = $self);
		1231
		1232	$self->connect (delete => sub { $this->destroy; 1 });
		1233
		1234	# better use a pane...
		1235	$self->add (my $hbox = new CFPlus::UI::HBox);
		1236	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
		1237
		1238	$hbox->add (my $vbox = new CFPlus::UI::VBox);
		1239
		1240	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
		1241	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
		1242	tooltip => "#npc_message_entry",
		1243	on_activate => sub {
		1244	my ($entry, $text) = @_;
		1245
		1246	return unless $text =~ /\S/;
		1247
		1248	$entry->set_text ("");
		1249	$this->send ($text);
		1250
		1251	0
		1252	},
		1253	);
		1254
		1255	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
		1256
		1257	$self->{bye_button} = new CFPlus::UI::Button
		1258	text => "Bye (close)",
		1259	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		1260	on_activate => sub { $this->destroy; 1 },
		1261	;
		1262
		1263	$self->update_options;
		1264
		1265	$self->{id} = "npc-channel-" . $self->{conn}->token;
		1266	$self->{conn}->connect_ext ($self->{id} => sub {
		1267	$this->feed (@_) if $this;
		1268	});
		1269
		1270	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
		1271
		1272	$self->{entry}->grab_focus;
		1273
		1274	$self->{textview}->add_paragraph ({
		1275	fg => [1, 1, 0, 1],
		1276	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1277	});
		1278
		1279	$self->show;
		1280	$self
		1281	};
		1282
		1283	sub update_options {
		1284	my ($self) = @_;
		1285
		1286	CFPlus::weaken $self;
		1287
		1288	$self->{options}->clear;
		1289	$self->{options}->add ($self->{bye_button});
		1290
		1291	for my $kw (sort keys %{ $self->{kw} }) {
		1292	$self->{options}->add (new CFPlus::UI::Button
		1293	text => $kw,
		1294	on_activate => sub {
		1295	$self->send ($kw);
		1296	0
		1297	},
		1298	);
		1299	}
		1300	}
		1301
		1302	sub feed {
		1303	my ($self, $type, @arg) = @_;
		1304
		1305	CFPlus::weaken $self;
		1306
		1307	if ($type eq "update") {
		1308	my (%info) = @arg;
		1309
		1310	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
		1311	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
		1312
		1313	if (exists $info{msg}) {
		1314	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1315	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1316	my @link;
		1317	$text =~ s{
		1318	($match)
		1319	}{
		1320	my $kw = $1;
		1321
		1322	push @link, new CFPlus::UI::Label
		1323	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1324	can_hover => 1,
		1325	can_events => 1,
		1326	padding_x => 0,
		1327	padding_y => 0,
		1328	on_button_up => sub {
		1329	$self->send ($kw);
		1330	};
		1331
		1332	"\x{fffc}"
		1333	}giex;
		1334
		1335	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1336	$self->{textview}->scroll_to_bottom;
		1337	}
		1338
		1339	$self->update_options;
		1340	} else {
		1341	$self->destroy;
		1342	}
		1343
		1344	1
		1345	}
		1346
		1347	sub send {
		1348	my ($self, $msg) = @_;
		1349
		1350	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
		1351	$self->{textview}->scroll_to_bottom;
		1352
		1353	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
		1354	}
		1355
		1356	sub destroy {
		1357	my ($self) = @_;
		1358
		1359	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1360
		1361	if ($self->{conn}) {
		1362	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
		1363	delete $self->{conn}{npc_dialog};
		1364	$self->{conn}->disconnect_ext ($self->{id});
		1365	}
		1366
		1367	$self->SUPER::destroy;
		1368	}
		1369
		1370	1
		1371

Diff Legend

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