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.46 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

1	package CFClient::Protocol;	1	package CFPlus::Protocol;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFClient;	8	use CFPlus;
		9	use CFPlus::DB;
9	use CFClient::UI;	10	use CFPlus::UI;
		11	use CFPlus::Pod;
		12	use CFPlus::Macro;
		13	use CFPlus::Item;
		14
		15	use Crossfire::Protocol::Base 0.95;
10		16
11	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
12		18
13	our %open_logs;
14
15	sub new {	19	sub new {
16	my $class = shift;	20	my ($class, %arg) = @_;
17		21
18	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	);
19		30
20	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
21		32
22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	33	my @cmd_help = map {
23	my ($pom) = @_;
24
25	my @cmd_help;
26
27	for my $head2 ($pom->head1->[-2]->head2) {
28	$head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
29	or next;	35	or die "unparseable command help: $_->{kw}[0]";
30		36
31	my $cmd = $1;	37	my $cmd = $1;
32	my @args = split /\|/, $2;	38	my @args = split /\|/, $2;
33	@args = (".*") unless @args;	39	@args = (".*") unless @args;
34		40
		41	my (undef, @par) = CFPlus::Pod::section_of $_;
		42	my $text = CFPlus::Pod::as_label @par;
		43
35	$_ = $_ eq ".*" ? "" : " $_"	44	$_ = $_ eq ".*" ? "" : " $_"
36	for @args;	45	for @args;
37		46
38	my $text = CFClient::pod_to_pango $head2->content;	47	map ["$cmd$_", $text],
39
40	push @cmd_help, ["$cmd$_", $text]
41	for sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
42	@args;	49	@args
		50	} sort { $a->{par} <=> $b->{par} }
		51	CFPlus::Pod::find command => "*";
		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		63
		64	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 => {},
43	}	90	};
44
45	\@cmd_help
46	};	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	});
47		200
48	$self->{map_widget}->add_command (@$_)	201	$self->{map_widget}->add_command (@$_)
49	for @$cmd_help;	202	for @cmd_help;
50		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	{
51	$self->{noface} = new_from_file CFClient::Texture	211	$self->{noface} = my $tex = new_from_file CFPlus::Texture
52	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	}
53		215
54	$self->{open_container} = 0;	216	$self->{open_container} = 0;
55		217
56	# "global"
57	$self->{tilecache} = CFClient::db_table "tilecache";
58	$self->{facemap} = CFClient::db_table "facemap";
59
60	# per server	218	# per server
61	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	219	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
62		220
63	$self	221	$self
		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	});
64	}	231	}
65		232
66	sub logprint {	233	sub logprint {
67	my ($self, @a) = @_;	234	my ($self, @a) = @_;
68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";
69		235
70	my $fh = $open_logs{$filename};	236	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
71	unless ($fh) {
72	# FIXME: handle this more gracefully?
73	open $fh, ">>", $filename
74	or die "Couldn't open logfile: log.$self->{host}: $!";
75
76	$open_logs{$filename} = $fh;
77	}
78
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
80
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83
84	print $fh "$ts ", @a, "\n";
85	$fh->flush;
86	}	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	);
87		307
88	sub stats_update {	308	sub stats_update {
89	my ($self, $stats) = @_;	309	my ($self, $stats) = @_;
90		310
91	if (my $exp = $stats->{+CS_STAT_EXP64}) {	311	my $prev = $self->{prev_stats} || { };
92	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;
93	$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);
94	if exists $self->{prev_exp} && $diff;
95	$self->{prev_exp} = $exp;
96	}	324	}
97		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
98	::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	}
99	}	483	}
100		484
101	sub user_send {	485	sub user_send {
102	my ($self, $command) = @_;	486	my ($self, $command) = @_;
103		487
		488	$self->{record}->($command)
104	if ($self->{record}) {	489	if $self->{record};
105	push @{$self->{record}}, $command;
106	}
107		490
108	$self->logprint ("send: ", $command);	491	$self->logprint ("send: ", $command);
109	$self->send_command ($command);	492	$self->send_command ($command);
110	::status ($command);	493	::status ($command);
111	}	494	}
112		495
113	sub start_record {	496	sub record {
114	my ($self) = @_;	497	my ($self, $cb) = @_;
115		498
116	$self->{record} = [];	499	$self->{record} = $cb;
117	}
118
119	sub stop_record {
120	my ($self) = @_;
121	return delete $self->{record};
122	}	500	}
123		501
124	sub map_scroll {	502	sub map_scroll {
125	my ($self, $dx, $dy) = @_;	503	my ($self, $dx, $dy) = @_;
126		504
…		…
128	}	506	}
129		507
130	sub feed_map1a {	508	sub feed_map1a {
131	my ($self, $data) = @_;	509	my ($self, $data) = @_;
132		510
133	$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 {
134	$self->{map_widget}->update;	539	$self->{map_widget}->update;
		540	}
135	}	541	}
136		542
137	sub magicmap {	543	sub magicmap {
138	my ($self, $w, $h, $x, $y, $data) = @_;	544	my ($self, $w, $h, $x, $y, $data) = @_;
139		545
…		…
146	my $map_info = delete $self->{map_info}	552	my $map_info = delete $self->{map_info}
147	or return;	553	or return;
148		554
149	my ($hash, $x, $y, $w, $h) = @$map_info;	555	my ($hash, $x, $y, $w, $h) = @$map_info;
150		556
151	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	557	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
152	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	558	$self->{map_cache_new}{$hash} = \$data;
153	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	559	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
154	}	560	}
155		561
156	sub map_clear {	562	sub map_clear {
157	my ($self) = @_;	563	my ($self) = @_;
158		564
…		…
161		567
162	$self->{map}->clear;	568	$self->{map}->clear;
163	delete $self->{map_widget}{magicmap};	569	delete $self->{map_widget}{magicmap};
164	}	570	}
165		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	}
166		595
167	sub load_map($$$) {	596	sub load_map($$$) {
168	my ($self, $hash, $x, $y) = @_;	597	my ($self, $hash, $x, $y) = @_;
169		598
170	if (defined (my $data = $self->{mapcache}->get ($hash))) {	599	my $gen = $self->{map_change_gen};
		600
		601	my $cb = sub {
		602	return unless $gen == $self->{map_change_gen};
		603
		604	my ($data) = @_;
		605
		606	if (defined $data) {
		607	$self->{map_cache_new}{$hash} = \$data;
		608
171	$data = Compress::LZF::decompress $data;	609	my $data = Compress::LZF::decompress $data;
172	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
173	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
174	my $data = $self->{tilecache}->get ($id)
175	or next;
176		610
177	$self->set_texture ($id => $data);	611	my $inprogress = @{ $self->{bg_fetch} || [] };
		612	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		613	$self->bg_fetch unless $inprogress;
178	}	614	}
		615	};
		616
		617	if (my $rdata = $self->{map_cache_old}{$hash}) {
		618	$cb->($$rdata);
		619	} else {
		620	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
179	}	621	}
180	}	622	}
181		623
182	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	624	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
183	# (server resource,s latency, bandwidth), so this hack is warranted.	625	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
248		690
249	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	691	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
250	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	692	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
251		693
252	} else {	694	} else {
		695	my $gen = $self->{map_change_gen};
253	$self->send_mapinfo ("spatial $path$tile", sub {	696	$self->send_mapinfo ("spatial $path$tile", sub {
		697	return unless $gen == $self->{map_change_gen};
		698
254	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	699	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
255		700
256	return if $mode ne "spatial";	701	return if $mode ne "spatial";
257		702
258	$x += $self->{map}->ox;	703	$x += $self->{map}->ox;
…		…
272		717
273	sub map_change {	718	sub map_change {
274	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	719	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
275		720
276	$self->flush_map;	721	$self->flush_map;
		722
		723	++$self->{map_change_gen};
		724	$self->{map_cache_old} = delete $self->{map_cache_new};
277		725
278	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	726	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
279		727
280	my $mapmapw = $self->{mapmap}->{w};	728	my $mapmapw = $self->{mapmap}->{w};
281	my $mapmaph = $self->{mapmap}->{h};	729	my $mapmaph = $self->{mapmap}->{h};
…		…
298	$self->load_map ($hash, $x, $y);	746	$self->load_map ($hash, $x, $y);
299	$self->flood_fill (0, 0, 0, "", $hash, $flags);	747	$self->flood_fill (0, 0, 0, "", $hash, $flags);
300	}	748	}
301		749
302	sub face_find {	750	sub face_find {
		751	my ($self, $facenum, $face, $cb) = @_;
		752
		753	if ($face->{type} == 0) { # FT_FACE
		754	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
		755
		756	$face->{id} = $id;
		757	$self->{faceid}[$facenum] = $id;
		758
		759	$self->{map}->set_tileid ($facenum => $id);
		760
		761	CFPlus::DB::get tilecache => $id, $cb;
		762
		763	} elsif ($face->{type} & 1) { # with metadata
		764	CFPlus::DB::get res_meta => $face->{name}, $cb;
		765	}
		766	}
		767
		768	sub face_update {
		769	my ($self, $facenum, $face, $changed) = @_;
		770
		771	if ($face->{type} == 0) { # FT_FACE
		772	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		773	if $changed;
		774
		775	$self->have_tile ($face->{id});
		776
		777	} elsif ($face->{type} & 1) { # split metadata
		778	if ($changed) { # new data
		779	my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
		780	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		781
		782	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		783	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		784	} else {
		785	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		786	}
		787
		788	::add_license ($face);
		789
		790	if ($face->{type} == 3) { # FT_MUSIC
		791	$self->{music_meta}{$facenum} = $face;
		792
		793	::message ({ markup => "downloaded song #$facenum" })
		794	if $changed;
		795
		796	&::audio_music_push ($facenum);
		797	} elsif ($face->{type} == 5) { # FT_SOUND
		798	$self->{sound_meta}{$facenum} = $face;
		799
		800	::message ({ markup => "downloaded sound #$facenum" })
		801	if $changed;
		802
		803	&::audio_sound_push ($facenum);
		804	}
		805
		806	}
		807	}
		808
		809	sub smooth_update {
303	my ($self, $facenum, $face) = @_;	810	my ($self, $facenum, $face) = @_;
304		811
305	my $hash = "$face->{chksum},$face->{name}";	812	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
306
307	my $id = $self->{facemap}->get ($hash);
308
309	unless ($id) {
310	# create new id for face
311	# I love transactions
312	for (1..100) {
313	my $txn = $CFClient::DB_ENV->txn_begin;
314	my $status = $self->{facemap}->db_get (id => $id);
315	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
316	$id = ($id || 64) + 1;
317	if ($self->{facemap}->put (id => $id) == 0
318	&& $self->{facemap}->put ($hash => $id) == 0) {
319	$txn->txn_commit;
320
321	goto gotid;
322	}
323	}
324	$txn->txn_abort;
325	}
326
327	CFClient::fatal "maximum number of transaction retries reached - database problems?";
328	}
329
330	gotid:
331	$face->{id} = $id;
332	$self->{map}->set_face ($facenum => $id);
333	$self->{faceid}[$facenum] = $id;#d#
334
335	my $face = $self->{tilecache}->get ($id);
336
337	if ($face) {
338	#$self->face_prefetch;
339	$face
340	} else {
341	my $tex = $self->{noface};
342	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
343	undef
344	};
345	}	813	}
346		814
		815	sub have_tile {
		816	my ($self, $tile) = @_;
		817
		818	return unless $self->{map};
		819
		820	my $tex = $self->{texture}[$tile] ||=
		821	new CFPlus::Texture
		822	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		823
		824	$_->($tex) for @{(delete $self->{face_cb}{$tile}) || []};
		825	}
		826
347	sub face_update {	827	sub connect_face_update {
348	my ($self, $facenum, $face) = @_;
349
350	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
351
352	$self->set_texture ($face->{id} => delete $face->{image});
353	}
354
355	sub set_texture {
356	my ($self, $id, $data) = @_;	828	my ($self, $id, $cb) = @_;
357		829
358	$self->{texture}[$id] ||= do {	830	push @{$self->{face_cb}{$id}}, $cb;
359	my $tex =
360	new_from_image CFClient::Texture
361	$data, minify => 1, mipmap => 1;
362		831
363	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	832	CFPlus::guard {
364	$self->{map_widget}->update;	833	@{$self->{face_cb}{$id}}
365		834	= grep $_ != $cb,
366	$tex	835	@{$self->{face_cb}{$id}};
367	};	836	}
368	}	837	}
369		838
370	sub sound_play {	839	sub sound_play {
371	my ($self, $x, $y, $soundnum, $type) = @_;	840	my ($self, $type, $face, $dx, $dy, $vol) = @_;
372		841
373	$self->{sound_play}->($x, $y, $soundnum, $type);	842	&::audio_sound_play ($face, $dx, $dy, $vol)
		843	unless $type & 1; # odd types are silent for future expansion
374	}	844	}
375		845
376	my $LAST_QUERY; # server is stupid, stupid, stupid	846	my $LAST_QUERY; # server is stupid, stupid, stupid
377		847
378	sub query {	848	sub query {
…		…
382	$LAST_QUERY = $prompt;	852	$LAST_QUERY = $prompt;
383		853
384	$self->{query}-> ($self, $flags, $prompt);	854	$self->{query}-> ($self, $flags, $prompt);
385	}	855	}
386		856
387	sub drawinfo {	857	sub sanitise_xml($) {
388	my ($self, $color, $text) = @_;	858	local $_ = shift;
389		859
390	my @color = (	860	# we now weed out all tags we do not support
		861	s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
		862	# now all entities
		863	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
		864
		865	# handle some elements
		866	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		867	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		868
		869	$_
		870	}
		871
		872	our %NAME_TO_COLOR = (
		873	black => 0,
		874	white => 1,
		875	darkblue => 2,
		876	red => 3,
		877	orange => 4,
		878	lightblue => 5,
		879	darkorange => 6,
		880	green => 7,
		881	darkgreen => 8,
		882	grey => 9,
		883	brown => 10,
		884	yellow => 11,
		885	tan => 12,
		886	);
		887
		888	our @CF_COLOR = (
391	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	889	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
392	[1.00, 1.00, 1.00],	890	[1.00, 1.00, 1.00],
393	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	891	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
394	[1.00, 0.00, 0.00],	892	[1.00, 0.00, 0.00],
395	[1.00, 0.54, 0.00],	893	[1.00, 0.54, 0.00],
396	[0.11, 0.56, 1.00],	894	[0.11, 0.56, 1.00],
397	[0.93, 0.46, 0.00],	895	[0.93, 0.46, 0.00],
398	[0.18, 0.54, 0.34],	896	[0.18, 0.54, 0.34],
399	[0.56, 0.73, 0.56],	897	[0.56, 0.73, 0.56],
400	[0.80, 0.80, 0.80],	898	[0.80, 0.80, 0.80],
401	[0.55, 0.41, 0.13],	899	[0.75, 0.61, 0.20],
402	[0.99, 0.77, 0.26],	900	[0.99, 0.77, 0.26],
403	[0.74, 0.65, 0.41],	901	[0.74, 0.65, 0.41],
404	);	902	);
405		903
		904	sub msg {
		905	my ($self, $color, $type, $text, @extra) = @_;
		906
		907	$text = sanitise_xml $text;
		908
		909	if (my $cb = $self->{cb_msg}{$type}) {
		910	$_->($self, $color, $type, $text, @extra) for values %$cb;
		911	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		912	$type =~ s/-/_/g;
		913	$self->{$type} = $text;
		914	} else {
406	$self->logprint ("info: ", $text);	915	$self->logprint ("msg: ", $text);
		916	return if $color < 0; # negative color == ignore if not understood
407		917
408	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	918	my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
409		919
410	# try to create single paragraphs of multiple lines sent by the server	920	## try to create single paragraphs of multiple lines sent by the server
		921	# no longer neecssary with TRT servers
411	$text =~ s/(?<=\S)\n(?=\w)/ /g;	922	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
412		923
413	$text = CFClient::UI::Label::escape $text;	924	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
414	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	925	for split /\n/, $text;
415	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416		926
417	$self->{logview}->add_paragraph ($color[$color], $_)
418	for map "$time $_", split /\n/, $text;
419	$self->{logview}->scroll_to_bottom;
420
421	$self->{statusbox}->add ($text,	927	$self->{statusbox}->add ($text,
422	group => $text,	928	group => $text,
423	fg => $color[$color],	929	fg => $fg,
424	timeout => $color >= 2 ? 60 : 10,	930	timeout => $color >= 2 ? 180 : 10,
425	tooltip_font => $::FONT_FIXED,	931	tooltip_font => $::FONT_FIXED,
426	);	932	);
427	}	933	}
428
429	sub drawextinfo {
430	my ($self, $color, $type, $subtype, $message) = @_;
431
432	$self->drawinfo ($color, $message);
433	}	934	}
434		935
435	sub spell_add {	936	sub spell_add {
436	my ($self, $spell) = @_;	937	my ($self, $spell) = @_;
437		938
438	# try to create single paragraphs of multiple lines sent by the server	939	# try to create single paragraphs out of the multiple lines sent by the server
439	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	940	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440	$spell->{message} =~ s/\n+$//;	941	$spell->{message} =~ s/\n+$//;
441	$spell->{message} ||= "Server did not provide a description for this spell.";	942	$spell->{message} ||= "Server did not provide a description for this spell.";
442		943
443	$::SETUP_SPELLS->add_spell ($spell);	944	$::SPELL_LIST->add_spell ($spell);
444		945
445	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	946	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
446	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	947	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
447	}	948	}
448		949
449	sub spell_delete {	950	sub spell_delete {
450	my ($self, $spell) = @_;	951	my ($self, $spell) = @_;
		952
451	$::SETUP_SPELLS->remove_spell ($spell);	953	$::SPELL_LIST->remove_spell ($spell);
		954	}
		955
		956	sub setup {
		957	my ($self, $setup) = @_;
		958
		959	$self->{map_widget}->set_tilesize ($self->{tilesize});
		960	$::MAP->resize ($self->{mapw}, $self->{maph});
452	}	961	}
453		962
454	sub addme_success {	963	sub addme_success {
455	my ($self) = @_;	964	my ($self) = @_;
456		965
457	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
458	my ($pom) = @_;
459
460	my %skill_help;	966	my %skill_help;
461		967
462	for my $head2 ($pom->head1->[3]->head2) {	968	for my $node (CFPlus::Pod::find skill_description => "*") {
463	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	969	my (undef, @par) = CFPlus::Pod::section_of $node;
464	}	970	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
465
466	\%skill_help
467	};	971	};
468		972
469	for my $skill (values %{$self->{skill_info}}) {	973	for my $skill (values %{$self->{skill_info}}) {
470	$self->{map_widget}->add_command ("ready_skill $skill",	974	$self->{map_widget}->add_command ("ready_skill $skill",
471	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	975	(CFPlus::asxml "Ready the skill '$skill'\n\n")
472	. $skill_help->{$skill});	976	. $skill_help{$skill});
473	$self->{map_widget}->add_command ("use_skill $skill",	977	$self->{map_widget}->add_command ("use_skill $skill",
474	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	978	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
475	. $skill_help->{$skill});	979	. $skill_help{$skill});
476	}	980	}
477	}	981	}
478		982
479	sub eof {	983	sub eof {
480	my ($self) = @_;	984	my ($self) = @_;
…		…
482	$self->{map_widget}->clr_commands;	986	$self->{map_widget}->clr_commands;
483		987
484	::stop_game ();	988	::stop_game ();
485	}	989	}
486		990
487	sub image_info {
488	my ($self, $numfaces) = @_;
489
490	$self->{num_faces} = $numfaces;
491	$self->{face_prefetch} = [1 .. $numfaces];
492	$self->face_prefetch;
493	}
494
495	sub face_prefetch {
496	my ($self) = @_;
497
498	return unless $::CFG->{face_prefetch};
499
500	if ($self->{num_faces}) {
501	return if @{ $self->{send_queue} || [] };
502	my $todo = @{ $self->{face_prefetch} }
503	or return;
504
505	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506
507	$self->send ("requestinfo image_sums $face $face");
508
509	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
510	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511	} elsif (!exists $self->{num_faces}) {
512	$self->send ("requestinfo image_info");
513
514	$self->{num_faces} = 0;
515
516	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
517	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518	}
519	}
520
521	sub update_floorbox {	991	sub update_floorbox {
522	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	992	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523	return unless $::CONN;	993	return unless $::CONN;
524		994
525	$::FLOORBOX->clear;	995	$::FLOORBOX->clear;
526		996
		997	my @add;
		998
527	my $row;	999	my $row;
528	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {	1000	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
529	if ($row < 6) {	1001	if ($row < 6) {
530	local $_->{face_widget}; # hack to force recreation of widget	1002	local $_->{face_widget}; # hack to force recreation of widget
531	local $_->{desc_widget}; # hack to force recreation of widget	1003	local $_->{desc_widget}; # hack to force recreation of widget
532	CFClient::Item::update_widgets $_;	1004	CFPlus::Item::update_widgets $_;
533		1005
		1006	push @add,
534	$::FLOORBOX->add (0, $row, $_->{face_widget});	1007	0, $row, $_->{face_widget},
535	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1008	1, $row, $_->{desc_widget};
536		1009
537	$row++;	1010	$row++;
538	} else {	1011	} else {
539	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	1012	push @add, 1, $row, new CFPlus::UI::Button
540	text => "More...",	1013	text => "More...",
541	on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },	1014	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542	);	1015	;
543	last;	1016	last;
544	}	1017	}
545	}	1018	}
		1019	if ($::CONN->{open_container}) {
		1020	push @add, 1, $row++, new CFPlus::UI::Button
		1021	text => "Close container",
		1022	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		1023	;
		1024	}
		1025
		1026	$::FLOORBOX->add_at (@add);
546	});	1027	});
547		1028
548	$::WANT_REFRESH++;	1029	$::WANT_REFRESH->start;
549	}	1030	}
550		1031
551	sub set_opencont {	1032	sub set_opencont {
552	my ($conn, $tag, $name) = @_;	1033	my ($conn, $tag, $name) = @_;
553	$conn->{open_container} = $tag;	1034	$conn->{open_container} = $tag;
		1035	update_floorbox;
554		1036
555	$::INV_RIGHT_HB->clear ();	1037	$::INV_RIGHT_HB->clear ();
556	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	1038	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
557		1039
558	if ($tag != 0) { # Floor isn't closable, is it?	1040	if ($tag != 0) { # Floor isn't closable, is it?
559	$::INV_RIGHT_HB->add (new CFClient::UI::Button	1041	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
560	text => "Close container",	1042	text => "Close container",
561	tooltip => "Close the currently open container (if one is open)",	1043	tooltip => "Close the currently open container (if one is open)",
562	on_activate => sub {	1044	on_activate => sub {
563	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1045	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
564	if $tag != 0;	1046	if $tag != 0;
…		…
569	}	1051	}
570		1052
571	$::INVR->set_items ($conn->{container}{$tag});	1053	$::INVR->set_items ($conn->{container}{$tag});
572	}	1054	}
573		1055
574	sub update_container {	1056	sub update_containers {
575	my ($tag) = @_;	1057	my ($self) = @_;
576		1058
577	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	1059	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		1060	my $todo = delete $self->{update_container}
		1061	or return;
		1062
		1063	for my $tag (keys %$todo) {
		1064	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		1065	if ($tag == 0) {
		1066	$::INVR->set_items ($self->{container}{0})
578	if $tag == $::CONN->{open_container};	1067	if $tag == $self->{open_container};
		1068	} elsif ($tag == $self->{player}{tag}) {
		1069	$::INV->set_items ($self->{container}{$tag})
		1070	} else {
		1071	$::INVR->set_items ($self->{container}{$tag})
		1072	if $tag == $self->{open_container};
		1073	}
		1074	}
		1075	});
579	}	1076	}
580		1077
581	sub container_add {	1078	sub container_add {
582	my ($self, $tag, $items) = @_;	1079	my ($self, $tag, $items) = @_;
583		1080
584	#d# print "container_add: container $tag ($self->{player}{tag})\n";	1081	$self->{update_container}{$tag}++;
585		1082	$self->update_containers;
586	if ($tag == 0) {
587	update_floorbox;
588	update_container (0);
589	} elsif ($tag == $self->{player}{tag}) {
590	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $self->{player}->{weight} / 1000);
591	$::INV->set_items ($self->{container}{$self->{player}{tag}})
592	} else {
593	update_container ($tag);
594	}
595
596	# $self-<{player}{tag} => player inv
597	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
598	}	1083	}
599		1084
600	sub container_clear {	1085	sub container_clear {
601	my ($self, $tag) = @_;	1086	my ($self, $tag) = @_;
602		1087
603	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	1088	$self->{update_container}{$tag}++;
604		1089	$self->update_containers;
605	if ($tag == 0) {
606	update_floorbox;
607	update_container (0);
608	} elsif ($tag == $self->{player}{tag}) {
609	$::INV->set_items ($self->{container}{$tag})
610	} else {
611	update_container ($tag);
612	}
613
614	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
615	}	1090	}
616		1091
617	sub item_delete {	1092	sub item_delete {
618	my ($self, @items) = @_;	1093	my ($self, @items) = @_;
619		1094
		1095	$self->{update_container}{$_->{container}}++
620	for (@items) {	1096	for @items;
621	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
622
623	if ($_->{container} == 0) {
624	update_floorbox;
625	update_container ($_->{tag});
626	} elsif ($_->{container} == $self->{player}{tag}) {
627	$::INV->set_items ($self->{container}{$self->{player}{tag}})
628	} else {
629	update_container ($_->{container});
630	}
631	}	1097
		1098	$self->update_containers;
632	}	1099	}
633		1100
634	sub item_update {	1101	sub item_update {
635	my ($self, $item) = @_;	1102	my ($self, $item) = @_;
636		1103
637	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1104	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
638		1105
639	if ($item->{tag} == $self->{player}{tag}) {
640	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
641	return;
642	}
643
644	CFClient::Item::update_widgets $item;	1106	CFPlus::Item::update_widgets $item;
645		1107
646	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1108	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
647	set_opencont ($::CONN, 0, "Floor");	1109	set_opencont ($::CONN, 0, "Floor");
648		1110
649	} elsif ($item->{flags} & F_OPEN) {	1111	} elsif ($item->{flags} & F_OPEN) {
650	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	1112	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		1113
651	} else {	1114	} else {
652	if ($item->{container} == 0) {	1115	$self->{update_container}{$item->{container}}++;
653	update_floorbox;
654	update_container (0);	1116	$self->update_containers;
655	} elsif ($item->{container} == $self->{player}{tag}) {
656	$::INV->set_items ($self->{container}{$item->{container}})
657	}
658	}	1117	}
659	}	1118	}
660		1119
661	sub player_update {	1120	sub player_update {
662	my ($self, $player) = @_;	1121	my ($self, $player) = @_;
663		1122
		1123	$self->update_weight;
		1124	}
		1125
		1126	sub update_weight {
		1127	my ($self) = @_;
		1128
		1129	my $weight = .001 * $self->{player}{weight};
		1130	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		1131
664	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	1132	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		1133	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		1134	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
665	}	1135	}
666		1136
667	sub update_server_info {	1137	sub update_server_info {
668	my ($self) = @_;	1138	my ($self) = @_;
669		1139
…		…
672	$::SERVER_INFO->set_markup (	1142	$::SERVER_INFO->set_markup (
673	"server <tt>$self->{host}:$self->{port}</tt>\n"	1143	"server <tt>$self->{host}:$self->{port}</tt>\n"
674	. "protocol version <tt>$self->{version}</tt>\n"	1144	. "protocol version <tt>$self->{version}</tt>\n"
675	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1145	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
676	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1146	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1147	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1148	. "editing support $yesno[!!$self->{editor_support}]\n"
		1149	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1150	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
677	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1151	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
678	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1152	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
679	. "map size $self->{mapw}×$self->{maph}\n"	1153	. "map size $self->{mapw}×$self->{maph}\n"
680	);	1154	);
		1155
681	}	1156	}
682		1157
683	sub logged_in {	1158	sub logged_in {
684	my ($self) = @_;	1159	my ($self) = @_;
685		1160
686	$self->send_ext_req (cfplus_support => "1", sub {	1161	$self->send_ext_req (cfplus_support => version => 2, sub {
		1162	my (%msg) = @_;
		1163
687	$self->{cfplus_ext} = $_[0];	1164	$self->{cfplus_ext} = $msg{version};
688	$self->update_server_info;	1165	$self->update_server_info;
		1166
		1167	if ($self->{cfplus_ext} >= 2) {
		1168	$self->send_ext_req ("editor_support", sub {
		1169	$self->{editor_support} = { @_ };
		1170	$self->update_server_info;
		1171
		1172	0
		1173	});
		1174	}
		1175
		1176	0
689	});	1177	});
690		1178
691	$self->update_server_info;	1179	$self->update_server_info;
692		1180
693	$self->send_command ("output-sync $::CFG->{output_sync}");	1181	$self->send_command ("output-sync $::CFG->{output_sync}");
694	$self->send_command ("output-count $::CFG->{output_count}");	1182	$self->send_command ("output-count $::CFG->{output_count}");
		1183	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
695	$self->send_command ("pickup $::CFG->{pickup}");	1184	$self->send_command ("pickup $::CFG->{pickup}");
696	}	1185	}
697		1186
698	sub lookat {	1187	sub lookat {
699	my ($self, $x, $y) = @_;	1188	my ($self, $x, $y) = @_;
700		1189
701	if ($self->{cfplus_ext}) {	1190	if ($self->{cfplus_ext}) {
702	$self->send_ext_req (lookat => "$x $y", sub {	1191	$self->send_ext_req (lookat => $x, $y, sub {
703	my %res = split /\x00/, $_[0];	1192	my (%msg) = @_;
704		1193
705	if (exists $res{npc_dialog}) {	1194	if (exists $msg{npc_dialog}) {
706	# start npc chat dialog	1195	# start npc chat dialog
707	$self->{npc_dialog} = new CFClient::NPCDialog::	1196	$self->{npc_dialog} = new CFPlus::NPCDialog::
708	dx => $x,	1197	token => $msg{npc_dialog},
709	dy => $y,
710	title => "$res{npc_dialog} (NPC)",	1198	title => "$msg{npc_dialog}[0] (NPC)",
711	conn => $self,	1199	conn => $self,
712	;	1200	;
713	}	1201	}
714	});	1202	});
715	}	1203	}
…		…
718	}	1206	}
719		1207
720	sub destroy {	1208	sub destroy {
721	my ($self) = @_;	1209	my ($self) = @_;
722		1210
723	$self->{npc_dialog}->destroy	1211	(delete $self->{npc_dialog})->destroy
724	if $self->{npc_dialog};	1212	if $self->{npc_dialog};
725		1213
726	$self->SUPER::destroy;	1214	$self->SUPER::destroy;
727	}
728		1215
		1216	%$self = ();
		1217	}
		1218
729	package CFClient::NPCDialog;	1219	package CFPlus::NPCDialog;
730		1220
731	our @ISA = 'CFClient::UI::FancyFrame';	1221	our @ISA = 'CFPlus::UI::Toplevel';
732		1222
733	sub new {	1223	sub new {
734	my $class = shift;	1224	my $class = shift;
735		1225
736	my $self = $class->SUPER::new (	1226	my $self = $class->SUPER::new (
…		…
739	name => "npc_dialog",	1229	name => "npc_dialog",
740	force_w => $::WIDTH * 0.7,	1230	force_w => $::WIDTH * 0.7,
741	force_h => $::HEIGHT * 0.7,	1231	force_h => $::HEIGHT * 0.7,
742	title => "NPC Dialog",	1232	title => "NPC Dialog",
743	kw => { hi => 0, yes => 0, no => 0 },	1233	kw => { hi => 0, yes => 0, no => 0 },
		1234	has_close_button => 1,
744	@_,	1235	@_,
745	);	1236	);
746		1237
747	Scalar::Util::weaken (my $this = $self);	1238	CFPlus::weaken (my $this = $self);
		1239
		1240	$self->connect (delete => sub { $this->destroy; 1 });
748		1241
749	# better use a pane...	1242	# better use a pane...
750	$self->add (my $hbox = new CFClient::UI::HBox);	1243	$self->add (my $hbox = new CFPlus::UI::HBox);
751	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	1244	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
752		1245
753	$hbox->add (my $vbox = new CFClient::UI::VBox);	1246	$hbox->add (my $vbox = new CFPlus::UI::VBox);
754		1247
755	$vbox->add (new CFClient::UI::Label text => "Message Entry:");	1248	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
756	$vbox->add ($self->{entry} = new CFClient::UI::Entry	1249	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
757	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1250	tooltip => "#npc_message_entry",
758	. "Sometimes you have to tell an NPC something you cannot find out during "
759	. "a normal conversation (such as a password). In those cases you have to use "
760	. "this text entry. You can also enter responses manually instead of using the response "
761	. "buttons below.",
762	on_activate => sub {	1251	on_activate => sub {
763	my ($entry, $text) = @_;	1252	my ($entry, $text) = @_;
764		1253
765	return unless $text =~ /\S/;	1254	return unless $text =~ /\S/;
766		1255
…		…
769		1258
770	0	1259	0
771	},	1260	},
772	);	1261	);
773		1262
774	$vbox->add ($self->{options} = new CFClient::UI::VBox);	1263	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
775		1264
776	$self->{bye_button} = new CFClient::UI::Button	1265	$self->{bye_button} = new CFPlus::UI::Button
777	text => "Bye (close)",	1266	text => "Bye (close)",
778	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1267	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
779	on_activate => sub { $this->destroy; 0 },	1268	on_activate => sub { $this->destroy; 1 },
780	;	1269	;
781		1270
782	$self->update_options;	1271	$self->update_options;
783		1272
784	$self->{token} = $self->{conn}->ext_token;	1273	$self->{id} = "npc-channel-" . $self->{conn}->token;
785	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1274	$self->{conn}->connect_ext ($self->{id} => sub {
786	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1275	$this->feed (@_) if $this;
		1276	});
		1277
		1278	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
787		1279
788	$self->{entry}->grab_focus;	1280	$self->{entry}->grab_focus;
789		1281
790	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	1282	$self->{textview}->add_paragraph ({
		1283	fg => [1, 1, 0, 1],
		1284	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1285	});
791		1286
792	$self->show;	1287	$self->show;
793	$self	1288	$self
794	};	1289	};
795		1290
796	sub update_options {	1291	sub update_options {
797	my ($self) = @_;	1292	my ($self) = @_;
798		1293
799	Scalar::Util::weaken $self;	1294	CFPlus::weaken $self;
800		1295
801	$self->{options}->clear;	1296	$self->{options}->clear;
802	$self->{options}->add ($self->{bye_button});	1297	$self->{options}->add ($self->{bye_button});
803		1298
804	for my $kw (sort keys %{ $self->{kw} }) {	1299	for my $kw (sort keys %{ $self->{kw} }) {
805	$self->{options}->add (new CFClient::UI::Button	1300	$self->{options}->add (new CFPlus::UI::Button
806	text => $kw,	1301	text => $kw,
807	on_activate => sub {	1302	on_activate => sub {
808	$self->send ($kw);	1303	$self->send ($kw);
809	0	1304	0
810	},	1305	},
811	);	1306	);
812	}	1307	}
813	}	1308	}
814		1309
815	sub feed {	1310	sub feed {
816	my ($self, $data) = @_;	1311	my ($self, $type, @arg) = @_;
817		1312
818	Scalar::Util::weaken $self;	1313	CFPlus::weaken $self;
819		1314
820	my ($type, $msg) = split / /, $data, 2;
821
822	if ($type eq "msg") {	1315	if ($type eq "update") {
823	my ($msg, @kw) = split /\x00/, $msg;	1316	my (%info) = @arg;
824	$self->{kw}{$_} = 1 for @kw;
825		1317
826	$msg = "\n" . CFClient::UI::Label::escape $msg;	1318	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
827	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1319	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
828	my @link;
829	$msg =~ s{
830	($match)
831	}{
832	my $kw = $1;
833
834	push @link, new CFClient::UI::Label
835	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
836	can_hover => 1,
837	can_events => 1,
838	padding_x => 0,
839	padding_y => 0,
840	on_button_up => sub {
841	$self->send ($kw);
842	};
843
844	chr 0xfffc
845	}giex;
846		1320
847	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);	1321	if (exists $info{msg}) {
		1322	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1323	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1324	my @link;
		1325	$text =~ s{
		1326	($match)
		1327	}{
		1328	my $kw = $1;
		1329
		1330	push @link, new CFPlus::UI::Label
		1331	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1332	can_hover => 1,
		1333	can_events => 1,
		1334	padding_x => 0,
		1335	padding_y => 0,
		1336	on_button_up => sub {
		1337	$self->send ($kw);
		1338	};
		1339
		1340	"\x{fffc}"
		1341	}giex;
		1342
		1343	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
848	$self->{textview}->scroll_to_bottom;	1344	$self->{textview}->scroll_to_bottom;
		1345	}
		1346
849	$self->update_options;	1347	$self->update_options;
850	} else {	1348	} else {
851	$self->destroy;	1349	$self->destroy;
852	}	1350	}
853		1351
…		…
855	}	1353	}
856		1354
857	sub send {	1355	sub send {
858	my ($self, $msg) = @_;	1356	my ($self, $msg) = @_;
859		1357
860	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1358	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
861	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
862	$self->{textview}->scroll_to_bottom;	1359	$self->{textview}->scroll_to_bottom;
		1360
		1361	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
863	}	1362	}
864		1363
865	sub destroy {	1364	sub destroy {
866	my ($self) = @_;	1365	my ($self) = @_;
867		1366
868	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1367	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
869		1368
		1369	if ($self->{conn}) {
		1370	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
870	delete $self->{conn}{npc_dialog};	1371	delete $self->{conn}{npc_dialog};
871	$self->{conn}->disconnect_ext ($self->{token});	1372	$self->{conn}->disconnect_ext ($self->{id});
		1373	}
872		1374
873	$self->SUPER::destroy;	1375	$self->SUPER::destroy;
874	}	1376	}
875		1377
876	1;	1378	1
		1379

Diff Legend

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