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.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.220 by root, Wed Jan 4 11:23:23 2012 UTC

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

Diff Legend

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