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

Diff Legend

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