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.75 by root, Sun Aug 13 19:47:05 2006 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 DC::DB;
9	use CFPlus::UI;	10	use DC::UI;
10	use CFPlus::Pod;	11	use DC::Pod;
		12	use DC::Macro;
		13	use DC::Item;
11		14
12	use base 'Crossfire::Protocol::Base';	15	use base 'Deliantra::Protocol::Base';
		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#
13		27
14	sub new {	28	sub new {
15	my $class = shift;	29	my ($class, %arg) = @_;
16		30
17	my $self = $class->SUPER::new (@_);	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	);
18		39
19	$self->{map_widget}->clr_commands;	40	$self->{map_widget}->clr_commands;
20		41
21	my @cmd_help = map {	42	my @cmd_help = map {
22	$_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x	43	$_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
23	or die "unparseable command help: $_->{kw}[0]";	44	or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
24		45
25	my $cmd = $1;	46	my $cmd = $1;
26	my @args = split /\|/, $2;	47	my @args = split /\|/, $2;
27	@args = (".*") unless @args;	48	@args = (".*") unless @args;
28		49
29	my (undef, @par) = CFPlus::Pod::section_of $_;	50	my (undef, @par) = DC::Pod::section_of $_;
30	my $text = CFPlus::Pod::as_label @par;	51	my $text = DC::Pod::as_label @par;
31		52
32	$_ = $_ eq ".*" ? "" : " $_"	53	$_ = $_ eq ".*" ? "" : " $_"
33	for @args;	54	for @args;
34		55
35	map ["$cmd$_", $text],	56	map ["$cmd$_", $text],
36	sort { (length $a) <=> (length $b) }	57	sort { (length $a) <=> (length $b) }
37	@args	58	@args
38	} sort { $a->{par} <=> $b->{par} }	59	} sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
39	CFPlus::Pod::find command_help => "*";	60	DC::Pod::find command => "*";
40		61
		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 {
		68	my ($id) = @_;
		69	sub {
		70	$self->send_exti_msg (w_e => $id, @_);
		71	}
		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;
		86	});
		87
41	$self->{map_widget}->add_command (@$_)	88	$self->{map_widget}->add_command (@$_)
42	for @cmd_help;	89	for @cmd_help;
43		90
44	$self->{noface} = new_from_file CFPlus::Texture	91	{
45	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	92	$self->{dialogue} = my $tex = $TEX_DIALOGUE;
		93	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		94	}
		95
		96	{
		97	$self->{noface} = my $tex = $TEX_NOFACE;
		98	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		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	# };
46		120
47	$self->{open_container} = 0;	121	$self->{open_container} = 0;
48		122
49	# "global"
50	$self->{tilecache} = CFPlus::db_table "tilecache";
51	$self->{facemap} = CFPlus::db_table "facemap";
52
53	# per server	123	# per server
54	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	124	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55		125
56	$self	126	$self
57	}	127	}
		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	#############################################################################
58		380
59	sub logprint {	381	sub logprint {
60	my ($self, @a) = @_;	382	my ($self, @a) = @_;
61		383
62	$self->{log_fh} ||= do {	384	DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
63	my $path = "$Crossfire::VARDIR/log.$self->{host}";
64
65	open my $fh, ">>:utf8", $path
66	or die "Couldn't open logfile $path: $!";
67
68	$fh->autoflush (1);
69
70	$fh;
71	};
72
73	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
74
75	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
76	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
77
78	print {$self->{log_fh}} "$ts ", @a, "\n";
79	}	385	}
80		386
81	sub _stat_numdiff {	387	sub _stat_numdiff {
82	my ($self, $name, $old, $new) = @_;	388	my ($self, $name, $old, $new) = @_;
83		389
…		…
167		473
168	if (	474	if (
169	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	475	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
170	) {	476	) {
171	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	477	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
172	$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);
173	}	479	}
174		480
175	$self->update_stats_window ($stats, $prev);	481	$self->update_stats_window ($stats, $prev);
176		482
177	$self->{prev_stats} = { %$stats };	483	$self->{prev_stats} = { %$stats };
…		…
216	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	522	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
217	$::GAUGES->{food} ->set_value ($fo, $fo_m);	523	$::GAUGES->{food} ->set_value ($fo, $fo_m);
218	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	524	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
219	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	525	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	526	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221	my $rng = $stats->{+CS_STAT_RANGE};	527	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
222	$rng =~ s/^Range: //; # thank you so much dear server	528	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
223	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
224	my $title = $stats->{+CS_STAT_TITLE};	529	my $title = $stats->{+CS_STAT_TITLE};
225	$title =~ s/^Player: //;	530	$title =~ s/^Player: //;
226	$::STATWIDS->{title} ->set_text ("Title: " . $title);	531	$::STATWIDS->{title} ->set_text ("Title: " . $title);
227		532
228	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	533	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
245	for keys %RES_TBL;	550	for keys %RES_TBL;
246		551
247	my $sktbl = $::STATWIDS->{skill_tbl};	552	my $sktbl = $::STATWIDS->{skill_tbl};
248	my @skills = keys %{ $self->{skill_info} };	553	my @skills = keys %{ $self->{skill_info} };
249		554
250	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
251	$sktbl->clear;	563	$sktbl->clear;
252		564
		565	my $sw = $self->{skillwid}{""} ||= [
253	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	566	0, 0, (new DC::UI::Label text => "Experience", align => 1),
254	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	567	1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
255	$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),
256	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	570	4, 0, (new DC::UI::Label text => "Experience", align => 1),
257	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	571	5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
258	$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	];
259		575
		576	my @add = @$sw;
		577
260	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>";
261		579
262	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);
263	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);
264		582
265	my ($x, $y) = (0, 1);	583	my ($x, $y) = (0, 1);
266	for (	584	for (@order) {
267	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268	map [$_, $self->{skill_info}{$_}],
269	grep exists $stats->{$_},
270	@skills
271	) {
272	my ($idx, $name) = @$_;	585	my ($idx, $name) = @$_;
273		586
274	my $spell_cb = sub {	587	my $spell_cb = sub {
275	my ($widget, $ev) = @_;	588	my ($widget, $ev) = @_;
276		589
277	if ($ev->{button} == 1) {	590	if ($ev->{button} == 1) {
278	$::CONN->user_send ("ready_skill $name");	591	$::CONN->user_send ("ready_skill $name");
279	} elsif ($ev->{button} == 2) {	592	} elsif ($ev->{button} == 2) {
280	$::CONN->user_send ("use_skill $name");	593	$::CONN->user_send ("use_skill $name");
281	} elsif ($ev->{button} == 3) {	594	} elsif ($ev->{button} == 3) {
		595	my $shortname = DC::shorten $name, 14;
282	(new CFPlus::UI::Menu	596	(new DC::UI::Menu
283	items => [	597	items => [
284	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	598	["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
285	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	599	["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
286	],	600	],
287	)->popup ($ev);	601	)->popup ($ev);
288	} else {	602	} else {
289	return 0;	603	return 0;
290	}	604	}
291		605
292	1	606	1
293	};	607	};
294		608
295	$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
296	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),
297	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	613
		614	# level
		615	(new DC::UI::Label
298	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
299	$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,
300	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	;
301		632
302	$x++ and ($x, $y) = (0, $y + 1);	633	$x++ and ($x, $y) = (0, $y + 1);
303	}	634	}
304	}
305		635
306	for (grep exists $stats->{$_}, @skills) {	636	$sktbl->add_at (@add);
307	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	637	}
308	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	638
		639	for (@order) {
		640	my ($idx, $name) = @$_;
		641	my $val = $stats->{$idx};
		642
		643	next if $prev->{$idx}[1] eq $val->[1];
		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);
309	}	652	}
310	}	653	}
311		654
312	sub user_send {	655	sub user_send {
313	my ($self, $command) = @_;	656	my ($self, $command) = @_;
314		657
		658	$self->{record}->($command)
315	if ($self->{record}) {	659	if $self->{record};
316	push @{$self->{record}}, $command;
317	}
318		660
319	$self->logprint ("send: ", $command);	661	$self->logprint ("send: ", $command);
320	$self->send_command ($command);	662	$self->send_command ($command);
321	::status ($command);
322	}	663	}
323		664
324	sub start_record {	665	sub record {
325	my ($self) = @_;	666	my ($self, $cb) = @_;
326		667
327	$self->{record} = [];	668	$self->{record} = $cb;
328	}
329
330	sub stop_record {
331	my ($self) = @_;
332	return delete $self->{record};
333	}	669	}
334		670
335	sub map_scroll {	671	sub map_scroll {
336	my ($self, $dx, $dy) = @_;	672	my ($self, $dx, $dy) = @_;
337		673
338	$self->{map}->scroll ($dx, $dy);	674	$self->{map_widget}->scroll ($dx, $dy);
339	}	675	}
340		676
341	sub feed_map1a {	677	sub feed_map1a {
342	my ($self, $data) = @_;	678	my ($self, $data) = @_;
343		679
344	$self->{map}->map1a_update ($data);	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 {
345	$self->{map_widget}->update;	708	$self->{map_widget}->update;
		709	}
346	}	710	}
347		711
348	sub magicmap {	712	sub magicmap {
349	my ($self, $w, $h, $x, $y, $data) = @_;	713	my ($self, $w, $h, $x, $y, $data) = @_;
350		714
…		…
352	}	716	}
353		717
354	sub flush_map {	718	sub flush_map {
355	my ($self) = @_;	719	my ($self) = @_;
356		720
357	my $map_info = delete $self->{map_info}	721	return unless $self->{map_info};
358	or return;
359		722
		723	for my $map_info (values %{ $self->{map_cache} || {} }) {
360	my ($hash, $x, $y, $w, $h) = @$map_info;	724	my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
361		725
362	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	726	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
363	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	727
364	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	728	if ($data ne $$rdata) {
		729	$map_info->[1] = \$data;
		730	my $cdata = Compress::LZF::compress $data;
		731	DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
		732	}
		733	}
365	}	734	}
366		735
367	sub map_clear {	736	sub map_clear {
368	my ($self) = @_;	737	my ($self) = @_;
369		738
370	$self->flush_map;	739	$self->flush_map;
		740	delete $self->{map_info};
371	delete $self->{neigh_map};	741	delete $self->{neigh_map};
372		742
373	$self->{map}->clear;	743	$self->{map}->clear;
374	delete $self->{map_widget}{magicmap};	744	delete $self->{map_widget}{magicmap};
375	}	745	}
376		746
		747	sub bg_fetch {
		748	my ($self) = @_;
377		749
		750	my $tile;
		751
		752	do {
		753	$tile = pop @{$self->{bg_fetch}}
		754	or return;
		755	} while $self->{texture}[$tile];
		756
		757	DC::DB::get tilecache => $tile, sub {
		758	my ($data) = @_;
		759
		760	return unless $self->{map}; # stop when destroyed
		761
		762	if (defined $data) {
		763	$self->have_tile ($tile, $data);
		764	$self->{texture}[$tile]->upload;
		765	}
		766
		767	$self->bg_fetch;
		768	};
		769	}
		770
378	sub load_map($$$) {	771	sub load_map($$$$$$) {
379	my ($self, $hash, $x, $y) = @_;	772	my ($self, $hash, $x, $y, $w, $h) = @_;
380		773
381	if (defined (my $data = $self->{mapcache}->get ($hash))) {	774	my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
382	$data = Compress::LZF::decompress $data;
383	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
384	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385	my $data = $self->{tilecache}->get ($id)
386	or next;
387		775
388	$self->set_texture ($id => $data);	776	my $cb = sub {
		777	$map_info->[1] = \$_[0];
		778
		779	my $inprogress = @{ $self->{bg_fetch} || [] };
		780	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
		781	$self->bg_fetch unless $inprogress;
		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]);
389	}	793	};
390	}	794	}
391	}	795	}
392		796
393	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	797	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394	# (server resource,s latency, bandwidth), so this hack is warranted.	798	# (server resources, latency, bandwidth), so this hack is warranted.
395	# 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
396	sub send_mapinfo {	800	sub send_mapinfo {
397	my ($self, $data, $cb) = @_;	801	my ($self, $data, $cb) = @_;
398		802
399	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)$%) {
…		…
424	}	828	}
425		829
426	# this method does a "flood fill" into every tile direction	830	# this method does a "flood fill" into every tile direction
427	# it assumes that tiles are arranged in a rectangular grid,	831	# it assumes that tiles are arranged in a rectangular grid,
428	# 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.
429	# failure to comply are harmless and result in display errors	833	# failure to comply is harmless and results in display errors
430	# at worst.	834	# at worst.
431	sub flood_fill {	835	sub flood_fill {
432	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;	836	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
433		837
434	# the server does not allow map paths > 6	838	# the server does not allow map paths > 6
…		…
459		863
460	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	864	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	865	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462		866
463	} else {	867	} else {
		868	my $gen = $self->{map_change_gen};
464	$self->send_mapinfo ("spatial $path$tile", sub {	869	$self->send_mapinfo ("spatial $path$tile", sub {
		870	return unless $gen == $self->{map_change_gen};
		871
465	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	872	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466		873
467	return if $mode ne "spatial";	874	return if $mode ne "spatial";
468		875
469	$x += $self->{map}->ox;	876	$x += $self->{map}->ox;
470	$y += $self->{map}->oy;	877	$y += $self->{map}->oy;
471		878
472	$self->load_map ($hash, $x, $y)	879	$self->load_map ($hash, $x, $y, $w, $h)
473	unless $self->{neigh_map}{$hash}[5]++;#d#	880	unless $self->{neigh_map}{$hash}[5]++;#d#
474		881
475	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];	882	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
476		883
477	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	884	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
…		…
483		890
484	sub map_change {	891	sub map_change {
485	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	892	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486		893
487	$self->flush_map;	894	$self->flush_map;
		895
		896	++$self->{map_change_gen};
		897	$self->{map_cache_old} = delete $self->{map_cache};
488		898
489	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	899	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490		900
491	my $mapmapw = $self->{mapmap}->{w};	901	my $mapmapw = $self->{mapmap}->{w};
492	my $mapmaph = $self->{mapmap}->{h};	902	my $mapmaph = $self->{mapmap}->{h};
…		…
504	$self->{map_info} = [$hash, $x, $y, $w, $h];	914	$self->{map_info} = [$hash, $x, $y, $w, $h];
505		915
506	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;	916	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
507	$::STATWIDS->{map}->set_text ("Map: " . $map);	917	$::STATWIDS->{map}->set_text ("Map: " . $map);
508		918
509	$self->load_map ($hash, $x, $y);	919	$self->load_map ($hash, $x, $y, $w, $h);
510	$self->flood_fill (0, 0, 0, "", $hash, $flags);	920	$self->flood_fill (0, 0, 0, "", $hash, $flags);
511	}	921	}
512		922
513	sub face_find {	923	sub face_find {
514	my ($self, $facenum, $face) = @_;	924	my ($self, $facenum, $face, $cb) = @_;
515		925
516	my $hash = "$face->{chksum},$face->{name}";	926	if ($face->{type} == 0) { # FT_FACE
		927	my $id = DC::DB::get_tile_id_sync $face->{name};
517		928
518	my $id = $self->{facemap}->get ($hash);
519
520	unless ($id) {
521	# create new id for face
522	# I love transactions
523	for (1..100) {
524	my $txn = $CFPlus::DB_ENV->txn_begin;
525	my $status = $self->{facemap}->db_get (id => $id);
526	if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
527	$id = ($id || 64) + 1;
528	if ($self->{facemap}->put (id => $id) == 0
529	&& $self->{facemap}->put ($hash => $id) == 0) {
530	$txn->txn_commit;
531
532	goto gotid;
533	}
534	}
535	$txn->txn_abort;
536	}
537
538	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539	}
540
541	gotid:
542	$face->{id} = $id;	929	$face->{id} = $id;
543	$self->{map}->set_face ($facenum => $id);	930	$self->{map}->set_tileid ($facenum => $id);
544	$self->{faceid}[$facenum] = $id;#d#
545		931
546	my $face = $self->{tilecache}->get ($id);	932	DC::DB::get tilecache => $id, $cb;
547		933
548	if ($face) {	934	} elsif ($face->{type} & 1) { # with metadata
549	#$self->face_prefetch;	935	DC::DB::get res_meta => $face->{name}, $cb;
550	$face	936
551	} else {	937	} else { # no metadata
552	my $tex = $self->{noface};	938	DC::DB::get res_data => $face->{name}, $cb;
553	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554	undef
555	};	939	}
556	}	940	}
557		941
558	sub face_update {	942	sub face_update {
559	my ($self, $facenum, $face, $changed) = @_;	943	my ($self, $facenum, $face, $changed) = @_;
560		944
561	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	945	if ($face->{type} == 0) {
		946	# image, FT_FACE
		947	DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		948	if $changed;
562		949
563	$self->set_texture ($face->{id} => delete $face->{image});	950	$self->have_tile ($face->{id}, delete $face->{data});
564	}
565		951
566	sub set_texture {	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	}
		983	}
		984
		985	sub smooth_update {
		986	my ($self, $facenum, $face) = @_;
		987
		988	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		989	}
		990
		991	sub have_tile {
567	my ($self, $id, $data) = @_;	992	my ($self, $tile, $data) = @_;
568		993
569	$self->{texture}[$id] ||= do {	994	return unless $self->{map};
570	my $tex =	995
571	new_from_image CFPlus::Texture	996	my $tex = $self->{texture}[$tile] ||=
		997	new DC::Texture
		998	tile => $tile,
		999	image => $data, delete_image => 1,
572	$data, minify => 1, mipmap => 1;	1000	minify => 1, mipmap => 1;
573		1001
574	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	1002	if (my $cbs = delete $self->{tile_cb}{$tile}) {
575	$self->{map_widget}->update;	1003	$_->($tex) for @$cbs;
576
577	$tex
578	};	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)
579	}	1036	}
580		1037
581	sub sound_play {	1038	sub sound_play {
582	my ($self, $x, $y, $soundnum, $type) = @_;	1039	my ($self, $type, $face, $dx, $dy, $vol) = @_;
583		1040
584	$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
585	}	1043	}
586		1044
587	my $LAST_QUERY; # server is stupid, stupid, stupid	1045	my $LAST_QUERY; # server is stupid, stupid, stupid
588		1046
589	sub query {	1047	sub query {
…		…
593	$LAST_QUERY = $prompt;	1051	$LAST_QUERY = $prompt;
594		1052
595	$self->{query}-> ($self, $flags, $prompt);	1053	$self->{query}-> ($self, $flags, $prompt);
596	}	1054	}
597		1055
598	sub drawinfo {	1056	sub sanitise_xml($) {
599	my ($self, $color, $text) = @_;	1057	local $_ = shift;
600		1058
601	my @color = (	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	);
		1092
		1093	our @CF_COLOR = (
602	[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],
603	[1.00, 1.00, 1.00],	1095	[1.00, 1.00, 1.00],
604	[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]
605	[1.00, 0.00, 0.00],	1097	[1.00, 0.00, 0.00],
606	[1.00, 0.54, 0.00],	1098	[1.00, 0.54, 0.00],
607	[0.11, 0.56, 1.00],	1099	[0.11, 0.56, 1.00],
608	[0.93, 0.46, 0.00],	1100	[0.93, 0.46, 0.00],
609	[0.18, 0.54, 0.34],	1101	[0.18, 0.54, 0.34],
610	[0.56, 0.73, 0.56],	1102	[0.56, 0.73, 0.56],
611	[0.80, 0.80, 0.80],	1103	[0.80, 0.80, 0.80],
612	[0.75, 0.61, 0.20],	1104	[0.75, 0.61, 0.20],
613	[0.99, 0.77, 0.26],	1105	[0.99, 0.77, 0.26],
614	[0.74, 0.65, 0.41],	1106	[0.74, 0.65, 0.41],
615	);	1107	);
616		1108
		1109	sub msg {
		1110	my ($self, $color, $type, $text, @extra) = @_;
		1111
		1112	$text = sanitise_xml $text;
		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 {
617	$self->logprint ("info: ", $text);	1120	$self->logprint ("msg: ", $text);
		1121	return if $color < 0; # negative color == ignore if not understood
618		1122
619	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	1123	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
620		1124
621	# 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
		1126	# no longer neecssary with TRT servers
622	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1127	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
623		1128
624	$text = CFPlus::asxml $text;	1129	::message ({
625	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1130	fg => $fg,
626	$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	});
627		1136
628	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })	1137	# $color &= ~NDI_CLEAR; # only clear once for multiline messages
629	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;	1138	# # actually, this is an ugly design. _we_ should control the channels,
630	$self->{logview}->scroll_to_bottom;	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.
631		1142
632	$self->{statusbox}->add ($text,	1143	$self->{statusbox}->add ($text,
633	group => $text,	1144	group => $text,
634	fg => $color[$color],	1145	fg => $fg,
635	timeout => $color >= 2 ? 180 : 10,	1146	timeout => $color >= 2 ? 180 : 10,
636	tooltip_font => $::FONT_FIXED,	1147	tooltip_font => $::FONT_FIXED,
637	);	1148	) if $type eq "info";
638	}	1149	}
639
640	sub drawextinfo {
641	my ($self, $color, $type, $subtype, $message) = @_;
642
643	$self->drawinfo ($color, $message);
644	}	1150	}
645		1151
646	sub spell_add {	1152	sub spell_add {
647	my ($self, $spell) = @_;	1153	my ($self, $spell) = @_;
648		1154
649	# try to create single paragraphs out of the multiple lines sent by the server	1155	# try to create single paragraphs out of the multiple lines sent by the server
650	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	1156	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651	$spell->{message} =~ s/\n+$//;	1157	$spell->{message} =~ s/\n+$//;
652	$spell->{message} ||= "Server did not provide a description for this spell.";	1158	$spell->{message} ||= "Server did not provide a description for this spell.";
653		1159
654	$::SPELL_PAGE->add_spell ($spell);	1160	$::SPELL_LIST->add_spell ($spell);
655		1161
656	$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});
657	$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});
658	}	1164	}
659		1165
660	sub spell_delete {	1166	sub spell_delete {
661	my ($self, $spell) = @_;	1167	my ($self, $spell) = @_;
662		1168
663	$::SPELL_PAGE->remove_spell ($spell);	1169	$::SPELL_LIST->remove_spell ($spell);
		1170	}
		1171
		1172	sub setup {
		1173	my ($self, $setup) = @_;
		1174
		1175	$self->{map_widget}->set_tilesize ($self->{tilesize});
		1176	$::MAP->resize ($self->{mapw}, $self->{maph});
664	}	1177	}
665		1178
666	sub addme_success {	1179	sub addme_success {
667	my ($self) = @_;	1180	my ($self) = @_;
668		1181
669	my %skill_help;	1182	my %skill_help;
670		1183
671	for my $node (CFPlus::Pod::find skill_description => "*") {	1184	for my $node (DC::Pod::find skill_description => "*") {
672	my (undef, @par) = CFPlus::Pod::section_of $node;	1185	my (undef, @par) = DC::Pod::section_of $node;
673	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;	1186	$skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
674	};	1187	};
675		1188
676	for my $skill (values %{$self->{skill_info}}) {	1189	for my $skill (values %{$self->{skill_info}}) {
677	$self->{map_widget}->add_command ("ready_skill $skill",	1190	$self->{map_widget}->add_command ("ready_skill $skill",
678	(CFPlus::asxml "Ready the skill '$skill'\n\n")	1191	(DC::asxml "Ready the skill '$skill'\n\n")
679	. $skill_help{$skill});	1192	. $skill_help{$skill});
680	$self->{map_widget}->add_command ("use_skill $skill",	1193	$self->{map_widget}->add_command ("use_skill $skill",
681	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")	1194	(DC::asxml "Immediately use the skill '$skill'\n\n")
682	. $skill_help{$skill});	1195	. $skill_help{$skill});
683	}	1196	}
684	}	1197	}
685		1198
686	sub eof {	1199	sub eof {
…		…
689	$self->{map_widget}->clr_commands;	1202	$self->{map_widget}->clr_commands;
690		1203
691	::stop_game ();	1204	::stop_game ();
692	}	1205	}
693		1206
694	sub image_info {
695	my ($self, $numfaces) = @_;
696
697	$self->{num_faces} = $numfaces;
698	$self->{face_prefetch} = [1 .. $numfaces];
699	$self->face_prefetch;
700	}
701
702	sub face_prefetch {
703	my ($self) = @_;
704
705	return unless $::CFG->{face_prefetch};
706
707	if ($self->{num_faces}) {
708	return if @{ $self->{send_queue} || [] };
709	my $todo = @{ $self->{face_prefetch} }
710	or return;
711
712	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
713
714	$self->send ("requestinfo image_sums $face $face");
715
716	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
717	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
718	} elsif (!exists $self->{num_faces}) {
719	$self->send ("requestinfo image_info");
720
721	$self->{num_faces} = 0;
722
723	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
724	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
725	}
726	}
727
728	sub update_floorbox {	1207	sub update_floorbox {
729	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1208	$DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
730	return unless $::CONN;	1209	return unless $::CONN;
731		1210
732	$::FLOORBOX->clear;	1211	$::FLOORBOX->clear;
733		1212
		1213	my @add;
		1214
734	my $row;	1215	my $row;
735	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;
736	if ($row < 6) {	1218	if ($row < 6) {
737	local $_->{face_widget}; # hack to force recreation of widget	1219	local $_->{face_widget}; # hack to force recreation of widget
738	local $_->{desc_widget}; # hack to force recreation of widget	1220	local $_->{desc_widget}; # hack to force recreation of widget
739	CFPlus::Item::update_widgets $_;	1221	DC::Item::update_widgets $_;
740		1222
		1223	push @add,
741	$::FLOORBOX->add (0, $row, $_->{face_widget});	1224	0, $row, $_->{face_widget},
742	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1225	1, $row, $_->{desc_widget};
743		1226
744	$row++;	1227	$row++;
745	} else {	1228	} else {
746	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1229	push @add, 1, $row, new DC::UI::Button
747	text => "More...",	1230	text => "More...",
748	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1231	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
749	);	1232	;
750	last;	1233	last;
751	}	1234	}
752	}	1235	}
753	if ($::CONN->{open_container}) {	1236	if ($::CONN->{open_container}) {
754	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1237	push @add, 1, $row++, new DC::UI::Button
755	text => "Close container",	1238	text => "Close container",
756	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1239	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
757	);	1240	;
758	}	1241	}
		1242
		1243	$::FLOORBOX->add_at (@add);
759	});	1244	});
760		1245
761	$::WANT_REFRESH++;	1246	$::WANT_REFRESH = 1;
762	}	1247	}
763		1248
764	sub set_opencont {	1249	sub set_opencont {
765	my ($conn, $tag, $name) = @_;	1250	my ($conn, $tag, $name) = @_;
766	$conn->{open_container} = $tag;	1251	$conn->{open_container} = $tag;
767	update_floorbox;	1252	update_floorbox;
768		1253
769	$::INV_RIGHT_HB->clear ();	1254	$::INVR_HB->clear;
770	$::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);
771		1256
772	if ($tag != 0) { # Floor isn't closable, is it?	1257	if ($tag != 0) { # Floor isn't closable, is it?
773	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1258	$::INVR_HB->add (new DC::UI::Button
774	text => "Close container",	1259	text => "Close container",
775	tooltip => "Close the currently open container (if one is open)",	1260	tooltip => "Close the currently open container (if one is open)",
776	on_activate => sub {	1261	on_activate => sub {
777	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1262	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
778	if $tag != 0;	1263	if $tag != 0;
779	#if $CONN->{open_container} != 0;
780	0	1264	0
781	},	1265	},
782	);	1266	);
783	}	1267	}
784		1268
…		…
786	}	1270	}
787		1271
788	sub update_containers {	1272	sub update_containers {
789	my ($self) = @_;	1273	my ($self) = @_;
790		1274
791	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {	1275	$DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
792	my $todo = delete $self->{update_container}	1276	my $todo = delete $self->{update_container}
793	or return;	1277	or return;
794		1278
795	for my $tag (keys %$todo) {	1279	for my $tag (keys %$todo) {
796	update_floorbox if $tag == 0 or $tag == $self->{open_container};	1280	update_floorbox if $tag == 0 or $tag == $self->{open_container};
…		…
831	}	1315	}
832		1316
833	sub item_update {	1317	sub item_update {
834	my ($self, $item) = @_;	1318	my ($self, $item) = @_;
835		1319
836	#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";
837		1321
838	CFPlus::Item::update_widgets $item;	1322	DC::Item::update_widgets $item;
839		1323
840	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	1324	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
841	set_opencont ($::CONN, 0, "Floor");	1325	set_opencont ($::CONN, 0, "Floor");
842		1326
843	} elsif ($item->{flags} & F_OPEN) {	1327	} elsif ($item->{flags} & F_OPEN) {
844	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);	1328	set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
845		1329
846	} else {	1330	} else {
847	$self->{update_container}{$item->{container}}++;	1331	$self->{update_container}{$item->{container}}++;
848	$self->update_containers;	1332	$self->update_containers;
849	}	1333	}
…		…
860		1344
861	my $weight = .001 * $self->{player}{weight};	1345	my $weight = .001 * $self->{player}{weight};
862	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};	1346	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
863		1347
864	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);	1348	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
865	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);	1349	$::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
866	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);	1350	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
867	}	1351	}
868		1352
869	sub update_server_info {	1353	sub update_server_info {
870	my ($self) = @_;	1354	my ($self) = @_;
…		…
874	$::SERVER_INFO->set_markup (	1358	$::SERVER_INFO->set_markup (
875	"server <tt>$self->{host}:$self->{port}</tt>\n"	1359	"server <tt>$self->{host}:$self->{port}</tt>\n"
876	. "protocol version <tt>$self->{version}</tt>\n"	1360	. "protocol version <tt>$self->{version}</tt>\n"
877	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1361	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1362	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1363	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1364	. "editing support $yesno[!!$self->{editor_support}]\n"
		1365	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1366	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1367	. "client support $yesno[$self->{cfplus_ext} > 0]"
880	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1368	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881	. "map size $self->{mapw}×$self->{maph}\n"	1369	. "map size $self->{mapw}×$self->{maph}\n"
882	);	1370	);
		1371
883	}	1372	}
884		1373
885	sub logged_in {	1374	sub logged_in {
886	my ($self) = @_;	1375	my ($self) = @_;
887		1376
888	$self->send_ext_req (cfplus_support => version => 1, sub {	1377	$self->send_ext_req (cfplus_support => version => 2, sub {
		1378	my (%msg) = @_;
		1379
889	$self->{cfplus_ext} = $_[0]{version};	1380	$self->{cfplus_ext} = $msg{version};
890	$self->update_server_info;	1381	$self->update_server_info;
		1382
		1383	if ($self->{cfplus_ext} >= 2) {
		1384	$self->send_ext_req ("editor_support", sub {
		1385	$self->{editor_support} = { @_ };
		1386	$self->update_server_info;
		1387
		1388	0
		1389	});
		1390	}
891		1391
892	0	1392	0
893	});	1393	});
894		1394
895	$self->update_server_info;	1395	$self->update_server_info;
896		1396
897	$self->send_command ("output-sync $::CFG->{output_sync}");	1397	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898	$self->send_command ("output-count $::CFG->{output_count}");
899	$self->send_command ("pickup $::CFG->{pickup}");	1398	$self->send_command ("pickup $::CFG->{pickup}");
		1399
		1400	$self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
		1401	DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
900	}	1402	}
901		1403
902	sub lookat {	1404	sub lookat {
903	my ($self, $x, $y) = @_;	1405	my ($self, $x, $y) = @_;
904		1406
905	if ($self->{cfplus_ext}) {	1407	if ($self->{cfplus_ext}) {
906	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1408	$self->send_ext_req (lookat => $x, $y, sub {
907	my ($msg) = @_;	1409	my (%msg) = @_;
908		1410
909	if (exists $msg->{npc_dialog}) {	1411	if (exists $msg{npc_dialog}) {
910	# start npc chat dialog	1412	# start npc chat dialog
911	$self->{npc_dialog} = new CFPlus::NPCDialog::	1413	$self->{npc_dialog} = new DC::NPCDialog::
912	dx => $x,	1414	token => $msg{npc_dialog},
913	dy => $y,
914	title => "$msg->{npc_dialog} (NPC)",	1415	title => "$msg{npc_dialog}[0] (NPC)",
915	conn => $self,	1416	conn => $self,
916	;	1417	;
917	}	1418	}
918	});	1419	});
919	}	1420	}
…		…
922	}	1423	}
923		1424
924	sub destroy {	1425	sub destroy {
925	my ($self) = @_;	1426	my ($self) = @_;
926		1427
927	$self->{npc_dialog}->destroy	1428	(delete $self->{npc_dialog})->destroy
928	if $self->{npc_dialog};	1429	if $self->{npc_dialog};
929		1430
930	$self->SUPER::destroy;	1431	$self->SUPER::destroy;
931	}
932		1432
		1433	%$self = ();
		1434	}
		1435
933	package CFPlus::NPCDialog;	1436	package DC::NPCDialog;
934		1437
935	our @ISA = 'CFPlus::UI::FancyFrame';	1438	our @ISA = 'DC::UI::Toplevel';
936		1439
937	sub new {	1440	sub new {
938	my $class = shift;	1441	my $class = shift;
939		1442
940	my $self = $class->SUPER::new (	1443	my $self = $class->SUPER::new (
…		…
947	kw => { hi => 0, yes => 0, no => 0 },	1450	kw => { hi => 0, yes => 0, no => 0 },
948	has_close_button => 1,	1451	has_close_button => 1,
949	@_,	1452	@_,
950	);	1453	);
951		1454
952	Scalar::Util::weaken (my $this = $self);	1455	DC::weaken (my $this = $self);
953		1456
954	$self->connect (delete => sub { $this->destroy; 1 });	1457	$self->connect (delete => sub { $this->destroy; 1 });
955		1458
956	# better use a pane...	1459	# better use a pane...
957	$self->add (my $hbox = new CFPlus::UI::HBox);	1460	$self->add (my $hbox = new DC::UI::HBox);
958	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);	1461	$hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
959		1462
960	$hbox->add (my $vbox = new CFPlus::UI::VBox);	1463	$hbox->add (my $vbox = new DC::UI::VBox);
961		1464
962	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");	1465	$vbox->add (new DC::UI::Label text => "Message Entry:");
963	$vbox->add ($self->{entry} = new CFPlus::UI::Entry	1466	$vbox->add ($self->{entry} = new DC::UI::Entry
964	tooltip => "#npc_message_entry",	1467	tooltip => "#npc_message_entry",
965	on_activate => sub {	1468	on_activate => sub {
966	my ($entry, $text) = @_;	1469	my ($entry, $text) = @_;
967		1470
968	return unless $text =~ /\S/;	1471	return unless $text =~ /\S/;
…		…
972		1475
973	0	1476	0
974	},	1477	},
975	);	1478	);
976		1479
977	$vbox->add ($self->{options} = new CFPlus::UI::VBox);	1480	$vbox->add ($self->{options} = new DC::UI::VBox);
978		1481
979	$self->{bye_button} = new CFPlus::UI::Button	1482	$self->{bye_button} = new DC::UI::Button
980	text => "Bye (close)",	1483	text => "Bye (close)",
981	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.",
982	on_activate => sub { $this->destroy; 1 },	1485	on_activate => sub { $this->destroy; 1 },
983	;	1486	;
984		1487
985	$self->update_options;	1488	$self->update_options;
986		1489
987	$self->{id} = $self->{conn}->send_ext_req (	1490	$self->{id} = "npc-channel-" . $self->{conn}->token;
988	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1491	$self->{conn}->connect_ext ($self->{id} => sub {
989	sub { $this && $this->feed (@_) }	1492	$this->feed (@_) if $this;
990	);	1493	});
		1494
		1495	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
991		1496
992	$self->{entry}->grab_focus;	1497	$self->{entry}->grab_focus;
993		1498
994	$self->{textview}->add_paragraph ({	1499	$self->{textview}->add_paragraph ({
995	fg => [1, 1, 0, 1],	1500	fg => [1, 1, 0, 1],
…		…
1001	};	1506	};
1002		1507
1003	sub update_options {	1508	sub update_options {
1004	my ($self) = @_;	1509	my ($self) = @_;
1005		1510
1006	Scalar::Util::weaken $self;	1511	DC::weaken $self;
1007		1512
1008	$self->{options}->clear;	1513	$self->{options}->clear;
1009	$self->{options}->add ($self->{bye_button});	1514	$self->{options}->add ($self->{bye_button});
1010		1515
1011	for my $kw (sort keys %{ $self->{kw} }) {	1516	for my $kw (sort keys %{ $self->{kw} }) {
1012	$self->{options}->add (new CFPlus::UI::Button	1517	$self->{options}->add (new DC::UI::Button
1013	text => $kw,	1518	text => $kw,
1014	on_activate => sub {	1519	on_activate => sub {
1015	$self->send ($kw);	1520	$self->send ($kw);
1016	0	1521	0
1017	},	1522	},
1018	);	1523	);
1019	}	1524	}
1020	}	1525	}
1021		1526
1022	sub feed {	1527	sub feed {
1023	my ($self, $msg) = @_;	1528	my ($self, $type, @arg) = @_;
1024		1529
1025	Scalar::Util::weaken $self;	1530	DC::weaken $self;
1026		1531
1027	if ($msg->{msgtype} eq "reply") {	1532	if ($type eq "update") {
		1533	my (%info) = @arg;
		1534
1028	$self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};	1535	$self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1029	$self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};	1536	$self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1030
1031	my $text = "\n" . CFPlus::asxml $msg->{msg};
1032	my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1033	my @link;
1034	$text =~ s{
1035	($match)
1036	}{
1037	my $kw = $1;
1038
1039	push @link, new CFPlus::UI::Label
1040	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1041	can_hover => 1,
1042	can_events => 1,
1043	padding_x => 0,
1044	padding_y => 0,
1045	on_button_up => sub {
1046	$self->send ($kw);
1047	};
1048
1049	"\x{fffc}"
1050	}giex;
1051		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
1052	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1560	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053	$self->{textview}->scroll_to_bottom;	1561	$self->{textview}->scroll_to_bottom;
		1562	}
		1563
1054	$self->update_options;	1564	$self->update_options;
1055	} else {	1565	} else {
1056	$self->destroy;	1566	$self->destroy;
1057	}	1567	}
1058		1568
…		…
1060	}	1570	}
1061		1571
1062	sub send {	1572	sub send {
1063	my ($self, $msg) = @_;	1573	my ($self, $msg) = @_;
1064		1574
1065	$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	});
1066	$self->{textview}->scroll_to_bottom;	1581	$self->{textview}->scroll_to_bottom;
1067		1582
1068	$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);
1069	}	1584	}
1070		1585
1071	sub destroy {	1586	sub destroy {
1072	my ($self) = @_;	1587	my ($self) = @_;
1073		1588
1074	#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
1075		1590
1076	if ($self->{conn}) {	1591	if ($self->{conn}) {
1077	$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};
1078	delete $self->{conn}{npc_dialog};	1593	delete $self->{conn}{npc_dialog};
1079	$self->{conn}->disconnect_ext ($self->{id});	1594	$self->{conn}->disconnect_ext ($self->{id});
1080	}	1595	}
1081		1596
1082	$self->SUPER::destroy;	1597	$self->SUPER::destroy;
1083	}	1598	}
1084		1599
1085	1	1600	1
		1601

Diff Legend

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