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

Diff Legend

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