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

Diff Legend

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