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.168 by root, Thu Aug 30 07:08:17 2007 UTC

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

Diff Legend

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