ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.96 by root, Fri Apr 6 07:45:35 2007 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

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