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.84 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.196 by root, Thu May 8 21:30:23 2008 UTC

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

Diff Legend

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