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

Diff Legend

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