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.65 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.228 by root, Wed Nov 21 13:23:10 2012 UTC

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

Diff Legend

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