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

Diff Legend

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