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.53 by root, Mon Jul 3 22:32:52 2006 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 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	xwidget1 => 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	$self->send_exti_req (resource => "exp_table", sub {
		65	my ($exp_table) = @_;
		66
		67	$self->register_face_handler ($exp_table, sub {
		68	my ($face) = @_;
		69
		70	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		71
		72	#TODO: update all interested parties
		73	});
		74
		75	()
		76	});
		77
		78	if (my $ts = $cap{tileset}) {
		79	if (my ($default) = grep $_->[2] & 1, @$ts) {
		80	$self->{tileset} = $default;
		81	$self->{tilesize} = $default->[3];
		82	$self->setup_req (tileset => $default->[0]);
		83
		84	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		85	my $h = int $self->{maph} * 32 / $self->{tilesize};
		86
		87	$self->setup_req (mapsize => "${w}x${h}");
		88	}
		89	}
		90	});
		91
		92	$self->{json_coder}
		93	->convert_blessed
		94	->filter_json_single_key_object (__w_ => sub {
		95	$self->{widget}{$_[0]}
		96	});
		97
		98	# widgetset new
		99	$self->connect_ext (ws_n => sub {
		100	my ($id) = @_;
		101
		102	$self->{widgetset}{$id} = {
		103	w => {},
43	}	104	};
44
45	\@cmd_help
46	};	105	});
		106
		107	# widgetset destroy
		108	$self->connect_ext (ws_d => sub {
		109	my ($id) = @_;
		110
		111	my $ws = delete $self->{widgetset}{$id}
		112	or return;
		113
		114	$_->destroy
		115	for values %{$ws->{w}};
		116	});
		117
		118	# widgetset create
		119	$self->connect_ext (ws_c => sub {
		120	my ($ws, $id, $class, $args) = @_;
		121
		122	for my $ev (grep /^on_/, keys %$args) {
		123	my $rid = $args->{$ev};
		124	$args->{$ev} = sub {
		125	my $id = shift->{s_id};
		126	$self->send_exti_msg (w_e => $id, $rid, @_);
		127
		128	1
		129	};
		130	}
		131
		132	$self->widget_associate (
		133	$ws, $id => scalar eval {
		134	local $SIG{__DIE__};
		135	"CFPlus::UI::$class"->new (%$args)
		136	}
		137	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		138	});
		139
		140	# widgetset associate
		141	$self->connect_ext (ws_a => sub {
		142	my (%ass) = @_;
		143
		144	# everything that has a name, wether conceivably useful or not
		145	my %wkw = (
		146	root => $CFPlus::UI::ROOT,
		147	tooltip => $CFPlus::UI::TOOLTIP,
		148
		149	mapwidget => $::MAPWIDGET,
		150	buttonbar => $::BUTTONBAR,
		151	metaserver => $::METASERVER,
		152	buttonbar => $::BUTTONBAR,
		153	login_button => $::LOGIN_BUTTON,
		154	quit_dialog => $::QUIT_DIALOG,
		155	host_entry => $::HOST_ENTRY,
		156	metaserver => $::METASERVER,
		157	server_info => $::SERVER_INFO,
		158
		159	setup_dialog => $::SETUP_DIALOG,
		160	setup_notebook => $::SETUP_NOTEBOOK,
		161	setup_server => $::SETUP_SERVER,
		162	setup_keyboard => $::SETUP_KEYBOARD,
		163
		164	pl_notebook => $::PL_NOTEBOOK,
		165	pl_window => $::PL_WINDOW,
		166	inventory_page => $::INVENTORY_PAGE,
		167	stats_page => $::STATS_PAGE,
		168	skill_page => $::SKILL_PAGE,
		169	spell_page => $::SPELL_PAGE,
		170	spell_list => $::SPELL_LIST,
		171
		172	floorbox => $::FLOORBOX,
		173	help_window => $::HELP_WINDOW,
		174	message_window => $::MESSAGE_WINDOW,
		175	statusbox => $::SDTATUSBOX,
		176
		177	inv => $::INV,
		178	invr => $::INVR,
		179	invr_hb => $::INVR_HB,
		180
		181	);
		182
		183	while (my ($id, $name) = each %ass) {
		184	$self->widget_associate (undef, $id => $wkw{$name})
		185	or warn "server failed to associate non-existent well-known widget $name\n";
		186	}
		187	});
		188
		189	# widget call
		190	$self->connect_ext (w_c => sub {
		191	my ($id, $rid, $method, @args) = @_;
		192
		193	my $w = $self->{widget}{$id}
		194	or return;
		195
		196	if ($rid) {
		197	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		198	} else {
		199	$w->$method (@args);
		200	}
		201	});
		202
		203	# widget set
		204	$self->connect_ext (w_s => sub {
		205	my ($id, $attr) = @_;
		206
		207	my $w = $self->{widget}{$id}
		208	or return;
		209
		210	for (my $i = 0; $i < $#$attr; $i += 2) {
		211	my ($member, $value) = @$attr[$i, $i+1];
		212	if (defined $value) {
		213	$w->{$member} = $value;
		214	} else {
		215	delete $w->{$member};
		216	}
		217	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		218	}
		219	});
		220
		221	# widget get
		222	$self->connect_ext (w_g => sub {
		223	my ($id, $rid, $attr) = @_;
		224
		225	my $w = $self->{widget}{$id}
		226	or return;
		227
		228	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		229	});
		230
		231	# message window
		232	$self->connect_ext (channel_info => sub {
		233	my ($info) = @_;
		234	$self->{channels}->{$info->{id}} = $info;
		235	$::MESSAGE_WINDOW->add_channel ($info);
		236	});
		237
		238	# destroy widgets on logout
		239	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		240	for my $ws (values %{delete $self->{widgetset} || {}}) {
		241	$_->destroy
		242	for values %{delete $ws->{w} || {}};
		243	}
		244	});
47		245
48	$self->{map_widget}->add_command (@$_)	246	$self->{map_widget}->add_command (@$_)
49	for @$cmd_help;	247	for @cmd_help;
50		248
		249	{
		250	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		251	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		252	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		253	}
		254
		255	{
51	$self->{noface} = new_from_file CFClient::Texture	256	$self->{noface} = my $tex = new_from_file CFPlus::Texture
52	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	257	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		258	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		259	}
53		260
54	$self->{open_container} = 0;	261	$self->{open_container} = 0;
55		262
56	# "global"
57	$self->{tilecache} = CFClient::db_table "tilecache";
58	$self->{facemap} = CFClient::db_table "facemap";
59
60	# per server	263	# per server
61	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	264	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
62		265
63	$self	266	$self
		267	}
		268
		269	sub widget_associate {
		270	my ($self, $ws, $id, $widget) = @_;
		271
		272	if ($widget) {
		273	$widget->{s_id} = $id;
		274	$self->{widget}{$id} = $widget;
		275
		276	if ($ws) {
		277	$widget->{s_ws} = $ws;
		278	$self->{widgetset}{$ws}{w}{$id} = $widget;
		279	}
		280
		281	$widget->connect (on_destroy => sub {
		282	my ($widget) = @_;
		283
		284	delete $self->{widget}{$widget->{s_id}};
		285	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		286	if exists $widget->{s_ws};
		287	});
		288
		289	1
		290	} else {
		291	$self->send_exti_msg (w_e => $id, undef);
		292
		293	0
		294	}
		295	}
		296
		297	sub update_fx_want {
		298	my ($self) = @_;
		299
		300	$self->send_exti_msg (fx_want => {
		301	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		302	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		303	6 => 1, # FT_RSRC
		304	});
64	}	305	}
65		306
66	sub logprint {	307	sub logprint {
67	my ($self, @a) = @_;	308	my ($self, @a) = @_;
68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";
69		309
70	my $fh = $open_logs{$filename};	310	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	}	311	}
87		312
88	sub _stat_numdiff {	313	sub _stat_numdiff {
89	my ($self, $old, $new) = @_;	314	my ($self, $name, $old, $new) = @_;
90		315
91	my $diff = $new - $old;	316	my $diff = $new - $old;
92	$diff > 0 ? "+$diff" : $diff	317
		318	$diff = 0.01 * int $diff * 100;
		319
		320	0.1 >= abs $diff ? ()
		321	: $diff < 0 ? "$name$diff" : "$name+$diff"
93	}	322	}
94		323
95	sub _stat_skillmaskdiff {	324	sub _stat_skillmaskdiff {
96	my ($self, $old, $new) = @_;	325	my ($self, $name, $old, $new) = @_;
97		326
98	my $diff = $old ^ $new;	327	my $diff = $old ^ $new
		328	or return;
99		329
100	my @diff = map	330	my @diff = map
101	{	331	{
102	$diff & $_	332	$diff & $_
103	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})	333	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
…		…
150	);	380	);
151		381
152	sub stats_update {	382	sub stats_update {
153	my ($self, $stats) = @_;	383	my ($self, $stats) = @_;
154		384
155	if (my $prev = $self->{prev_stats}) {	385	my $prev = $self->{prev_stats} || { };
156	if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {	386
		387	if (my @diffs =
		388	(
		389	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		390	map {
		391	$stats->{$_} && $prev->{$_}
		392	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		393	} sort { $a <=> $b } keys %{$self->{skill_info}}
		394	)
		395	) {
		396	my $msg = join " ", @diffs;
157	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5);	397	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
		398	}
		399
		400	if (
		401	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		402	) {
		403	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		404	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		405	}
		406
		407	$self->update_stats_window ($stats, $prev);
		408
		409	$self->{prev_stats} = { %$stats };
		410	}
		411
		412	my %RES_TBL = (
		413	phys => CS_STAT_RES_PHYS,
		414	magic => CS_STAT_RES_MAG,
		415	fire => CS_STAT_RES_FIRE,
		416	elec => CS_STAT_RES_ELEC,
		417	cold => CS_STAT_RES_COLD,
		418	conf => CS_STAT_RES_CONF,
		419	acid => CS_STAT_RES_ACID,
		420	drain => CS_STAT_RES_DRAIN,
		421	ghit => CS_STAT_RES_GHOSTHIT,
		422	pois => CS_STAT_RES_POISON,
		423	slow => CS_STAT_RES_SLOW,
		424	para => CS_STAT_RES_PARA,
		425	tund => CS_STAT_TURN_UNDEAD,
		426	fear => CS_STAT_RES_FEAR,
		427	depl => CS_STAT_RES_DEPLETE,
		428	deat => CS_STAT_RES_DEATH,
		429	holyw => CS_STAT_RES_HOLYWORD,
		430	blind => CS_STAT_RES_BLIND,
		431	);
		432
		433	sub update_stats_window {
		434	my ($self, $stats, $prev) = @_;
		435
		436	# I love text protocols...
		437
		438	my $hp = $stats->{+CS_STAT_HP} * 1;
		439	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		440	my $sp = $stats->{+CS_STAT_SP} * 1;
		441	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		442	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		443	my $fo_m = 999;
		444	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		445	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		446
		447	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		448	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		449	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		450	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		451	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		452	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		453	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
		454	my $title = $stats->{+CS_STAT_TITLE};
		455	$title =~ s/^Player: //;
		456	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		457
		458	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		459	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		460	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		461	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		462	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		463	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		464	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		465	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		466	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		467	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		468	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		469	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		470	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		471
		472	$self->update_weight;
		473
		474	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		475	for keys %RES_TBL;
		476
		477	my $sktbl = $::STATWIDS->{skill_tbl};
		478	my @skills = keys %{ $self->{skill_info} };
		479
		480	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		481	$sktbl->clear;
		482
		483	my @add;
		484
		485	push @add,
		486	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
		487	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		488	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		489	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
		490	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		491	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
158	}	492	;
159		493
		494	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		495
		496	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		497	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		498
		499	my ($x, $y) = (0, 1);
160	if (	500	for (
161	my @diffs = map {	501	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
162	$stats->{$_->[0]} != $prev->{$_->[0]}	502	map [$_, $self->{skill_info}{$_}],
163	? $_->[2] . $_->[1]->($self, $prev->{$_->[0]}, $stats->{$_->[0]}) : ();	503	grep exists $stats->{$_},
164	}	504	@skills
165	@statchange
166	) {	505	) {
167	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	506	my ($idx, $name) = @$_;
168	$self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);	507
		508	my $spell_cb = sub {
		509	my ($widget, $ev) = @_;
		510
		511	if ($ev->{button} == 1) {
		512	$::CONN->user_send ("ready_skill $name");
		513	} elsif ($ev->{button} == 2) {
		514	$::CONN->user_send ("use_skill $name");
		515	} elsif ($ev->{button} == 3) {
		516	my $shortname = CFPlus::shorten $name, 14;
		517	(new CFPlus::UI::Menu
		518	items => [
		519	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
		520	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
		521	],
		522	)->popup ($ev);
		523	} else {
		524	return 0;
		525	}
		526
		527	1
169	}	528	};
170	}
171		529
172	$self->{prev_stats} = { %$stats };	530	push @add,
		531	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		532	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
		533	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		534	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		535	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
		536	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		537	;
173		538
174	::update_stats_window ($stats);	539	$x++ and ($x, $y) = (0, $y + 1);
		540	}
		541
		542	$sktbl->add_at (@add);
		543	}
		544
		545	for (grep exists $stats->{$_}, @skills) {
		546	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		547	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		548	}
		549	}
		550
		551	sub macro_send {
		552	my ($self, $macro) = @_;
		553
		554	for my $cmd (@{ $macro->{action} }) {
		555	$self->send_command ($cmd);
		556	}
175	}	557	}
176		558
177	sub user_send {	559	sub user_send {
178	my ($self, $command) = @_;	560	my ($self, $command) = @_;
179		561
		562	$self->{record}->($command)
180	if ($self->{record}) {	563	if $self->{record};
181	push @{$self->{record}}, $command;
182	}
183		564
184	$self->logprint ("send: ", $command);	565	$self->logprint ("send: ", $command);
185	$self->send_command ($command);	566	$self->send_command ($command);
186	::status ($command);	567	::status ($command);
187	}	568	}
188		569
189	sub start_record {	570	sub record {
190	my ($self) = @_;	571	my ($self, $cb) = @_;
191		572
192	$self->{record} = [];	573	$self->{record} = $cb;
193	}
194
195	sub stop_record {
196	my ($self) = @_;
197	return delete $self->{record};
198	}	574	}
199		575
200	sub map_scroll {	576	sub map_scroll {
201	my ($self, $dx, $dy) = @_;	577	my ($self, $dx, $dy) = @_;
202		578
…		…
204	}	580	}
205		581
206	sub feed_map1a {	582	sub feed_map1a {
207	my ($self, $data) = @_;	583	my ($self, $data) = @_;
208		584
209	$self->{map}->map1a_update ($data);	585	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		586	my $delay;
		587
		588	for my $tile (@$missing) {
		589	next if $self->{delay}{$tile};
		590
		591	$delay = 1;
		592
		593	if (my $tex = $::CONN->{texture}[$tile]) {
		594	$tex->upload;
		595	} else {
		596	$self->{delay}{$tile} = 1;
		597
		598	# we assume the face is in-flight and will eventually come
		599	push @{$self->{tile_cb}{$tile}}, sub {
		600	delete $self->{delay}{$tile};
		601	$_[0]->upload;
		602	};
		603	}
		604	}
		605
		606	if ($delay) {
		607	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		608	Event->timer (after => 0.03, cb => sub {
		609	$_[0]->w->cancel;
		610	$self->{map_widget}->update;
		611	});
		612	} else {
210	$self->{map_widget}->update;	613	$self->{map_widget}->update;
		614	}
211	}	615	}
212		616
213	sub magicmap {	617	sub magicmap {
214	my ($self, $w, $h, $x, $y, $data) = @_;	618	my ($self, $w, $h, $x, $y, $data) = @_;
215		619
…		…
222	my $map_info = delete $self->{map_info}	626	my $map_info = delete $self->{map_info}
223	or return;	627	or return;
224		628
225	my ($hash, $x, $y, $w, $h) = @$map_info;	629	my ($hash, $x, $y, $w, $h) = @$map_info;
226		630
227	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	631	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
228	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	632	$self->{map_cache_new}{$hash} = \$data;
229	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	633	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
230	}	634	}
231		635
232	sub map_clear {	636	sub map_clear {
233	my ($self) = @_;	637	my ($self) = @_;
234		638
…		…
237		641
238	$self->{map}->clear;	642	$self->{map}->clear;
239	delete $self->{map_widget}{magicmap};	643	delete $self->{map_widget}{magicmap};
240	}	644	}
241		645
		646	sub bg_fetch {
		647	my ($self) = @_;
		648
		649	my $tile;
		650
		651	do {
		652	$tile = pop @{$self->{bg_fetch}}
		653	or return;
		654	} while $self->{texture}[$tile];
		655
		656	CFPlus::DB::get tilecache => $tile, sub {
		657	my ($data) = @_;
		658
		659	return unless $self->{map}; # stop when destroyed
		660
		661	if (defined $data) {
		662	$self->have_tile ($tile, $data);
		663	$self->{texture}[$tile]->upload;
		664	}
		665
		666	$self->bg_fetch;
		667	};
		668	}
242		669
243	sub load_map($$$) {	670	sub load_map($$$) {
244	my ($self, $hash, $x, $y) = @_;	671	my ($self, $hash, $x, $y) = @_;
245		672
246	if (defined (my $data = $self->{mapcache}->get ($hash))) {	673	my $gen = $self->{map_change_gen};
		674
		675	my $cb = sub {
		676	return unless $gen == $self->{map_change_gen};
		677
		678	my ($data) = @_;
		679
		680	if (defined $data) {
		681	$self->{map_cache_new}{$hash} = \$data;
		682
247	$data = Compress::LZF::decompress $data;	683	my $data = Compress::LZF::decompress $data;
248	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
249	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
250	my $data = $self->{tilecache}->get ($id)
251	or next;
252		684
253	$self->set_texture ($id => $data);	685	my $inprogress = @{ $self->{bg_fetch} || [] };
		686	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		687	$self->bg_fetch unless $inprogress;
254	}	688	}
		689	};
		690
		691	if (my $rdata = $self->{map_cache_old}{$hash}) {
		692	$cb->($$rdata);
		693	} else {
		694	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
255	}	695	}
256	}	696	}
257		697
258	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	698	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
259	# (server resource,s latency, bandwidth), so this hack is warranted.	699	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
324		764
325	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	765	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
326	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	766	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
327		767
328	} else {	768	} else {
		769	my $gen = $self->{map_change_gen};
329	$self->send_mapinfo ("spatial $path$tile", sub {	770	$self->send_mapinfo ("spatial $path$tile", sub {
		771	return unless $gen == $self->{map_change_gen};
		772
330	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	773	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
331		774
332	return if $mode ne "spatial";	775	return if $mode ne "spatial";
333		776
334	$x += $self->{map}->ox;	777	$x += $self->{map}->ox;
…		…
348		791
349	sub map_change {	792	sub map_change {
350	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	793	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
351		794
352	$self->flush_map;	795	$self->flush_map;
		796
		797	++$self->{map_change_gen};
		798	$self->{map_cache_old} = delete $self->{map_cache_new};
353		799
354	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	800	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
355		801
356	my $mapmapw = $self->{mapmap}->{w};	802	my $mapmapw = $self->{mapmap}->{w};
357	my $mapmaph = $self->{mapmap}->{h};	803	my $mapmaph = $self->{mapmap}->{h};
…		…
374	$self->load_map ($hash, $x, $y);	820	$self->load_map ($hash, $x, $y);
375	$self->flood_fill (0, 0, 0, "", $hash, $flags);	821	$self->flood_fill (0, 0, 0, "", $hash, $flags);
376	}	822	}
377		823
378	sub face_find {	824	sub face_find {
		825	my ($self, $facenum, $face, $cb) = @_;
		826
		827	if ($face->{type} == 0) { # FT_FACE
		828	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
		829
		830	$face->{id} = $id;
		831	$self->{map}->set_tileid ($facenum => $id);
		832
		833	CFPlus::DB::get tilecache => $id, $cb;
		834
		835	} elsif ($face->{type} & 1) { # with metadata
		836	CFPlus::DB::get res_meta => $face->{name}, $cb;
		837
		838	} else { # no metadata
		839	CFPlus::DB::get res_data => $face->{name}, $cb;
		840	}
		841	}
		842
		843	sub face_update {
		844	my ($self, $facenum, $face, $changed) = @_;
		845
		846	if ($face->{type} == 0) {
		847	# image, FT_FACE
		848	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		849	if $changed;
		850
		851	$self->have_tile ($face->{id}, delete $face->{data});
		852
		853	} elsif ($face->{type} & 1) {
		854	# split metadata case, FT_MUSIC, FT_SOUND
		855	if ($changed) { # new data
		856	my ($meta, $data) = unpack "(w/a*)*", $face->{data};
		857	$face->{data} = $meta;
		858
		859	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		860	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		861	}
		862
		863	$face->{data} = $self->{json_coder}->decode ($face->{data});
		864
		865	::add_license ($face);
		866
		867	if ($face->{type} == 3) { # FT_MUSIC
		868	::message ({ markup => "downloaded song #$facenum" })
		869	if $changed;
		870
		871	&::audio_music_push ($facenum);
		872	} elsif ($face->{type} == 5) { # FT_SOUND
		873	::message ({ markup => "downloaded sound #$facenum" })
		874	if $changed;
		875
		876	&::audio_sound_push ($facenum);
		877	}
		878
		879	} else {
		880	# flat resource case, FT_RSRC
		881	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		882	if $changed;
		883	}
		884
		885	if (my $cbs = $self->{face_cb}{$facenum}) {
		886	$_->($face, $changed) for @$cbs;
		887	}
		888	}
		889
		890	sub smooth_update {
379	my ($self, $facenum, $face) = @_;	891	my ($self, $facenum, $face) = @_;
380		892
381	my $hash = "$face->{chksum},$face->{name}";	893	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		894	}
382		895
383	my $id = $self->{facemap}->get ($hash);	896	sub have_tile {
		897	my ($self, $tile, $data) = @_;
384		898
385	unless ($id) {	899	return unless $self->{map};
386	# create new id for face
387	# I love transactions
388	for (1..100) {
389	my $txn = $CFClient::DB_ENV->txn_begin;
390	my $status = $self->{facemap}->db_get (id => $id);
391	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
392	$id = ($id || 64) + 1;
393	if ($self->{facemap}->put (id => $id) == 0
394	&& $self->{facemap}->put ($hash => $id) == 0) {
395	$txn->txn_commit;
396		900
397	goto gotid;	901	my $tex = $self->{texture}[$tile] ||=
398	}	902	new CFPlus::Texture
		903	tile => $tile,
		904	image => $data, delete_image => 1,
		905	minify => 1, mipmap => 1;
		906
		907	if (my $cbs = delete $self->{tile_cb}{$tile}) {
		908	$_->($tex) for @$cbs;
		909	}
		910	}
		911
		912	# call in non-void context registers a temporary
		913	# hook with handle, otherwise its permanent
		914	sub on_face_change {
		915	my ($self, $num, $cb) = @_;
		916
		917	push @{$self->{face_cb}{$num}}, $cb;
		918
		919	defined wantarray
		920	? CFPlus::guard {
		921	@{$self->{face_cb}{$num}}
		922	= grep $_ != $cb,
		923	@{$self->{face_cb}{$num}};
399	}	924	}
400	$txn->txn_abort;	925	: ()
401	}
402
403	CFClient::fatal "maximum number of transaction retries reached - database problems?";
404	}
405
406	gotid:
407	$face->{id} = $id;
408	$self->{map}->set_face ($facenum => $id);
409	$self->{faceid}[$facenum] = $id;#d#
410
411	my $face = $self->{tilecache}->get ($id);
412
413	if ($face) {
414	#$self->face_prefetch;
415	$face
416	} else {
417	my $tex = $self->{noface};
418	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
419	undef
420	};
421	}	926	}
422		927
423	sub face_update {	928	# call in non-void context registers a temporary
		929	# hook with handle, otherwise its permanent
		930	sub register_face_handler {
424	my ($self, $facenum, $face) = @_;	931	my ($self, $num, $cb) = @_;
425		932
426	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	933	# invoke if available right now
		934	$cb->($self->{face}[$num], 0)
		935	unless exists $self->{face}[$num]{loading};
427		936
428	$self->set_texture ($face->{id} => delete $face->{image});	937	# future changes
429	}	938	$self->on_face_change ($num => $cb)
430
431	sub set_texture {
432	my ($self, $id, $data) = @_;
433
434	$self->{texture}[$id] ||= do {
435	my $tex =
436	new_from_image CFClient::Texture
437	$data, minify => 1, mipmap => 1;
438
439	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
440	$self->{map_widget}->update;
441
442	$tex
443	};
444	}	939	}
445		940
446	sub sound_play {	941	sub sound_play {
447	my ($self, $x, $y, $soundnum, $type) = @_;	942	my ($self, $type, $face, $dx, $dy, $vol) = @_;
448		943
449	$self->{sound_play}->($x, $y, $soundnum, $type);	944	&::audio_sound_play ($face, $dx, $dy, $vol)
		945	unless $type & 1; # odd types are silent for future expansion
450	}	946	}
451		947
452	my $LAST_QUERY; # server is stupid, stupid, stupid	948	my $LAST_QUERY; # server is stupid, stupid, stupid
453		949
454	sub query {	950	sub query {
…		…
458	$LAST_QUERY = $prompt;	954	$LAST_QUERY = $prompt;
459		955
460	$self->{query}-> ($self, $flags, $prompt);	956	$self->{query}-> ($self, $flags, $prompt);
461	}	957	}
462		958
463	sub drawinfo {	959	sub sanitise_xml($) {
464	my ($self, $color, $text) = @_;	960	local $_ = shift;
465		961
466	my @color = (	962	# we now weed out all tags we do not support
		963	s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
		964	# now all entities
		965	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
		966
		967	# handle some elements
		968	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		969	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		970
		971	$_
		972	}
		973
		974	our %NAME_TO_COLOR = (
		975	black => 0,
		976	white => 1,
		977	darkblue => 2,
		978	red => 3,
		979	orange => 4,
		980	lightblue => 5,
		981	darkorange => 6,
		982	green => 7,
		983	darkgreen => 8,
		984	grey => 9,
		985	brown => 10,
		986	yellow => 11,
		987	tan => 12,
		988	);
		989
		990	our @CF_COLOR = (
467	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	991	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
468	[1.00, 1.00, 1.00],	992	[1.00, 1.00, 1.00],
469	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	993	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
470	[1.00, 0.00, 0.00],	994	[1.00, 0.00, 0.00],
471	[1.00, 0.54, 0.00],	995	[1.00, 0.54, 0.00],
472	[0.11, 0.56, 1.00],	996	[0.11, 0.56, 1.00],
473	[0.93, 0.46, 0.00],	997	[0.93, 0.46, 0.00],
474	[0.18, 0.54, 0.34],	998	[0.18, 0.54, 0.34],
475	[0.56, 0.73, 0.56],	999	[0.56, 0.73, 0.56],
476	[0.80, 0.80, 0.80],	1000	[0.80, 0.80, 0.80],
477	[0.55, 0.41, 0.13],	1001	[0.75, 0.61, 0.20],
478	[0.99, 0.77, 0.26],	1002	[0.99, 0.77, 0.26],
479	[0.74, 0.65, 0.41],	1003	[0.74, 0.65, 0.41],
480	);	1004	);
481		1005
		1006	sub msg {
		1007	my ($self, $color, $type, $text, @extra) = @_;
		1008
		1009	$text = sanitise_xml $text;
		1010
		1011	if (my $cb = $self->{cb_msg}{$type}) {
		1012	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1013	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		1014	$type =~ s/-/_/g;
		1015	$self->{$type} = $text;
		1016	} else {
482	$self->logprint ("info: ", $text);	1017	$self->logprint ("msg: ", $text);
		1018	return if $color < 0; # negative color == ignore if not understood
483		1019
484	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	1020	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
485		1021
486	# try to create single paragraphs of multiple lines sent by the server	1022	## try to create single paragraphs of multiple lines sent by the server
		1023	# no longer neecssary with TRT servers
487	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1024	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
488		1025
489	$text = CFClient::UI::Label::escape $text;	1026	::message ({
490	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1027	fg => $fg,
491	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1028	markup => $_,
		1029	type => $type,
		1030	extra => [@extra],
		1031	color_flags => $color
		1032	}) for split /\n/, $text;
492		1033
493	$self->{logview}->add_paragraph ($color[$color], $_)
494	for map "$time $_", split /\n/, $text;
495	$self->{logview}->scroll_to_bottom;
496
497	$self->{statusbox}->add ($text,	1034	$self->{statusbox}->add ($text,
498	group => $text,	1035	group => $text,
499	fg => $color[$color],	1036	fg => $fg,
500	timeout => $color >= 2 ? 60 : 10,	1037	timeout => $color >= 2 ? 180 : 10,
501	tooltip_font => $::FONT_FIXED,	1038	tooltip_font => $::FONT_FIXED,
502	);	1039	);
503	}	1040	}
504
505	sub drawextinfo {
506	my ($self, $color, $type, $subtype, $message) = @_;
507
508	$self->drawinfo ($color, $message);
509	}	1041	}
510		1042
511	sub spell_add {	1043	sub spell_add {
512	my ($self, $spell) = @_;	1044	my ($self, $spell) = @_;
513		1045
514	# try to create single paragraphs of multiple lines sent by the server	1046	# try to create single paragraphs out of the multiple lines sent by the server
515	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1047	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
516	$spell->{message} =~ s/\n+$//;	1048	$spell->{message} =~ s/\n+$//;
517	$spell->{message} ||= "Server did not provide a description for this spell.";	1049	$spell->{message} ||= "Server did not provide a description for this spell.";
518		1050
519	$::SPELL_PAGE->add_spell ($spell);	1051	$::SPELL_LIST->add_spell ($spell);
520		1052
521	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	1053	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
522	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	1054	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
523	}	1055	}
524		1056
525	sub spell_delete {	1057	sub spell_delete {
526	my ($self, $spell) = @_;	1058	my ($self, $spell) = @_;
527		1059
528	$::SPELL_PAGE->remove_spell ($spell);	1060	$::SPELL_LIST->remove_spell ($spell);
		1061	}
		1062
		1063	sub setup {
		1064	my ($self, $setup) = @_;
		1065
		1066	$self->{map_widget}->set_tilesize ($self->{tilesize});
		1067	$::MAP->resize ($self->{mapw}, $self->{maph});
529	}	1068	}
530		1069
531	sub addme_success {	1070	sub addme_success {
532	my ($self) = @_;	1071	my ($self) = @_;
533		1072
534	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
535	my ($pom) = @_;
536
537	my %skill_help;	1073	my %skill_help;
538		1074
539	for my $head2 ($pom->head1->[3]->head2) {	1075	for my $node (CFPlus::Pod::find skill_description => "*") {
540	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	1076	my (undef, @par) = CFPlus::Pod::section_of $node;
541	}	1077	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
542
543	\%skill_help
544	};	1078	};
545		1079
546	for my $skill (values %{$self->{skill_info}}) {	1080	for my $skill (values %{$self->{skill_info}}) {
547	$self->{map_widget}->add_command ("ready_skill $skill",	1081	$self->{map_widget}->add_command ("ready_skill $skill",
548	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	1082	(CFPlus::asxml "Ready the skill '$skill'\n\n")
549	. $skill_help->{$skill});	1083	. $skill_help{$skill});
550	$self->{map_widget}->add_command ("use_skill $skill",	1084	$self->{map_widget}->add_command ("use_skill $skill",
551	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	1085	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
552	. $skill_help->{$skill});	1086	. $skill_help{$skill});
553	}	1087	}
554	}	1088	}
555		1089
556	sub eof {	1090	sub eof {
557	my ($self) = @_;	1091	my ($self) = @_;
…		…
559	$self->{map_widget}->clr_commands;	1093	$self->{map_widget}->clr_commands;
560		1094
561	::stop_game ();	1095	::stop_game ();
562	}	1096	}
563		1097
564	sub image_info {
565	my ($self, $numfaces) = @_;
566
567	$self->{num_faces} = $numfaces;
568	$self->{face_prefetch} = [1 .. $numfaces];
569	$self->face_prefetch;
570	}
571
572	sub face_prefetch {
573	my ($self) = @_;
574
575	return unless $::CFG->{face_prefetch};
576
577	if ($self->{num_faces}) {
578	return if @{ $self->{send_queue} || [] };
579	my $todo = @{ $self->{face_prefetch} }
580	or return;
581
582	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
583
584	$self->send ("requestinfo image_sums $face $face");
585
586	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
587	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
588	} elsif (!exists $self->{num_faces}) {
589	$self->send ("requestinfo image_info");
590
591	$self->{num_faces} = 0;
592
593	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
594	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
595	}
596	}
597
598	sub update_floorbox {	1098	sub update_floorbox {
599	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1099	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
600	return unless $::CONN;	1100	return unless $::CONN;
601		1101
602	$::FLOORBOX->clear;	1102	$::FLOORBOX->clear;
603		1103
		1104	my @add;
		1105
604	my $row;	1106	my $row;
605	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {	1107	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
606	if ($row < 6) {	1108	if ($row < 6) {
607	local $_->{face_widget}; # hack to force recreation of widget	1109	local $_->{face_widget}; # hack to force recreation of widget
608	local $_->{desc_widget}; # hack to force recreation of widget	1110	local $_->{desc_widget}; # hack to force recreation of widget
609	CFClient::Item::update_widgets $_;	1111	CFPlus::Item::update_widgets $_;
610		1112
		1113	push @add,
611	$::FLOORBOX->add (0, $row, $_->{face_widget});	1114	0, $row, $_->{face_widget},
612	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1115	1, $row, $_->{desc_widget};
613		1116
614	$row++;	1117	$row++;
615	} else {	1118	} else {
616	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	1119	push @add, 1, $row, new CFPlus::UI::Button
617	text => "More...",	1120	text => "More...",
618	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1121	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
619	);	1122	;
620	last;	1123	last;
621	}	1124	}
622	}	1125	}
		1126	if ($::CONN->{open_container}) {
		1127	push @add, 1, $row++, new CFPlus::UI::Button
		1128	text => "Close container",
		1129	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		1130	;
		1131	}
		1132
		1133	$::FLOORBOX->add_at (@add);
623	});	1134	});
624		1135
625	$::WANT_REFRESH++;	1136	$::WANT_REFRESH->start;
626	}	1137	}
627		1138
628	sub set_opencont {	1139	sub set_opencont {
629	my ($conn, $tag, $name) = @_;	1140	my ($conn, $tag, $name) = @_;
630	$conn->{open_container} = $tag;	1141	$conn->{open_container} = $tag;
		1142	update_floorbox;
631		1143
632	$::INV_RIGHT_HB->clear ();	1144	$::INVR_HB->clear ();
633	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	1145	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
634		1146
635	if ($tag != 0) { # Floor isn't closable, is it?	1147	if ($tag != 0) { # Floor isn't closable, is it?
636	$::INV_RIGHT_HB->add (new CFClient::UI::Button	1148	$::INVR_HB->add (new CFPlus::UI::Button
637	text => "Close container",	1149	text => "Close container",
638	tooltip => "Close the currently open container (if one is open)",	1150	tooltip => "Close the currently open container (if one is open)",
639	on_activate => sub {	1151	on_activate => sub {
640	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1152	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
641	if $tag != 0;	1153	if $tag != 0;
642	#if $CONN->{open_container} != 0;
643	0	1154	0
644	},	1155	},
645	);	1156	);
646	}	1157	}
647		1158
…		…
649	}	1160	}
650		1161
651	sub update_containers {	1162	sub update_containers {
652	my ($self) = @_;	1163	my ($self) = @_;
653		1164
654	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1165	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
655	for my $tag (keys %{ delete $self->{update_container} }) {	1166	my $todo = delete $self->{update_container}
		1167	or return;
		1168
		1169	for my $tag (keys %$todo) {
		1170	update_floorbox if $tag == 0 or $tag == $self->{open_container};
656	if ($tag == 0) {	1171	if ($tag == 0) {
657	update_floorbox;
658	$::INVR->set_items ($self->{container}{0})	1172	$::INVR->set_items ($self->{container}{0})
659	if $tag == $self->{open_container};	1173	if $tag == $self->{open_container};
660	} elsif ($tag == $self->{player}{tag}) {	1174	} elsif ($tag == $self->{player}{tag}) {
661	$::INV->set_items ($self->{container}{$tag})	1175	$::INV->set_items ($self->{container}{$tag})
662	} else {	1176	} else {
…		…
693	sub item_update {	1207	sub item_update {
694	my ($self, $item) = @_;	1208	my ($self, $item) = @_;
695		1209
696	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1210	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
697		1211
698	CFClient::Item::update_widgets $item;	1212	CFPlus::Item::update_widgets $item;
699		1213
700	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1214	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
701	set_opencont ($::CONN, 0, "Floor");	1215	set_opencont ($::CONN, 0, "Floor");
702		1216
703	} elsif ($item->{flags} & F_OPEN) {	1217	} elsif ($item->{flags} & F_OPEN) {
704	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	1218	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
705		1219
706	} else {	1220	} else {
707	$self->{update_container}{$item->{container}}++;	1221	$self->{update_container}{$item->{container}}++;
708	$self->update_containers;	1222	$self->update_containers;
709	# if ($item->{container} == 0) {
710	# update_floorbox;
711	# update_container (0);
712	# } elsif ($item->{container} == $self->{player}{tag}) {
713	# $::INV->set_items ($self->{container}{$item->{container}})
714	# }
715	}	1223	}
716	}	1224	}
717		1225
718	sub player_update {	1226	sub player_update {
719	my ($self, $player) = @_;	1227	my ($self, $player) = @_;
		1228
		1229	$self->update_weight;
		1230	}
		1231
		1232	sub update_weight {
		1233	my ($self) = @_;
		1234
		1235	my $weight = .001 * $self->{player}{weight};
		1236	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		1237
720	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	1238	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		1239	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		1240	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
721	}	1241	}
722		1242
723	sub update_server_info {	1243	sub update_server_info {
724	my ($self) = @_;	1244	my ($self) = @_;
725		1245
…		…
728	$::SERVER_INFO->set_markup (	1248	$::SERVER_INFO->set_markup (
729	"server <tt>$self->{host}:$self->{port}</tt>\n"	1249	"server <tt>$self->{host}:$self->{port}</tt>\n"
730	. "protocol version <tt>$self->{version}</tt>\n"	1250	. "protocol version <tt>$self->{version}</tt>\n"
731	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1251	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
732	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1252	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1253	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1254	. "editing support $yesno[!!$self->{editor_support}]\n"
		1255	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1256	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
733	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1257	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
734	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1258	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
735	. "map size $self->{mapw}×$self->{maph}\n"	1259	. "map size $self->{mapw}×$self->{maph}\n"
736	);	1260	);
		1261
737	}	1262	}
738		1263
739	sub logged_in {	1264	sub logged_in {
740	my ($self) = @_;	1265	my ($self) = @_;
741		1266
742	$self->send_ext_req (cfplus_support => "1", sub {	1267	$self->send_ext_req (cfplus_support => version => 2, sub {
		1268	my (%msg) = @_;
		1269
743	$self->{cfplus_ext} = $_[0];	1270	$self->{cfplus_ext} = $msg{version};
744	$self->update_server_info;	1271	$self->update_server_info;
		1272
		1273	if ($self->{cfplus_ext} >= 2) {
		1274	$self->send_ext_req ("editor_support", sub {
		1275	$self->{editor_support} = { @_ };
		1276	$self->update_server_info;
		1277
		1278	0
		1279	});
		1280	}
		1281
		1282	0
745	});	1283	});
746		1284
747	$self->update_server_info;	1285	$self->update_server_info;
748		1286
749	$self->send_command ("output-sync $::CFG->{output_sync}");	1287	$self->send_command ("output-sync $::CFG->{output_sync}");
750	$self->send_command ("output-count $::CFG->{output_count}");	1288	$self->send_command ("output-count $::CFG->{output_count}");
		1289	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
751	$self->send_command ("pickup $::CFG->{pickup}");	1290	$self->send_command ("pickup $::CFG->{pickup}");
752	}	1291	}
753		1292
754	sub lookat {	1293	sub lookat {
755	my ($self, $x, $y) = @_;	1294	my ($self, $x, $y) = @_;
756		1295
757	if ($self->{cfplus_ext}) {	1296	if ($self->{cfplus_ext}) {
758	$self->send_ext_req (lookat => "$x $y", sub {	1297	$self->send_ext_req (lookat => $x, $y, sub {
759	my %res = split /\x00/, $_[0];	1298	my (%msg) = @_;
760		1299
761	if (exists $res{npc_dialog}) {	1300	if (exists $msg{npc_dialog}) {
762	# start npc chat dialog	1301	# start npc chat dialog
763	$self->{npc_dialog} = new CFClient::NPCDialog::	1302	$self->{npc_dialog} = new CFPlus::NPCDialog::
764	dx => $x,	1303	token => $msg{npc_dialog},
765	dy => $y,
766	title => "$res{npc_dialog} (NPC)",	1304	title => "$msg{npc_dialog}[0] (NPC)",
767	conn => $self,	1305	conn => $self,
768	;	1306	;
769	}	1307	}
770	});	1308	});
771	}	1309	}
…		…
774	}	1312	}
775		1313
776	sub destroy {	1314	sub destroy {
777	my ($self) = @_;	1315	my ($self) = @_;
778		1316
779	$self->{npc_dialog}->destroy	1317	(delete $self->{npc_dialog})->destroy
780	if $self->{npc_dialog};	1318	if $self->{npc_dialog};
781		1319
782	$self->SUPER::destroy;	1320	$self->SUPER::destroy;
783	}
784		1321
		1322	%$self = ();
		1323	}
		1324
785	package CFClient::NPCDialog;	1325	package CFPlus::NPCDialog;
786		1326
787	our @ISA = 'CFClient::UI::FancyFrame';	1327	our @ISA = 'CFPlus::UI::Toplevel';
788		1328
789	sub new {	1329	sub new {
790	my $class = shift;	1330	my $class = shift;
791		1331
792	my $self = $class->SUPER::new (	1332	my $self = $class->SUPER::new (
…		…
795	name => "npc_dialog",	1335	name => "npc_dialog",
796	force_w => $::WIDTH * 0.7,	1336	force_w => $::WIDTH * 0.7,
797	force_h => $::HEIGHT * 0.7,	1337	force_h => $::HEIGHT * 0.7,
798	title => "NPC Dialog",	1338	title => "NPC Dialog",
799	kw => { hi => 0, yes => 0, no => 0 },	1339	kw => { hi => 0, yes => 0, no => 0 },
		1340	has_close_button => 1,
800	@_,	1341	@_,
801	);	1342	);
802		1343
803	Scalar::Util::weaken (my $this = $self);	1344	CFPlus::weaken (my $this = $self);
		1345
		1346	$self->connect (delete => sub { $this->destroy; 1 });
804		1347
805	# better use a pane...	1348	# better use a pane...
806	$self->add (my $hbox = new CFClient::UI::HBox);	1349	$self->add (my $hbox = new CFPlus::UI::HBox);
807	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	1350	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
808		1351
809	$hbox->add (my $vbox = new CFClient::UI::VBox);	1352	$hbox->add (my $vbox = new CFPlus::UI::VBox);
810		1353
811	$vbox->add (new CFClient::UI::Label text => "Message Entry:");	1354	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
812	$vbox->add ($self->{entry} = new CFClient::UI::Entry	1355	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
813	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1356	tooltip => "#npc_message_entry",
814	. "Sometimes you have to tell an NPC something you cannot find out during "
815	. "a normal conversation (such as a password). In those cases you have to use "
816	. "this text entry. You can also enter responses manually instead of using the response "
817	. "buttons below.",
818	on_activate => sub {	1357	on_activate => sub {
819	my ($entry, $text) = @_;	1358	my ($entry, $text) = @_;
820		1359
821	return unless $text =~ /\S/;	1360	return unless $text =~ /\S/;
822		1361
…		…
825		1364
826	0	1365	0
827	},	1366	},
828	);	1367	);
829		1368
830	$vbox->add ($self->{options} = new CFClient::UI::VBox);	1369	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
831		1370
832	$self->{bye_button} = new CFClient::UI::Button	1371	$self->{bye_button} = new CFPlus::UI::Button
833	text => "Bye (close)",	1372	text => "Bye (close)",
834	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1373	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
835	on_activate => sub { $this->destroy; 0 },	1374	on_activate => sub { $this->destroy; 1 },
836	;	1375	;
837		1376
838	$self->update_options;	1377	$self->update_options;
839		1378
840	$self->{token} = $self->{conn}->ext_token;	1379	$self->{id} = "npc-channel-" . $self->{conn}->token;
841	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1380	$self->{conn}->connect_ext ($self->{id} => sub {
842	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1381	$this->feed (@_) if $this;
		1382	});
		1383
		1384	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
843		1385
844	$self->{entry}->grab_focus;	1386	$self->{entry}->grab_focus;
845		1387
846	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	1388	$self->{textview}->add_paragraph ({
		1389	fg => [1, 1, 0, 1],
		1390	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1391	});
847		1392
848	$self->show;	1393	$self->show;
849	$self	1394	$self
850	};	1395	};
851		1396
852	sub update_options {	1397	sub update_options {
853	my ($self) = @_;	1398	my ($self) = @_;
854		1399
855	Scalar::Util::weaken $self;	1400	CFPlus::weaken $self;
856		1401
857	$self->{options}->clear;	1402	$self->{options}->clear;
858	$self->{options}->add ($self->{bye_button});	1403	$self->{options}->add ($self->{bye_button});
859		1404
860	for my $kw (sort keys %{ $self->{kw} }) {	1405	for my $kw (sort keys %{ $self->{kw} }) {
861	$self->{options}->add (new CFClient::UI::Button	1406	$self->{options}->add (new CFPlus::UI::Button
862	text => $kw,	1407	text => $kw,
863	on_activate => sub {	1408	on_activate => sub {
864	$self->send ($kw);	1409	$self->send ($kw);
865	0	1410	0
866	},	1411	},
867	);	1412	);
868	}	1413	}
869	}	1414	}
870		1415
871	sub feed {	1416	sub feed {
872	my ($self, $data) = @_;	1417	my ($self, $type, @arg) = @_;
873		1418
874	Scalar::Util::weaken $self;	1419	CFPlus::weaken $self;
875		1420
876	my ($type, $msg) = split / /, $data, 2;
877
878	if ($type eq "msg") {	1421	if ($type eq "update") {
879	my ($msg, @kw) = split /\x00/, $msg;	1422	my (%info) = @arg;
880	$self->{kw}{$_} = 1 for @kw;
881		1423
882	$msg = "\n" . CFClient::UI::Label::escape $msg;	1424	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
883	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1425	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
884	my @link;
885	$msg =~ s{
886	($match)
887	}{
888	my $kw = $1;
889
890	push @link, new CFClient::UI::Label
891	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
892	can_hover => 1,
893	can_events => 1,
894	padding_x => 0,
895	padding_y => 0,
896	on_button_up => sub {
897	$self->send ($kw);
898	};
899
900	chr 0xfffc
901	}giex;
902		1426
903	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);	1427	if (exists $info{msg}) {
		1428	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1429	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1430	my @link;
		1431	$text =~ s{
		1432	($match)
		1433	}{
		1434	my $kw = $1;
		1435
		1436	push @link, new CFPlus::UI::Label
		1437	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1438	can_hover => 1,
		1439	can_events => 1,
		1440	padding_x => 0,
		1441	padding_y => 0,
		1442	on_button_up => sub {
		1443	$self->send ($kw);
		1444	};
		1445
		1446	"\x{fffc}"
		1447	}giex;
		1448
		1449	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
904	$self->{textview}->scroll_to_bottom;	1450	$self->{textview}->scroll_to_bottom;
		1451	}
		1452
905	$self->update_options;	1453	$self->update_options;
906	} else {	1454	} else {
907	$self->destroy;	1455	$self->destroy;
908	}	1456	}
909		1457
…		…
911	}	1459	}
912		1460
913	sub send {	1461	sub send {
914	my ($self, $msg) = @_;	1462	my ($self, $msg) = @_;
915		1463
916	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1464	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
917	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
918	$self->{textview}->scroll_to_bottom;	1465	$self->{textview}->scroll_to_bottom;
		1466
		1467	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
919	}	1468	}
920		1469
921	sub destroy {	1470	sub destroy {
922	my ($self) = @_;	1471	my ($self) = @_;
923		1472
924	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1473	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
925		1474
		1475	if ($self->{conn}) {
		1476	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
926	delete $self->{conn}{npc_dialog};	1477	delete $self->{conn}{npc_dialog};
927	$self->{conn}->disconnect_ext ($self->{token});	1478	$self->{conn}->disconnect_ext ($self->{id});
		1479	}
928		1480
929	$self->SUPER::destroy;	1481	$self->SUPER::destroy;
930	}	1482	}
931		1483
932	1;	1484	1
		1485

Diff Legend

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