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

Diff Legend

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