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.74 by root, Sun Aug 13 18:48:56 2006 UTC vs.
Revision 1.185 by root, Thu Dec 27 19:12:19 2007 UTC

1	package CFPlus::Protocol;	1	package DC::Protocol;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Deliantra::Protocol::Constants;
7		7
8	use CFPlus;	8	use DC;
		9	use DC::DB;
9	use CFPlus::UI;	10	use DC::UI;
10	use CFPlus::Pod;	11	use DC::Pod;
		12	use DC::Macro;
		13	use DC::Item;
11		14
12	use base 'Crossfire::Protocol::Base';	15	use base 'Deliantra::Protocol::Base';
13		16
14	sub new {	17	sub new {
15	my $class = shift;	18	my ($class, %arg) = @_;
16		19
17	my $self = $class->SUPER::new (@_);	20	my $self = $class->SUPER::new (%arg,
		21	setup_req => {
		22	extmap => 1,
		23	excmd => 1,
		24	widget => 2,
		25	%{$arg{setup_req} || {}},
		26	},
		27	);
18		28
19	$self->{map_widget}->clr_commands;	29	$self->{map_widget}->clr_commands;
20		30
21	my @cmd_help = map {	31	my @cmd_help = map {
22	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	32	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
…		…
24		34
25	my $cmd = $1;	35	my $cmd = $1;
26	my @args = split /\|/, $2;	36	my @args = split /\|/, $2;
27	@args = (".*") unless @args;	37	@args = (".*") unless @args;
28		38
29	my (undef, @par) = CFPlus::Pod::section_of $_;	39	my (undef, @par) = DC::Pod::section_of $_;
30	my $text = CFPlus::Pod::as_label @par;	40	my $text = DC::Pod::as_label @par;
31		41
32	$_ = $_ eq ".*" ? "" : " $_"	42	$_ = $_ eq ".*" ? "" : " $_"
33	for @args;	43	for @args;
34		44
35	map ["$cmd$_", $text],	45	map ["$cmd$_", $text],
36	sort { (length $a) <=> (length $b) }	46	sort { (length $a) <=> (length $b) }
37	@args	47	@args
38	} sort { $a->{par} <=> $b->{par} }	48	} sort { $a->{par} <=> $b->{par} }
39	CFPlus::Pod::find command_help => "*";	49	DC::Pod::find command => "*";
40		50
		51	$self->{json_coder}
		52	->convert_blessed
		53	->filter_json_single_key_object ("\fw" => sub {
		54	$self->{widget}{$_[0]}
		55	})
		56	->filter_json_single_key_object ("\fc" => sub {
		57	my ($id) = @_;
		58	sub {
		59	$self->send_exti_msg (w_e => $id, @_);
		60	}
		61	});
		62
		63	# destroy widgets on logout
		64	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		65	for my $ws (values %{delete $self->{widgetset} || {}}) {
		66	$_->destroy
		67	for values %{delete $ws->{w} || {}};
		68	}
		69	});
		70
41	$self->{map_widget}->add_command (@$_)	71	$self->{map_widget}->add_command (@$_)
42	for @cmd_help;	72	for @cmd_help;
43		73
		74	{
		75	$self->{dialogue} = my $tex = new_from_file DC::Texture
		76	DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		77	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		78	}
		79
		80	{
44	$self->{noface} = new_from_file CFPlus::Texture	81	$self->{noface} = my $tex = new_from_file DC::Texture
45	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	82	DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
		83	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		84	}
46		85
47	$self->{open_container} = 0;	86	$self->{open_container} = 0;
48		87
49	# "global"
50	$self->{tilecache} = CFPlus::db_table "tilecache";
51	$self->{facemap} = CFPlus::db_table "facemap";
52
53	# per server	88	# per server
54	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	89	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55		90
56	$self	91	$self
57	}	92	}
		93
		94	sub update_fx_want {
		95	my ($self) = @_;
		96
		97	$self->send_exti_msg (fx_want => {
		98	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		99	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		100	6 => 1, # FT_RSRC
		101	});
		102	}
		103
		104	sub ext_capabilities {
		105	my ($self, %cap) = @_;
		106
		107	$self->update_fx_want;
		108
		109	$self->send_exti_req (resource => "exp_table", sub {
		110	my ($exp_table) = @_;
		111
		112	$self->register_face_handler ($exp_table, sub {
		113	my ($face) = @_;
		114
		115	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		116	$_->() for values %{ $self->{on_exp_update} || {} };
		117	});
		118
		119	()
		120	});
		121
		122	if (my $ts = $cap{tileset}) {
		123	if (my ($default) = grep $_->[2] & 1, @$ts) {
		124	$self->{tileset} = $default;
		125	$self->{tilesize} = $default->[3];
		126	$self->setup_req (tileset => $default->[0]);
		127
		128	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		129	my $h = int $self->{maph} * 32 / $self->{tilesize};
		130
		131	$self->setup_req (mapsize => "${w}x${h}");
		132	}
		133	}
		134	}
		135
		136	sub ext_ambient_music {
		137	my ($self, $songs) = @_;
		138	&::audio_music_set_ambient ($songs);
		139	}
		140
		141	#############################################################################
		142
		143	sub widget_associate {
		144	my ($self, $ws, $id, $widget) = @_;
		145
		146	$widget ||= new DC::UI::Bin;
		147
		148	$widget->{s_id} = $id;
		149	$self->{widget}{$id} = $widget;
		150
		151	if ($ws) {
		152	$widget->{s_ws} = $ws;
		153	$self->{widgetset}{$ws}{w}{$id} = $widget;
		154	}
		155
		156	$widget->connect (on_destroy => sub {
		157	my ($widget) = @_;
		158
		159	delete $self->{widget}{$widget->{s_id}};
		160	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		161	if exists $widget->{s_ws};
		162	});
		163	}
		164
		165	# widgetset new
		166	sub ext_ws_n {
		167	my ($self, $id) = @_;
		168
		169	$self->{widgetset}{$id} = {
		170	w => {},
		171	};
		172	}
		173
		174	# widgetset destroy
		175	sub ext_ws_d {
		176	my ($self, $id) = @_;
		177
		178	my $ws = delete $self->{widgetset}{$id}
		179	or return;
		180
		181	$_->destroy
		182	for values %{$ws->{w}};
		183	}
		184
		185	# widgetset create
		186	sub ext_ws_c {
		187	my ($self, $ws, $id, $class, $args) = @_;
		188
		189	$self->widget_associate (
		190	$ws, $id => scalar eval {
		191	local $SIG{__DIE__};
		192	"DC::UI::$class"->new (%$args)
		193	}
		194	);
		195	}
		196
		197	# widgetset create template
		198	sub ext_ws_ct {
		199	my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
		200
		201	$done_cb ||= sub { };
		202
		203	my $parse_list; $parse_list = sub {
		204	my ($list) = @_;
		205	my @w;
		206
		207	while (@$list) {
		208	my ($class, $args) = splice @$list, 0, 2;
		209	my $name = delete $args->{s_id};
		210	my $cl = delete $args->{s_cl};
		211	my $cfg = delete $cfg->{$name};
		212	my $id = delete $cfg->{id};
		213	my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
		214	or next;
		215
		216	$self->widget_associate ($ws, $id, $w)
		217	if $id;
		218
		219	$w->add ($parse_list->($cl))
		220	if $cl;
		221
		222	push @w, $w;
		223	}
		224
		225	@w
		226	};
		227
		228	# either array reference, or face #
		229	if ($type eq "inline") {
		230	$parse_list->($template);
		231	$done_cb->();
		232	} elsif ($type eq "face") {
		233	#...
		234	$done_cb->(0);
		235	} else {
		236	$done_cb->(0);
		237	}
		238	}
		239
		240	# widgetset associate
		241	sub ext_ws_a {
		242	my ($self, %ass) = @_;
		243
		244	# everything that has a name, wether conceivably useful or not
		245	my %wkw = (
		246	root => $DC::UI::ROOT,
		247	tooltip => $DC::UI::TOOLTIP,
		248
		249	mapwidget => $::MAPWIDGET,
		250	buttonbar => $::BUTTONBAR,
		251	metaserver => $::METASERVER,
		252	buttonbar => $::BUTTONBAR,
		253	login_button => $::LOGIN_BUTTON,
		254	quit_dialog => $::QUIT_DIALOG,
		255	host_entry => $::HOST_ENTRY,
		256	metaserver => $::METASERVER,
		257	server_info => $::SERVER_INFO,
		258
		259	setup_dialog => $::SETUP_DIALOG,
		260	setup_notebook => $::SETUP_NOTEBOOK,
		261	setup_server => $::SETUP_SERVER,
		262	setup_keyboard => $::SETUP_KEYBOARD,
		263
		264	pl_notebook => $::PL_NOTEBOOK,
		265	pl_window => $::PL_WINDOW,
		266	inventory_page => $::INVENTORY_PAGE,
		267	stats_page => $::STATS_PAGE,
		268	skill_page => $::SKILL_PAGE,
		269	spell_page => $::SPELL_PAGE,
		270	spell_list => $::SPELL_LIST,
		271
		272	floorbox => $::FLOORBOX,
		273	help_window => $::HELP_WINDOW,
		274	message_window => $::MESSAGE_WINDOW,
		275	statusbox => $::SDTATUSBOX,
		276
		277	inv => $::INV,
		278	invr => $::INVR,
		279	invr_hb => $::INVR_HB,
		280	);
		281
		282	while (my ($id, $name) = each %ass) {
		283	$self->widget_associate (undef, $id => $wkw{$name});
		284	}
		285	}
		286
		287	# widget call
		288	sub ext_w_c {
		289	my ($self, $id, $rcb, $method, @args) = @_;
		290
		291	my $w = $self->{widget}{$id}
		292	or return;
		293
		294	if ($rcb) {
		295	$rcb->($w->$method (@args));
		296	} else {
		297	$w->$method (@args);
		298	}
		299	}
		300
		301	# widget set
		302	sub ext_w_s {
		303	my ($self, $id, $attr) = @_;
		304
		305	my $w = $self->{widget}{$id}
		306	or return;
		307
		308	for (my $i = 0; $i < $#$attr; $i += 2) {
		309	my ($member, $value) = @$attr[$i, $i+1];
		310	if (defined $value) {
		311	$w->{$member} = $value;
		312	} else {
		313	delete $w->{$member};
		314	}
		315	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		316	}
		317	}
		318
		319	# widget get
		320	sub ext_w_g {
		321	my ($self, $id, $rid, @attr) = @_;
		322
		323	my $w = $self->{widget}{$id}
		324	or return;
		325
		326	$self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
		327	}
		328
		329	# message window
		330	sub ext_channel_info {
		331	my ($self, $info) = @_;
		332	$self->{channels}->{$info->{id}} = $info;
		333	$::MESSAGE_WINDOW->add_channel ($info);
		334	}
		335
		336	#############################################################################
58		337
59	sub logprint {	338	sub logprint {
60	my ($self, @a) = @_;	339	my ($self, @a) = @_;
61		340
62	$self->{log_fh} ||= do {	341	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
63	my $path = "$Crossfire::VARDIR/log.$self->{host}";
64
65	open my $fh, ">>:utf8", $path
66	or die "Couldn't open logfile $path: $!";
67
68	$fh->autoflush (1);
69
70	$fh;
71	};
72
73	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
74
75	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
76	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
77
78	print {$self->{log_fh}} "$ts ", @a, "\n";
79	}	342	}
80		343
81	sub _stat_numdiff {	344	sub _stat_numdiff {
82	my ($self, $name, $old, $new) = @_;	345	my ($self, $name, $old, $new) = @_;
83		346
…		…
167		430
168	if (	431	if (
169	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	432	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
170	) {	433	) {
171	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	434	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
172	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);	435	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
173	}	436	}
174		437
175	$self->update_stats_window ($stats, $prev);	438	$self->update_stats_window ($stats, $prev);
176		439
177	$self->{prev_stats} = { %$stats };	440	$self->{prev_stats} = { %$stats };
…		…
216	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	479	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
217	$::GAUGES->{food} ->set_value ($fo, $fo_m);	480	$::GAUGES->{food} ->set_value ($fo, $fo_m);
218	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	481	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
219	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	482	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	483	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221	my $rng = $stats->{+CS_STAT_RANGE};	484	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
222	$rng =~ s/^Range: //; # thank you so much dear server	485	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
223	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
224	my $title = $stats->{+CS_STAT_TITLE};	486	my $title = $stats->{+CS_STAT_TITLE};
225	$title =~ s/^Player: //;	487	$title =~ s/^Player: //;
226	$::STATWIDS->{title} ->set_text ("Title: " . $title);	488	$::STATWIDS->{title} ->set_text ("Title: " . $title);
227		489
228	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	490	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
245	for keys %RES_TBL;	507	for keys %RES_TBL;
246		508
247	my $sktbl = $::STATWIDS->{skill_tbl};	509	my $sktbl = $::STATWIDS->{skill_tbl};
248	my @skills = keys %{ $self->{skill_info} };	510	my @skills = keys %{ $self->{skill_info} };
249		511
250	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	512	my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		513	map [$_, $self->{skill_info}{$_}],
		514	grep exists $stats->{$_},
		515	@skills;
		516
		517	if ($self->{stat_order} ne join ",", map $_->[0], @order) {
		518	$self->{stat_order} = join ",", map $_->[0], @order;
		519
251	$sktbl->clear;	520	$sktbl->clear;
252		521
		522	my $sw = $self->{skillwid}{""} ||= [
253	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	523	0, 0, (new DC::UI::Label text => "Experience", align => 1),
254	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	524	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
		525	2, 0, (new DC::UI::Label text => "Progress", align => 0),
255	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	526	3, 0, (new DC::UI::Label text => "Skill", expand => 1),
256	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	527	4, 0, (new DC::UI::Label text => "Experience", align => 1),
257	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	528	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
		529	6, 0, (new DC::UI::Label text => "Progress", align => 0),
258	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	530	7, 0, (new DC::UI::Label text => "Skill", expand => 1),
		531	];
		532
		533	my @add = @$sw;
259		534
260	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	535	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
261		536
262	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	537	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	538	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264		539
265	my ($x, $y) = (0, 1);	540	my ($x, $y) = (0, 1);
266	for (	541	for (@order) {
267	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268	map [$_, $self->{skill_info}{$_}],
269	grep exists $stats->{$_},
270	@skills
271	) {
272	my ($idx, $name) = @$_;	542	my ($idx, $name) = @$_;
273		543
274	my $spell_cb = sub {	544	my $spell_cb = sub {
275	my ($widget, $ev) = @_;	545	my ($widget, $ev) = @_;
276		546
277	if ($ev->{button} == 1) {	547	if ($ev->{button} == 1) {
278	$::CONN->user_send ("ready_skill $name");	548	$::CONN->user_send ("ready_skill $name");
279	} elsif ($ev->{button} == 2) {	549	} elsif ($ev->{button} == 2) {
280	$::CONN->user_send ("use_skill $name");	550	$::CONN->user_send ("use_skill $name");
281	} elsif ($ev->{button} == 3) {	551	} elsif ($ev->{button} == 3) {
		552	my $shortname = DC::shorten $name, 14;
282	(new CFPlus::UI::Menu	553	(new DC::UI::Menu
283	items => [	554	items => [
284	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	555	["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
285	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	556	["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
286	],	557	],
287	)->popup ($ev);	558	)->popup ($ev);
288	} else {	559	} else {
289	return 0;	560	return 0;
290	}	561	}
291		562
292	1	563	1
293	};	564	};
294		565
295	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	566	my $sw = $self->{skillwid}{$idx} ||= [
		567	# exp
		568	(new DC::UI::Label
296	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	569	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	570
		571	# level
		572	(new DC::UI::Label
298	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	573	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		574
		575	# progress
		576	(new DC::UI::ExperienceProgress),
		577
		578	# label
299	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	579	(new DC::UI::Label text => $name, on_button_down => $spell_cb,
300	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	580	can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		581	];
		582
		583	push @add,
		584	$x * 4 + 0, $y, $sw->[0],
		585	$x * 4 + 1, $y, $sw->[1],
		586	$x * 4 + 2, $y, $sw->[2],
		587	$x * 4 + 3, $y, $sw->[3],
		588	;
301		589
302	$x++ and ($x, $y) = (0, $y + 1);	590	$x++ and ($x, $y) = (0, $y + 1);
303	}	591	}
304	}
305		592
306	for (grep exists $stats->{$_}, @skills) {	593	$sktbl->add_at (@add);
307	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	594	}
308	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	595
		596	for (@order) {
		597	my ($idx, $name) = @$_;
		598	my $val = $stats->{$idx};
		599
		600	next if $prev->{$idx}[1] eq $val->[1];
		601
		602	my $sw = $self->{skillwid}{$idx};
		603	$sw->[0]->set_text (::formsep ($val->[1]));
		604	$sw->[1]->set_text ($val->[0] * 1);
		605	$sw->[2]->set_value (@$val);
		606
		607	$::GAUGES->{sklprg}->set_label ("$name %d%%");
		608	$::GAUGES->{sklprg}->set_value (@$val);
309	}	609	}
310	}	610	}
311		611
312	sub user_send {	612	sub user_send {
313	my ($self, $command) = @_;	613	my ($self, $command) = @_;
314		614
		615	$self->{record}->($command)
315	if ($self->{record}) {	616	if $self->{record};
316	push @{$self->{record}}, $command;
317	}
318		617
319	$self->logprint ("send: ", $command);	618	$self->logprint ("send: ", $command);
320	$self->send_command ($command);	619	$self->send_command ($command);
321	::status ($command);
322	}	620	}
323		621
324	sub start_record {	622	sub record {
325	my ($self) = @_;	623	my ($self, $cb) = @_;
326		624
327	$self->{record} = [];	625	$self->{record} = $cb;
328	}
329
330	sub stop_record {
331	my ($self) = @_;
332	return delete $self->{record};
333	}	626	}
334		627
335	sub map_scroll {	628	sub map_scroll {
336	my ($self, $dx, $dy) = @_;	629	my ($self, $dx, $dy) = @_;
337		630
…		…
339	}	632	}
340		633
341	sub feed_map1a {	634	sub feed_map1a {
342	my ($self, $data) = @_;	635	my ($self, $data) = @_;
343		636
344	$self->{map}->map1a_update ($data);	637	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		638	my $delay;
		639
		640	for my $tile (@$missing) {
		641	next if $self->{delay}{$tile};
		642
		643	$delay = 1;
		644
		645	if (my $tex = $::CONN->{texture}[$tile]) {
		646	$tex->upload;
		647	} else {
		648	$self->{delay}{$tile} = 1;
		649
		650	# we assume the face is in-flight and will eventually come
		651	push @{$self->{tile_cb}{$tile}}, sub {
		652	delete $self->{delay}{$tile};
		653	$_[0]->upload;
		654	};
		655	}
		656	}
		657
		658	if ($delay) {
		659	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		660	EV::once undef, 0, 0.03, sub {
		661	$self->{map_widget}->update
		662	if $self->{map_widget};
		663	};
		664	} else {
345	$self->{map_widget}->update;	665	$self->{map_widget}->update;
		666	}
346	}	667	}
347		668
348	sub magicmap {	669	sub magicmap {
349	my ($self, $w, $h, $x, $y, $data) = @_;	670	my ($self, $w, $h, $x, $y, $data) = @_;
350		671
…		…
357	my $map_info = delete $self->{map_info}	678	my $map_info = delete $self->{map_info}
358	or return;	679	or return;
359		680
360	my ($hash, $x, $y, $w, $h) = @$map_info;	681	my ($hash, $x, $y, $w, $h) = @$map_info;
361		682
362	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	683	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
363	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	684	$self->{map_cache_new}{$hash} = \$data;
364	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	685	DC::DB::put $self->{mapcache} => $hash => $data, sub { };
365	}	686	}
366		687
367	sub map_clear {	688	sub map_clear {
368	my ($self) = @_;	689	my ($self) = @_;
369		690
…		…
372		693
373	$self->{map}->clear;	694	$self->{map}->clear;
374	delete $self->{map_widget}{magicmap};	695	delete $self->{map_widget}{magicmap};
375	}	696	}
376		697
		698	sub bg_fetch {
		699	my ($self) = @_;
		700
		701	my $tile;
		702
		703	do {
		704	$tile = pop @{$self->{bg_fetch}}
		705	or return;
		706	} while $self->{texture}[$tile];
		707
		708	DC::DB::get tilecache => $tile, sub {
		709	my ($data) = @_;
		710
		711	return unless $self->{map}; # stop when destroyed
		712
		713	if (defined $data) {
		714	$self->have_tile ($tile, $data);
		715	$self->{texture}[$tile]->upload;
		716	}
		717
		718	$self->bg_fetch;
		719	};
		720	}
377		721
378	sub load_map($$$) {	722	sub load_map($$$) {
379	my ($self, $hash, $x, $y) = @_;	723	my ($self, $hash, $x, $y) = @_;
380		724
381	if (defined (my $data = $self->{mapcache}->get ($hash))) {	725	my $gen = $self->{map_change_gen};
		726
		727	my $cb = sub {
		728	return unless $gen == $self->{map_change_gen};
		729
		730	my ($data) = @_;
		731
		732	if (defined $data) {
		733	$self->{map_cache_new}{$hash} = \$data;
		734
382	$data = Compress::LZF::decompress $data;	735	my $data = Compress::LZF::decompress $data;
383	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
384	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385	my $data = $self->{tilecache}->get ($id)
386	or next;
387		736
388	$self->set_texture ($id => $data);	737	my $inprogress = @{ $self->{bg_fetch} || [] };
		738	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		739	$self->bg_fetch unless $inprogress;
389	}	740	}
		741	};
		742
		743	if (my $rdata = $self->{map_cache_old}{$hash}) {
		744	$cb->($$rdata);
		745	} else {
		746	DC::DB::get $self->{mapcache} => $hash, $cb;
390	}	747	}
391	}	748	}
392		749
393	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	750	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394	# (server resource,s latency, bandwidth), so this hack is warranted.	751	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
459		816
460	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	817	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	818	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462		819
463	} else {	820	} else {
		821	my $gen = $self->{map_change_gen};
464	$self->send_mapinfo ("spatial $path$tile", sub {	822	$self->send_mapinfo ("spatial $path$tile", sub {
		823	return unless $gen == $self->{map_change_gen};
		824
465	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	825	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466		826
467	return if $mode ne "spatial";	827	return if $mode ne "spatial";
468		828
469	$x += $self->{map}->ox;	829	$x += $self->{map}->ox;
…		…
483		843
484	sub map_change {	844	sub map_change {
485	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	845	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486		846
487	$self->flush_map;	847	$self->flush_map;
		848
		849	++$self->{map_change_gen};
		850	$self->{map_cache_old} = delete $self->{map_cache_new};
488		851
489	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	852	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490		853
491	my $mapmapw = $self->{mapmap}->{w};	854	my $mapmapw = $self->{mapmap}->{w};
492	my $mapmaph = $self->{mapmap}->{h};	855	my $mapmaph = $self->{mapmap}->{h};
…		…
509	$self->load_map ($hash, $x, $y);	872	$self->load_map ($hash, $x, $y);
510	$self->flood_fill (0, 0, 0, "", $hash, $flags);	873	$self->flood_fill (0, 0, 0, "", $hash, $flags);
511	}	874	}
512		875
513	sub face_find {	876	sub face_find {
514	my ($self, $facenum, $face) = @_;	877	my ($self, $facenum, $face, $cb) = @_;
515		878
516	my $hash = "$face->{chksum},$face->{name}";	879	if ($face->{type} == 0) { # FT_FACE
		880	my $id = DC::DB::get_tile_id_sync $face->{name};
517		881
518	my $id = $self->{facemap}->get ($hash);
519
520	unless ($id) {
521	# create new id for face
522	# I love transactions
523	for (1..100) {
524	my $txn = $CFPlus::DB_ENV->txn_begin;
525	my $status = $self->{facemap}->db_get (id => $id);
526	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
527	$id = ($id || 64) + 1;
528	if ($self->{facemap}->put (id => $id) == 0
529	&& $self->{facemap}->put ($hash => $id) == 0) {
530	$txn->txn_commit;
531
532	goto gotid;
533	}
534	}
535	$txn->txn_abort;
536	}
537
538	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539	}
540
541	gotid:
542	$face->{id} = $id;	882	$face->{id} = $id;
543	$self->{map}->set_face ($facenum => $id);	883	$self->{map}->set_tileid ($facenum => $id);
544	$self->{faceid}[$facenum] = $id;#d#
545		884
546	my $face = $self->{tilecache}->get ($id);	885	DC::DB::get tilecache => $id, $cb;
547		886
548	if ($face) {	887	} elsif ($face->{type} & 1) { # with metadata
549	#$self->face_prefetch;	888	DC::DB::get res_meta => $face->{name}, $cb;
550	$face	889
551	} else {	890	} else { # no metadata
552	my $tex = $self->{noface};	891	DC::DB::get res_data => $face->{name}, $cb;
553	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554	undef
555	};	892	}
556	}	893	}
557		894
558	sub face_update {	895	sub face_update {
559	my ($self, $facenum, $face, $changed) = @_;	896	my ($self, $facenum, $face, $changed) = @_;
560		897
561	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	898	if ($face->{type} == 0) {
		899	# image, FT_FACE
		900	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		901	if $changed;
562		902
563	$self->set_texture ($face->{id} => delete $face->{image});	903	$self->have_tile ($face->{id}, delete $face->{data});
564	}
565		904
566	sub set_texture {	905	} elsif ($face->{type} & 1) {
		906	# split metadata case, FT_MUSIC, FT_SOUND
		907	if ($changed) { # new data
		908	my ($meta, $data) = unpack "(w/a*)*", $face->{data};
		909	$face->{data} = $meta;
		910
		911	# rely on strict ordering here and also on later fetch
		912	DC::DB::put res_data => $face->{name} => $data, sub { };
		913	DC::DB::put res_meta => $face->{name} => $meta, sub { };
		914	}
		915
		916	$face->{data} = $self->{json_coder}->decode ($face->{data});
		917	::add_license ($face);
		918	::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
		919	if $changed;
		920
		921	if ($face->{type} == 3) { # FT_MUSIC
		922	&::audio_music_push ($facenum);
		923	} elsif ($face->{type} == 5) { # FT_SOUND
		924	&::audio_sound_push ($facenum);
		925	}
		926
		927	} else {
		928	# flat resource case, FT_RSRC
		929	DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
		930	if $changed;
		931	}
		932
		933	if (my $cbs = $self->{face_cb}{$facenum}) {
		934	$_->($face, $changed) for @$cbs;
		935	}
		936	}
		937
		938	sub smooth_update {
		939	my ($self, $facenum, $face) = @_;
		940
		941	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		942	}
		943
		944	sub have_tile {
567	my ($self, $id, $data) = @_;	945	my ($self, $tile, $data) = @_;
568		946
569	$self->{texture}[$id] ||= do {	947	return unless $self->{map};
570	my $tex =	948
571	new_from_image CFPlus::Texture	949	my $tex = $self->{texture}[$tile] ||=
		950	new DC::Texture
		951	tile => $tile,
		952	image => $data, delete_image => 1,
572	$data, minify => 1, mipmap => 1;	953	minify => 1, mipmap => 1;
573		954
574	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	955	if (my $cbs = delete $self->{tile_cb}{$tile}) {
575	$self->{map_widget}->update;	956	$_->($tex) for @$cbs;
576
577	$tex
578	};	957	}
		958	}
		959
		960	# call in non-void context registers a temporary
		961	# hook with handle, otherwise its permanent
		962	sub on_face_change {
		963	my ($self, $num, $cb) = @_;
		964
		965	push @{$self->{face_cb}{$num}}, $cb;
		966
		967	defined wantarray
		968	? DC::guard {
		969	@{$self->{face_cb}{$num}}
		970	= grep $_ != $cb,
		971	@{$self->{face_cb}{$num}};
		972	}
		973	: ()
		974	}
		975
		976	# call in non-void context registers a temporary
		977	# hook with handle, otherwise its permanent
		978	sub register_face_handler {
		979	my ($self, $num, $cb) = @_;
		980
		981	return unless $num;
		982
		983	# invoke if available right now
		984	$cb->($self->{face}[$num], 0)
		985	unless exists $self->{face}[$num]{loading};
		986
		987	# future changes
		988	$self->on_face_change ($num => $cb)
579	}	989	}
580		990
581	sub sound_play {	991	sub sound_play {
582	my ($self, $x, $y, $soundnum, $type) = @_;	992	my ($self, $type, $face, $dx, $dy, $vol) = @_;
583		993
584	$self->{sound_play}->($x, $y, $soundnum, $type);	994	&::audio_sound_play ($face, $dx, $dy, $vol)
		995	unless $type & 1; # odd types are silent for future expansion
585	}	996	}
586		997
587	my $LAST_QUERY; # server is stupid, stupid, stupid	998	my $LAST_QUERY; # server is stupid, stupid, stupid
588		999
589	sub query {	1000	sub query {
…		…
593	$LAST_QUERY = $prompt;	1004	$LAST_QUERY = $prompt;
594		1005
595	$self->{query}-> ($self, $flags, $prompt);	1006	$self->{query}-> ($self, $flags, $prompt);
596	}	1007	}
597		1008
598	sub drawinfo {	1009	sub sanitise_xml($) {
599	my ($self, $color, $text) = @_;	1010	local $_ = shift;
600		1011
601	my @color = (	1012	# we now weed out all tags we do not support
		1013	s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
		1014	}{
		1015	"&lt;"
		1016	}gex;
		1017
		1018	# now all entities
		1019	s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
		1020
		1021	# handle some elements
		1022	s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		1023	s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		1024
		1025	$_
		1026	}
		1027
		1028	our %NAME_TO_COLOR = (
		1029	black => 0,
		1030	white => 1,
		1031	darkblue => 2,
		1032	red => 3,
		1033	orange => 4,
		1034	lightblue => 5,
		1035	darkorange => 6,
		1036	green => 7,
		1037	darkgreen => 8,
		1038	grey => 9,
		1039	brown => 10,
		1040	yellow => 11,
		1041	tan => 12,
		1042	);
		1043
		1044	our @CF_COLOR = (
602	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1045	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
603	[1.00, 1.00, 1.00],	1046	[1.00, 1.00, 1.00],
604	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1047	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
605	[1.00, 0.00, 0.00],	1048	[1.00, 0.00, 0.00],
606	[1.00, 0.54, 0.00],	1049	[1.00, 0.54, 0.00],
607	[0.11, 0.56, 1.00],	1050	[0.11, 0.56, 1.00],
608	[0.93, 0.46, 0.00],	1051	[0.93, 0.46, 0.00],
609	[0.18, 0.54, 0.34],	1052	[0.18, 0.54, 0.34],
610	[0.56, 0.73, 0.56],	1053	[0.56, 0.73, 0.56],
611	[0.80, 0.80, 0.80],	1054	[0.80, 0.80, 0.80],
612	[0.75, 0.61, 0.20],	1055	[0.75, 0.61, 0.20],
613	[0.99, 0.77, 0.26],	1056	[0.99, 0.77, 0.26],
614	[0.74, 0.65, 0.41],	1057	[0.74, 0.65, 0.41],
615	);	1058	);
616		1059
		1060	sub msg {
		1061	my ($self, $color, $type, $text, @extra) = @_;
		1062
		1063	$text = sanitise_xml $text;
		1064
		1065	if (my $cb = $self->{cb_msg}{$type}) {
		1066	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1067	} elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
		1068	$type =~ s/-/_/g;
		1069	$self->{$type} = $text;
		1070	} else {
617	$self->logprint ("info: ", $text);	1071	$self->logprint ("msg: ", $text);
		1072	return if $color < 0; # negative color == ignore if not understood
618		1073
619	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	1074	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
620		1075
621	# try to create single paragraphs of multiple lines sent by the server	1076	## try to create single paragraphs of multiple lines sent by the server
		1077	# no longer neecssary with TRT servers
622	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1078	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
623		1079
624	$text = CFPlus::asxml $text;	1080	for (split /\n/, $text) {
625	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1081	::message ({
626	$text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1082	fg => $fg,
		1083	markup => $_,
		1084	type => $type,
		1085	extra => [@extra],
		1086	color_flags => $color, #d# ugly, kill
		1087	});
627		1088
628	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })	1089	$color &= ~NDI_CLEAR; # only clear once for multiline messages
629	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;	1090	# actually, this is an ugly design. _we_ should control the channels,
630	$self->{logview}->scroll_to_bottom;	1091	# not some random other widget, as the channels are clearly protocol-specific.
		1092	# then we could also react to flags such as CLEAR without resorting to
		1093	# hacks such as color_flags, above.
		1094	}
631		1095
632	$self->{statusbox}->add ($text,	1096	$self->{statusbox}->add ($text,
633	group => $text,	1097	group => $text,
634	fg => $color[$color],	1098	fg => $fg,
635	timeout => $color >= 2 ? 180 : 10,	1099	timeout => $color >= 2 ? 180 : 10,
636	tooltip_font => $::FONT_FIXED,	1100	tooltip_font => $::FONT_FIXED,
637	);	1101	) if $type eq "info";
638	}	1102	}
639
640	sub drawextinfo {
641	my ($self, $color, $type, $subtype, $message) = @_;
642
643	$self->drawinfo ($color, $message);
644	}	1103	}
645		1104
646	sub spell_add {	1105	sub spell_add {
647	my ($self, $spell) = @_;	1106	my ($self, $spell) = @_;
648		1107
649	# try to create single paragraphs out of the multiple lines sent by the server	1108	# try to create single paragraphs out of the multiple lines sent by the server
650	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1109	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651	$spell->{message} =~ s/\n+$//;	1110	$spell->{message} =~ s/\n+$//;
652	$spell->{message} ||= "Server did not provide a description for this spell.";	1111	$spell->{message} ||= "Server did not provide a description for this spell.";
653		1112
654	$::SPELL_PAGE->add_spell ($spell);	1113	$::SPELL_LIST->add_spell ($spell);
655		1114
656	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	1115	$self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
657	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	1116	$self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
658	}	1117	}
659		1118
660	sub spell_delete {	1119	sub spell_delete {
661	my ($self, $spell) = @_;	1120	my ($self, $spell) = @_;
662		1121
663	$::SPELL_PAGE->remove_spell ($spell);	1122	$::SPELL_LIST->remove_spell ($spell);
		1123	}
		1124
		1125	sub setup {
		1126	my ($self, $setup) = @_;
		1127
		1128	$self->{map_widget}->set_tilesize ($self->{tilesize});
		1129	$::MAP->resize ($self->{mapw}, $self->{maph});
664	}	1130	}
665		1131
666	sub addme_success {	1132	sub addme_success {
667	my ($self) = @_;	1133	my ($self) = @_;
668		1134
669	my %skill_help;	1135	my %skill_help;
670		1136
671	for my $node (CFPlus::Pod::find skill_description => "*") {	1137	for my $node (DC::Pod::find skill_description => "*") {
672	my (undef, @par) = CFPlus::Pod::section_of $node;	1138	my (undef, @par) = DC::Pod::section_of $node;
673	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1139	$skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
674	};	1140	};
675		1141
676	for my $skill (values %{$self->{skill_info}}) {	1142	for my $skill (values %{$self->{skill_info}}) {
677	$self->{map_widget}->add_command ("ready_skill $skill",	1143	$self->{map_widget}->add_command ("ready_skill $skill",
678	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1144	(DC::asxml "Ready the skill '$skill'\n\n")
679	. $skill_help{$skill});	1145	. $skill_help{$skill});
680	$self->{map_widget}->add_command ("use_skill $skill",	1146	$self->{map_widget}->add_command ("use_skill $skill",
681	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1147	(DC::asxml "Immediately use the skill '$skill'\n\n")
682	. $skill_help{$skill});	1148	. $skill_help{$skill});
683	}	1149	}
684	}	1150	}
685		1151
686	sub eof {	1152	sub eof {
…		…
689	$self->{map_widget}->clr_commands;	1155	$self->{map_widget}->clr_commands;
690		1156
691	::stop_game ();	1157	::stop_game ();
692	}	1158	}
693		1159
694	sub image_info {
695	my ($self, $numfaces) = @_;
696
697	$self->{num_faces} = $numfaces;
698	$self->{face_prefetch} = [1 .. $numfaces];
699	$self->face_prefetch;
700	}
701
702	sub face_prefetch {
703	my ($self) = @_;
704
705	return unless $::CFG->{face_prefetch};
706
707	if ($self->{num_faces}) {
708	return if @{ $self->{send_queue} || [] };
709	my $todo = @{ $self->{face_prefetch} }
710	or return;
711
712	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
713
714	$self->send ("requestinfo image_sums $face $face");
715
716	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
717	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
718	} elsif (!exists $self->{num_faces}) {
719	$self->send ("requestinfo image_info");
720
721	$self->{num_faces} = 0;
722
723	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
724	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
725	}
726	}
727
728	sub update_floorbox {	1160	sub update_floorbox {
729	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1161	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
730	return unless $::CONN;	1162	return unless $::CONN;
731		1163
732	$::FLOORBOX->clear;	1164	$::FLOORBOX->clear;
		1165
		1166	my @add;
733		1167
734	my $row;	1168	my $row;
735	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {	1169	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
736	if ($row < 6) {	1170	if ($row < 6) {
737	local $_->{face_widget}; # hack to force recreation of widget	1171	local $_->{face_widget}; # hack to force recreation of widget
738	local $_->{desc_widget}; # hack to force recreation of widget	1172	local $_->{desc_widget}; # hack to force recreation of widget
739	CFPlus::Item::update_widgets $_;	1173	DC::Item::update_widgets $_;
740		1174
		1175	push @add,
741	$::FLOORBOX->add (0, $row, $_->{face_widget});	1176	0, $row, $_->{face_widget},
742	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1177	1, $row, $_->{desc_widget};
743		1178
744	$row++;	1179	$row++;
745	} else {	1180	} else {
746	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1181	push @add, 1, $row, new DC::UI::Button
747	text => "More...",	1182	text => "More...",
748	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1183	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
749	);	1184	;
750	last;	1185	last;
751	}	1186	}
752	}	1187	}
753	if ($::CONN->{open_container}) {	1188	if ($::CONN->{open_container}) {
754	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1189	push @add, 1, $row++, new DC::UI::Button
755	text => "Close container",	1190	text => "Close container",
756	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1191	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
757	);	1192	;
758	}	1193	}
		1194
		1195	$::FLOORBOX->add_at (@add);
759	});	1196	});
760		1197
761	$::WANT_REFRESH++;	1198	$::WANT_REFRESH = 1;
762	}	1199	}
763		1200
764	sub set_opencont {	1201	sub set_opencont {
765	my ($conn, $tag, $name) = @_;	1202	my ($conn, $tag, $name) = @_;
766	$conn->{open_container} = $tag;	1203	$conn->{open_container} = $tag;
767	update_floorbox;	1204	update_floorbox;
768		1205
769	$::INV_RIGHT_HB->clear ();	1206	$::INVR_HB->clear ();
770	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1207	$::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
771		1208
772	if ($tag != 0) { # Floor isn't closable, is it?	1209	if ($tag != 0) { # Floor isn't closable, is it?
773	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1210	$::INVR_HB->add (new DC::UI::Button
774	text => "Close container",	1211	text => "Close container",
775	tooltip => "Close the currently open container (if one is open)",	1212	tooltip => "Close the currently open container (if one is open)",
776	on_activate => sub {	1213	on_activate => sub {
777	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1214	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
778	if $tag != 0;	1215	if $tag != 0;
779	#if $CONN->{open_container} != 0;
780	0	1216	0
781	},	1217	},
782	);	1218	);
783	}	1219	}
784		1220
…		…
786	}	1222	}
787		1223
788	sub update_containers {	1224	sub update_containers {
789	my ($self) = @_;	1225	my ($self) = @_;
790		1226
791	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1227	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
792	my $todo = delete $self->{update_container}	1228	my $todo = delete $self->{update_container}
793	or return;	1229	or return;
794		1230
795	for my $tag (keys %$todo) {	1231	for my $tag (keys %$todo) {
796	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1232	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
833	sub item_update {	1269	sub item_update {
834	my ($self, $item) = @_;	1270	my ($self, $item) = @_;
835		1271
836	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	1272	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
837		1273
838	CFPlus::Item::update_widgets $item;	1274	DC::Item::update_widgets $item;
839		1275
840	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1276	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
841	set_opencont ($::CONN, 0, "Floor");	1277	set_opencont ($::CONN, 0, "Floor");
842		1278
843	} elsif ($item->{flags} & F_OPEN) {	1279	} elsif ($item->{flags} & F_OPEN) {
844	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1280	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
845		1281
846	} else {	1282	} else {
847	$self->{update_container}{$item->{container}}++;	1283	$self->{update_container}{$item->{container}}++;
848	$self->update_containers;	1284	$self->update_containers;
849	}	1285	}
…		…
874	$::SERVER_INFO->set_markup (	1310	$::SERVER_INFO->set_markup (
875	"server <tt>$self->{host}:$self->{port}</tt>\n"	1311	"server <tt>$self->{host}:$self->{port}</tt>\n"
876	. "protocol version <tt>$self->{version}</tt>\n"	1312	. "protocol version <tt>$self->{version}</tt>\n"
877	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1313	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1314	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1315	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1316	. "editing support $yesno[!!$self->{editor_support}]\n"
		1317	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1318	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1319	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1320	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881	. "map size $self->{mapw}×$self->{maph}\n"	1321	. "map size $self->{mapw}×$self->{maph}\n"
882	);	1322	);
		1323
883	}	1324	}
884		1325
885	sub logged_in {	1326	sub logged_in {
886	my ($self) = @_;	1327	my ($self) = @_;
887		1328
888	$self->send_ext_req (cfplus_support => version => 1, sub {	1329	$self->send_ext_req (cfplus_support => version => 2, sub {
		1330	my (%msg) = @_;
		1331
889	$self->{cfplus_ext} = $_[0]{version};	1332	$self->{cfplus_ext} = $msg{version};
890	$self->update_server_info;	1333	$self->update_server_info;
		1334
		1335	if ($self->{cfplus_ext} >= 2) {
		1336	$self->send_ext_req ("editor_support", sub {
		1337	$self->{editor_support} = { @_ };
		1338	$self->update_server_info;
		1339
		1340	0
		1341	});
		1342	}
891		1343
892	0	1344	0
893	});	1345	});
894		1346
895	$self->update_server_info;	1347	$self->update_server_info;
896		1348
897	$self->send_command ("output-sync $::CFG->{output_sync}");	1349	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898	$self->send_command ("output-count $::CFG->{output_count}");
899	$self->send_command ("pickup $::CFG->{pickup}");	1350	$self->send_command ("pickup $::CFG->{pickup}");
900	}	1351	}
901		1352
902	sub lookat {	1353	sub lookat {
903	my ($self, $x, $y) = @_;	1354	my ($self, $x, $y) = @_;
904		1355
905	if ($self->{cfplus_ext}) {	1356	if ($self->{cfplus_ext}) {
906	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1357	$self->send_ext_req (lookat => $x, $y, sub {
907	my ($msg) = @_;	1358	my (%msg) = @_;
908		1359
909	if (exists $msg->{npc_dialog}) {	1360	if (exists $msg{npc_dialog}) {
910	# start npc chat dialog	1361	# start npc chat dialog
911	$self->{npc_dialog} = new CFPlus::NPCDialog::	1362	$self->{npc_dialog} = new DC::NPCDialog::
912	dx => $x,	1363	token => $msg{npc_dialog},
913	dy => $y,
914	title => "$msg->{npc_dialog} (NPC)",	1364	title => "$msg{npc_dialog}[0] (NPC)",
915	conn => $self,	1365	conn => $self,
916	;	1366	;
917	}	1367	}
918	});	1368	});
919	}	1369	}
…		…
922	}	1372	}
923		1373
924	sub destroy {	1374	sub destroy {
925	my ($self) = @_;	1375	my ($self) = @_;
926		1376
927	$self->{npc_dialog}->destroy	1377	(delete $self->{npc_dialog})->destroy
928	if $self->{npc_dialog};	1378	if $self->{npc_dialog};
929		1379
930	$self->SUPER::destroy;	1380	$self->SUPER::destroy;
931	}
932		1381
		1382	%$self = ();
		1383	}
		1384
933	package CFPlus::NPCDialog;	1385	package DC::NPCDialog;
934		1386
935	our @ISA = 'CFPlus::UI::FancyFrame';	1387	our @ISA = 'DC::UI::Toplevel';
936		1388
937	sub new {	1389	sub new {
938	my $class = shift;	1390	my $class = shift;
939		1391
940	my $self = $class->SUPER::new (	1392	my $self = $class->SUPER::new (
…		…
947	kw => { hi => 0, yes => 0, no => 0 },	1399	kw => { hi => 0, yes => 0, no => 0 },
948	has_close_button => 1,	1400	has_close_button => 1,
949	@_,	1401	@_,
950	);	1402	);
951		1403
952	Scalar::Util::weaken (my $this = $self);	1404	DC::weaken (my $this = $self);
953		1405
954	$self->connect (delete => sub { $this->destroy; 1 });	1406	$self->connect (delete => sub { $this->destroy; 1 });
955		1407
956	# better use a pane...	1408	# better use a pane...
957	$self->add (my $hbox = new CFPlus::UI::HBox);	1409	$self->add (my $hbox = new DC::UI::HBox);
958	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1410	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
959		1411
960	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1412	$hbox->add (my $vbox = new DC::UI::VBox);
961		1413
962	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1414	$vbox->add (new DC::UI::Label text => "Message Entry:");
963	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1415	$vbox->add ($self->{entry} = new DC::UI::Entry
964	tooltip => "#npc_message_entry",	1416	tooltip => "#npc_message_entry",
965	on_activate => sub {	1417	on_activate => sub {
966	my ($entry, $text) = @_;	1418	my ($entry, $text) = @_;
967		1419
968	return unless $text =~ /\S/;	1420	return unless $text =~ /\S/;
…		…
972		1424
973	0	1425	0
974	},	1426	},
975	);	1427	);
976		1428
977	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1429	$vbox->add ($self->{options} = new DC::UI::VBox);
978		1430
979	$self->{bye_button} = new CFPlus::UI::Button	1431	$self->{bye_button} = new DC::UI::Button
980	text => "Bye (close)",	1432	text => "Bye (close)",
981	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1433	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
982	on_activate => sub { $this->destroy; 1 },	1434	on_activate => sub { $this->destroy; 1 },
983	;	1435	;
984		1436
985	$self->update_options;	1437	$self->update_options;
986		1438
987	$self->{id} = $self->{conn}->send_ext_req (	1439	$self->{id} = "npc-channel-" . $self->{conn}->token;
988	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1440	$self->{conn}->connect_ext ($self->{id} => sub {
989	sub { $this && $this->feed (@_) }	1441	$this->feed (@_) if $this;
990	);	1442	});
		1443
		1444	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
991		1445
992	$self->{entry}->grab_focus;	1446	$self->{entry}->grab_focus;
993		1447
994	$self->{textview}->add_paragraph ({	1448	$self->{textview}->add_paragraph ({
995	fg => [1, 1, 0, 1],	1449	fg => [1, 1, 0, 1],
…		…
1001	};	1455	};
1002		1456
1003	sub update_options {	1457	sub update_options {
1004	my ($self) = @_;	1458	my ($self) = @_;
1005		1459
1006	Scalar::Util::weaken $self;	1460	DC::weaken $self;
1007		1461
1008	$self->{options}->clear;	1462	$self->{options}->clear;
1009	$self->{options}->add ($self->{bye_button});	1463	$self->{options}->add ($self->{bye_button});
1010		1464
1011	for my $kw (sort keys %{ $self->{kw} }) {	1465	for my $kw (sort keys %{ $self->{kw} }) {
1012	$self->{options}->add (new CFPlus::UI::Button	1466	$self->{options}->add (new DC::UI::Button
1013	text => $kw,	1467	text => $kw,
1014	on_activate => sub {	1468	on_activate => sub {
1015	$self->send ($kw);	1469	$self->send ($kw);
1016	0	1470	0
1017	},	1471	},
1018	);	1472	);
1019	}	1473	}
1020	}	1474	}
1021		1475
1022	sub feed {	1476	sub feed {
1023	my ($self, $msg) = @_;	1477	my ($self, $type, @arg) = @_;
1024		1478
1025	Scalar::Util::weaken $self;	1479	DC::weaken $self;
1026		1480
1027	if ($msg->{msgtype} eq "reply") {	1481	if ($type eq "update") {
		1482	my (%info) = @arg;
		1483
1028	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1484	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1029	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1485	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1030
1031	my $text = "\n" . CFPlus::asxml $msg->{msg};
1032	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1033	my @link;
1034	$text =~ s{
1035	($match)
1036	}{
1037	my $kw = $1;
1038
1039	push @link, new CFPlus::UI::Label
1040	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1041	can_hover => 1,
1042	can_events => 1,
1043	padding_x => 0,
1044	padding_y => 0,
1045	on_button_up => sub {
1046	$self->send ($kw);
1047	};
1048
1049	chr 0xfffc
1050	}giex;
1051		1486
		1487	if (exists $info{msg}) {
		1488	my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
		1489	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1490	my @link;
		1491	$text =~ s{
		1492	($match)
		1493	}{
		1494	my $kw = $1;
		1495
		1496	push @link, new DC::UI::Label
		1497	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1498	can_hover => 1,
		1499	can_events => 1,
		1500	padding_x => 0,
		1501	padding_y => 0,
		1502	on_button_up => sub {
		1503	$self->send ($kw);
		1504	};
		1505
		1506	"\x{fffc}"
		1507	}giex;
		1508
1052	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1509	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053	$self->{textview}->scroll_to_bottom;	1510	$self->{textview}->scroll_to_bottom;
		1511	}
		1512
1054	$self->update_options;	1513	$self->update_options;
1055	} else {	1514	} else {
1056	$self->destroy;	1515	$self->destroy;
1057	}	1516	}
1058		1517
…		…
1060	}	1519	}
1061		1520
1062	sub send {	1521	sub send {
1063	my ($self, $msg) = @_;	1522	my ($self, $msg) = @_;
1064		1523
1065	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1524	$self->{textview}->add_paragraph ({ markup => "\n" . DC::asxml $msg });
1066	$self->{textview}->scroll_to_bottom;	1525	$self->{textview}->scroll_to_bottom;
1067		1526
1068	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1527	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1069	}	1528	}
1070		1529
1071	sub destroy {	1530	sub destroy {
1072	my ($self) = @_;	1531	my ($self) = @_;
1073		1532
1074	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1533	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1075		1534
1076	if ($self->{conn}) {	1535	if ($self->{conn}) {
1077	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1536	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1078	delete $self->{conn}{npc_dialog};	1537	delete $self->{conn}{npc_dialog};
1079	$self->{conn}->disconnect_ext ($self->{id});	1538	$self->{conn}->disconnect_ext ($self->{id});
1080	}	1539	}
1081		1540
1082	$self->SUPER::destroy;	1541	$self->SUPER::destroy;
1083	}	1542	}
1084		1543
1085	1	1544	1
		1545

Diff Legend

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