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

Diff Legend

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