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

Diff Legend

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