[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.164 by root, Wed Aug 22 21:27:13 2007 UTC

…		…
21		21
22	my $self = $class->SUPER::new (%arg,	22	my $self = $class->SUPER::new (%arg,
23	setup_req => {	23	setup_req => {
24	extmap => 1,	24	extmap => 1,
25	excmd => 1,	25	excmd => 1,
26	ywidget => 1,	26	xwidget1 => 1,#d#
27	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
28	},	28	},
29	);	29	);
30		30
31	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
48	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
49	@args	49	@args
50	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
51	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
52		52
53	$self->connect_ext (event_music => sub {
54	my ($ev) = @_;
55
56	return unless $::CFG->{bgm_enable};
57
58	my $faces = $ev->{faces};
59	my @songs;
60
61	# request music from server if appropriate
62	if (my $faces = $ev->{faces}) {
63	for (@$faces) {
64	my ($face, $pri, $chksum) = @$_;
65	utf8::downgrade $chksum;
66
67	$chksum = unpack "H*", $chksum;
68	$self->{music_map}{$face} = $chksum;
69
70	# check if already cached
71	CFPlus::DB::get "res-metadata" => $chksum, sub {
72	my ($meta_json) = @_;
73	my $path = CFPlus::DB::path_of_res $chksum;
74
75	if (defined $meta_json) {
76	my $meta = $self->{json_coder}->decode ($meta_json);
77	$meta->{path} = $path;
78	$self->{music_meta}{$chksum} = $meta;
79	} else {
80	::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
81	$self->ask_face ($face, -100 - $pri, undef, sub {
82	my $len = length $_[1];
83	my ($meta_json, $data) = unpack "(w/a)", $_[1];
84
85	CFPlus::DB::write_file $path, $data, sub {
86	CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87	my $meta = $self->{json_coder}->decode ($meta_json);
88	$meta->{path} = $path;
89	$self->{music_meta}{$chksum} = $meta;
90
91	::message ({ markup => "downloaded song #$face, size $len octets" });
92	&::audio_music_set ($self->{songs});
93	};
94	};
95	});
96	}
97	}
98	}
99	}
100
101	if (my $play = $ev->{play}) {
102	&::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103	}
104	});
105
106	$self->connect_ext (event_capabilities => sub {
107	my ($cap) = @_;
108
109	if (my $ts = $cap->{tileset}) {
110	if (my ($default) = grep $_->[2] & 1, @$ts) {
111	$self->{tileset} = $default;
112	$self->{tilesize} = $default->[3];
113	$self->setup_req (tileset => $default->[0]);
114
115	my $w = int $self->{mapw} * 32 / $self->{tilesize};
116	my $h = int $self->{maph} * 32 / $self->{tilesize};
117
118	$self->setup_req (mapsize => "${w}x${h}");
119	}
120	}
121	});
122
123	$self->{json_coder}	53	$self->{json_coder}
124	->convert_blessed	54	->convert_blessed
125	->filter_json_single_key_object (__widget_ref__ => sub {	55	->filter_json_single_key_object (__w_ => sub {
126	$self->{widget}{$_[0]}	56	$self->{widget}{$_[0]}
127	});	57	});
128		58
129	$self->connect_ext (ws_n => sub {	59	# destroy widgets on logout
130	my ($arg) = @_;
131
132	$self->{widgetset}{$arg{id}} = {
133	w => {},
134	};
135	});
136
137	$self->connect_ext (ws_d => sub {
138	my ($arg) = @_;
139
140	my $ws = delete $self->{widgetset}{$arg{id}}
141	or return;
142
143	$_->destroy
144	for values %{$ws->{w}};
145	});
146
147	$self->connect_ext (ws_c => sub {
148	my ($arg) = @_;
149
150	my $args = $arg->{args} \|\| {};
151
152	for my $ev (grep /^on_/, keys %$args) {
153	$args->{$ev} = sub {
154	my $id = shift->{s_id};
155	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
156
157	1
158	};
159	}
160
161	if (my $widget = eval {
162	local $SIG{__DIE__};
163	"CFPlus::UI::$arg->{class}"->new (
164	%$args,
165	s_ws => $arg->{ws},
166	s_id => $arg->{id},
167	)
168	}
169	) {
170	$self->{widget}{$arg->{id}}
171	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
172	= $widget;
173
174	$widget->connect (on_destroy => sub {
175	my ($widget) = @_;
176
177	delete $self->{widget}{$widget->{s_id}};
178	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
179	});
180	} else {
181	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
182	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
183	}
184	});
185
186	$self->connect_ext (w_c => sub {
187	my ($arg) = @_;
188
189	my $w = $self->{widget}{$arg->{id}}
190	or return;
191	my $m = $arg->{name};
192
193	my $a = $arg->{args} \|\| [];
194
195	if (exists $arg->{rid}) {
196	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
197	} else {
198	$w->$m (@$a);
199	}
200	});
201
202	$self->connect_ext (w_s => sub {
203	my ($arg) = @_;
204
205	my $w = $self->{widget}{$arg->{id}}
206	or return;
207
208	$w->{$arg->{name}} = $arg->{value};
209	});
210
211	$self->connect_ext (w_g => sub {
212	my ($arg) = @_;
213
214	my $w = $self->{widget}{$arg->{id}}
215	or return;
216
217	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
218	});
219
220	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	60	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
221	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
222	$_->destroy	62	$_->destroy
223	for values %{delete $ws->{w} \|\| {}};	63	for values %{delete $ws->{w} \|\| {}};
224	}	64	}
…		…
245	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
246		86
247	$self	87	$self
248	}	88	}
249		89
		90	sub update_fx_want {
		91	my ($self) = @_;
		92
		93	$self->send_exti_msg (fx_want => {
		94	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		95	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		96	6 => 1, # FT_RSRC
		97	});
		98	}
		99
		100	sub ext_capabilities {
		101	my ($self, %cap) = @_;
		102
		103	#$self->send ("setup sound 0"); # we use a different protocol
		104	$self->update_fx_want;
		105
		106	$self->send_exti_req (resource => "exp_table", sub {
		107	my ($exp_table) = @_;
		108
		109	$self->register_face_handler ($exp_table, sub {
		110	my ($face) = @_;
		111
		112	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		113	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		114	});
		115
		116	()
		117	});
		118
		119	if (my $ts = $cap{tileset}) {
		120	if (my ($default) = grep $_->[2] & 1, @$ts) {
		121	$self->{tileset} = $default;
		122	$self->{tilesize} = $default->[3];
		123	$self->setup_req (tileset => $default->[0]);
		124
		125	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		126	my $h = int $self->{maph} * 32 / $self->{tilesize};
		127
		128	$self->setup_req (mapsize => "${w}x${h}");
		129	}
		130	}
		131	}
		132
		133	sub ext_ambient_music {
		134	my ($self, $songs) = @_;
		135	&::audio_music_set_ambient ($songs);
		136	}
		137
		138	#############################################################################
		139
		140	sub widget_associate {
		141	my ($self, $ws, $id, $widget) = @_;
		142
		143	if ($widget) {
		144	$widget->{s_id} = $id;
		145	$self->{widget}{$id} = $widget;
		146
		147	if ($ws) {
		148	$widget->{s_ws} = $ws;
		149	$self->{widgetset}{$ws}{w}{$id} = $widget;
		150	}
		151
		152	$widget->connect (on_destroy => sub {
		153	my ($widget) = @_;
		154
		155	delete $self->{widget}{$widget->{s_id}};
		156	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		157	if exists $widget->{s_ws};
		158	});
		159
		160	1
		161	} else {
		162	$self->send_exti_msg (w_e => $id, undef);
		163
		164	0
		165	}
		166	}
		167
		168	# widgetset new
		169	sub ext_ws_n {
		170	my ($self, $id) = @_;
		171
		172	$self->{widgetset}{$id} = {
		173	w => {},
		174	};
		175	}
		176
		177	# widgetset destroy
		178	sub ext_ws_d {
		179	my ($self, $id) = @_;
		180
		181	my $ws = delete $self->{widgetset}{$id}
		182	or return;
		183
		184	$_->destroy
		185	for values %{$ws->{w}};
		186	}
		187
		188	# widgetset create
		189	sub ext_ws_c {
		190	my ($self, $ws, $id, $class, $args) = @_;
		191
		192	for my $ev (grep /^on_/, keys %$args) {
		193	my $rid = $args->{$ev};
		194	$args->{$ev} = sub {
		195	my $id = shift->{s_id};
		196	$self->send_exti_msg (w_e => $id, $rid, @_);
		197
		198	1
		199	};
		200	}
		201
		202	$self->widget_associate (
		203	$ws, $id => scalar eval {
		204	local $SIG{__DIE__};
		205	"CFPlus::UI::$class"->new (%$args)
		206	}
		207	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		208	}
		209
		210	# widgetset associate
		211	sub ext_ws_a {
		212	my ($self, %ass) = @_;
		213
		214	# everything that has a name, wether conceivably useful or not
		215	my %wkw = (
		216	root => $CFPlus::UI::ROOT,
		217	tooltip => $CFPlus::UI::TOOLTIP,
		218
		219	mapwidget => $::MAPWIDGET,
		220	buttonbar => $::BUTTONBAR,
		221	metaserver => $::METASERVER,
		222	buttonbar => $::BUTTONBAR,
		223	login_button => $::LOGIN_BUTTON,
		224	quit_dialog => $::QUIT_DIALOG,
		225	host_entry => $::HOST_ENTRY,
		226	metaserver => $::METASERVER,
		227	server_info => $::SERVER_INFO,
		228
		229	setup_dialog => $::SETUP_DIALOG,
		230	setup_notebook => $::SETUP_NOTEBOOK,
		231	setup_server => $::SETUP_SERVER,
		232	setup_keyboard => $::SETUP_KEYBOARD,
		233
		234	pl_notebook => $::PL_NOTEBOOK,
		235	pl_window => $::PL_WINDOW,
		236	inventory_page => $::INVENTORY_PAGE,
		237	stats_page => $::STATS_PAGE,
		238	skill_page => $::SKILL_PAGE,
		239	spell_page => $::SPELL_PAGE,
		240	spell_list => $::SPELL_LIST,
		241
		242	floorbox => $::FLOORBOX,
		243	help_window => $::HELP_WINDOW,
		244	message_window => $::MESSAGE_WINDOW,
		245	statusbox => $::SDTATUSBOX,
		246
		247	inv => $::INV,
		248	invr => $::INVR,
		249	invr_hb => $::INVR_HB,
		250	);
		251
		252	while (my ($id, $name) = each %ass) {
		253	$self->widget_associate (undef, $id => $wkw{$name})
		254	or warn "server failed to associate non-existent well-known widget $name\n";
		255	}
		256	}
		257
		258	# widget call
		259	sub ext_w_c {
		260	my ($self, $id, $rid, $method, @args) = @_;
		261
		262	my $w = $self->{widget}{$id}
		263	or return;
		264
		265	if ($rid) {
		266	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		267	} else {
		268	$w->$method (@args);
		269	}
		270	}
		271
		272	# widget set
		273	sub ext_w_s {
		274	my ($self, $id, $attr) = @_;
		275
		276	my $w = $self->{widget}{$id}
		277	or return;
		278
		279	for (my $i = 0; $i < $#$attr; $i += 2) {
		280	my ($member, $value) = @$attr[$i, $i+1];
		281	if (defined $value) {
		282	$w->{$member} = $value;
		283	} else {
		284	delete $w->{$member};
		285	}
		286	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		287	}
		288	}
		289
		290	# widget get
		291	sub ext_w_g {
		292	my ($self, $id, $rid, $attr) = @_;
		293
		294	my $w = $self->{widget}{$id}
		295	or return;
		296
		297	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		298	}
		299
		300	# message window
		301	sub ext_channel_info {
		302	my ($self, $info) = @_;
		303	$self->{channels}->{$info->{id}} = $info;
		304	$::MESSAGE_WINDOW->add_channel ($info);
		305	}
		306
		307	#############################################################################
		308
250	sub logprint {	309	sub logprint {
251	my ($self, @a) = @_;	310	my ($self, @a) = @_;
252		311
253	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
254	my $path = "$Crossfire::VARDIR/log.$self->{host}";
255
256	open my $fh, ">>:utf8", $path
257	or die "Couldn't open logfile $path: $!";
258
259	$fh->autoflush (1);
260
261	$fh;
262	};
263
264	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
265
266	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
267	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
268
269	print {$self->{log_fh}} "$ts ", @a, "\n";
270	}	313	}
271		314
272	sub _stat_numdiff {	315	sub _stat_numdiff {
273	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
274		317
…		…
407	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
408	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
409	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
410	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
411	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	454	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		455	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
412	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
413	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
414	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
415	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
416		460
…		…
434	for keys %RES_TBL;	478	for keys %RES_TBL;
435		479
436	my $sktbl = $::STATWIDS->{skill_tbl};	480	my $sktbl = $::STATWIDS->{skill_tbl};
437	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
438		482
439	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		484	map [$_, $self->{skill_info}{$_}],
		485	grep exists $stats->{$_},
		486	@skills;
		487
		488	if ($self->{stat_order} ne join ",", map $_->[0], @order) {
		489	$self->{stat_order} = join ",", map $_->[0], @order;
		490
440	$sktbl->clear;	491	$sktbl->clear;
441		492
		493	my $sw = $self->{skillwid}{""} \|\|= [
442	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	494	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
443	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	495	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		496	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
444	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	497	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
445	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	498	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
446	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	499	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		500	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
447	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	501	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		502	];
		503
		504	my @add = @$sw;
448		505
449	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	506	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
450		507
451	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	508	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
452	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	509	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
453		510
454	my ($x, $y) = (0, 1);	511	my ($x, $y) = (0, 1);
455	for (	512	for (@order) {
456	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
457	map [$_, $self->{skill_info}{$_}],
458	grep exists $stats->{$_},
459	@skills
460	) {
461	my ($idx, $name) = @$_;	513	my ($idx, $name) = @$_;
462		514
463	my $spell_cb = sub {	515	my $spell_cb = sub {
464	my ($widget, $ev) = @_;	516	my ($widget, $ev) = @_;
465		517
…		…
480	}	532	}
481		533
482	1	534	1
483	};	535	};
484		536
485	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	537	my $sw = $self->{skillwid}{$idx} \|\|= [
		538	# exp
		539	(new CFPlus::UI::Label
486	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	540	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
487	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	541
		542	# level
		543	(new CFPlus::UI::Label
488	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	544	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		545
		546	# progress
		547	(new CFPlus::UI::ExperienceProgress),
		548
		549	# label
489	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	550	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
490	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	551	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		552	];
		553
		554	push @add,
		555	$x * 4 + 0, $y, $sw->[0],
		556	$x * 4 + 1, $y, $sw->[1],
		557	$x * 4 + 2, $y, $sw->[2],
		558	$x * 4 + 3, $y, $sw->[3],
		559	;
491		560
492	$x++ and ($x, $y) = (0, $y + 1);	561	$x++ and ($x, $y) = (0, $y + 1);
493	}	562	}
494	}
495		563
496	for (grep exists $stats->{$_}, @skills) {	564	$sktbl->add_at (@add);
497	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	565	}
498	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	566
		567	for (@order) {
		568	my ($idx, $name) = @$_;
		569	my $val = $stats->{$idx};
		570
		571	next if $prev->{$idx}[1] == $val->[1];
		572
		573	my $sw = $self->{skillwid}{$idx};
		574	$sw->[0]->set_text (::formsep ($val->[1]));
		575	$sw->[1]->set_text ($val->[0] * 1);
		576	$sw->[2]->set_value (@$val);
		577
		578	$::GAUGES->{sklprg}->set_label ("$name %d%%");
		579	$::GAUGES->{sklprg}->set_value (@$val);
499	}	580	}
500	}	581	}
501		582
502	sub macro_send {	583	sub macro_send {
503	my ($self, $macro) = @_;	584	my ($self, $macro) = @_;
…		…
531	}	612	}
532		613
533	sub feed_map1a {	614	sub feed_map1a {
534	my ($self, $data) = @_;	615	my ($self, $data) = @_;
535		616
536	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	617	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		618	my $delay;
		619
		620	for my $tile (@$missing) {
		621	next if $self->{delay}{$tile};
		622
		623	$delay = 1;
		624
		625	if (my $tex = $::CONN->{texture}[$tile]) {
		626	$tex->upload;
		627	} else {
		628	$self->{delay}{$tile} = 1;
		629
		630	# we assume the face is in-flight and will eventually come
		631	push @{$self->{tile_cb}{$tile}}, sub {
		632	delete $self->{delay}{$tile};
		633	$_[0]->upload;
		634	};
		635	}
		636	}
		637
		638	if ($delay) {
		639	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		640	Event->timer (after => 0.03, cb => sub {
		641	$_[0]->w->cancel;
		642	$self->{map_widget}->update
		643	if $self->{map_widget};
		644	});
		645	} else {
537	$self->{map_widget}->update;	646	$self->{map_widget}->update;
		647	}
538	}	648	}
539		649
540	sub magicmap {	650	sub magicmap {
541	my ($self, $w, $h, $x, $y, $data) = @_;	651	my ($self, $w, $h, $x, $y, $data) = @_;
542		652
…		…
549	my $map_info = delete $self->{map_info}	659	my $map_info = delete $self->{map_info}
550	or return;	660	or return;
551		661
552	my ($hash, $x, $y, $w, $h) = @$map_info;	662	my ($hash, $x, $y, $w, $h) = @$map_info;
553		663
554	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	664	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		665	$self->{map_cache_new}{$hash} = \$data;
555	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	666	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
556	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
557	}	667	}
558		668
559	sub map_clear {	669	sub map_clear {
560	my ($self) = @_;	670	my ($self) = @_;
561		671
…		…
567	}	677	}
568		678
569	sub bg_fetch {	679	sub bg_fetch {
570	my ($self) = @_;	680	my ($self) = @_;
571		681
572	my $id;	682	my $tile;
573		683
574	do {	684	do {
575	$id = pop @{$self->{bg_fetch}}	685	$tile = pop @{$self->{bg_fetch}}
576	or return;	686	or return;
577	} while $self->{texture}[$id];	687	} while $self->{texture}[$tile];
578		688
579	CFPlus::DB::get tilecache => $id, sub {	689	CFPlus::DB::get tilecache => $tile, sub {
580	my ($data) = @_;	690	my ($data) = @_;
581		691
582	return unless $self->{map}; # stop when destroyed	692	return unless $self->{map}; # stop when destroyed
583		693
584	$self->set_texture ($id => $data)
585	if defined $data;	694	if (defined $data) {
		695	$self->have_tile ($tile, $data);
		696	$self->{texture}[$tile]->upload;
		697	}
586		698
587	$self->bg_fetch;	699	$self->bg_fetch;
588	};	700	};
589	}	701	}
590		702
591	sub load_map($$$) {	703	sub load_map($$$) {
592	my ($self, $hash, $x, $y) = @_;	704	my ($self, $hash, $x, $y) = @_;
593		705
594	my $gen = $self->{map_change_gen};	706	my $gen = $self->{map_change_gen};
595		707
596	CFPlus::DB::get $self->{mapcache} => $hash, sub {	708	my $cb = sub {
597	return unless $gen == $self->{map_change_gen};	709	return unless $gen == $self->{map_change_gen};
598		710
599	my ($data) = @_;	711	my ($data) = @_;
600		712
601	if (defined $data) {	713	if (defined $data) {
		714	$self->{map_cache_new}{$hash} = \$data;
		715
602	$data = Compress::LZF::decompress $data;	716	my $data = Compress::LZF::decompress $data;
603	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
604		717
605	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	718	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
606	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	719	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
607	$self->bg_fetch unless $inprogress;	720	$self->bg_fetch unless $inprogress;
608	}	721	}
609	};	722	};
		723
		724	if (my $rdata = $self->{map_cache_old}{$hash}) {
		725	$cb->($$rdata);
		726	} else {
		727	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		728	}
610	}	729	}
611		730
612	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	731	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
613	# (server resource,s latency, bandwidth), so this hack is warranted.	732	# (server resource,s latency, bandwidth), so this hack is warranted.
614	# the right fix is to make real tiled maps with an overview file	733	# the right fix is to make real tiled maps with an overview file
…		…
707	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	826	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
708		827
709	$self->flush_map;	828	$self->flush_map;
710		829
711	++$self->{map_change_gen};	830	++$self->{map_change_gen};
		831	$self->{map_cache_old} = delete $self->{map_cache_new};
712		832
713	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	833	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
714		834
715	my $mapmapw = $self->{mapmap}->{w};	835	my $mapmapw = $self->{mapmap}->{w};
716	my $mapmaph = $self->{mapmap}->{h};	836	my $mapmaph = $self->{mapmap}->{h};
…		…
735	}	855	}
736		856
737	sub face_find {	857	sub face_find {
738	my ($self, $facenum, $face, $cb) = @_;	858	my ($self, $facenum, $face, $cb) = @_;
739		859
740	my $hash = "$face->{chksum},$face->{name}";	860	if ($face->{type} == 0) { # FT_FACE
741
742	my $id = CFPlus::DB::get_tile_id_sync $hash;	861	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
743		862
744	$face->{id} = $id;	863	$face->{id} = $id;
745	$self->{faceid}[$facenum] = $id;
746
747	$self->{map}->set_tileid ($facenum => $id);	864	$self->{map}->set_tileid ($facenum => $id);
748		865
749	CFPlus::DB::get tilecache => $id, $cb;	866	CFPlus::DB::get tilecache => $id, $cb;
		867
		868	} elsif ($face->{type} & 1) { # with metadata
		869	CFPlus::DB::get res_meta => $face->{name}, $cb;
		870
		871	} else { # no metadata
		872	CFPlus::DB::get res_data => $face->{name}, $cb;
		873	}
750	}	874	}
751		875
752	sub face_update {	876	sub face_update {
753	my ($self, $facenum, $face, $changed) = @_;	877	my ($self, $facenum, $face, $changed) = @_;
754		878
		879	if ($face->{type} == 0) {
		880	# image, FT_FACE
755	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	881	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
756	if $changed;	882	if $changed;
757		883
758	$self->set_texture ($face->{id} => delete $face->{image});	884	$self->have_tile ($face->{id}, delete $face->{data});
		885
		886	} elsif ($face->{type} & 1) {
		887	# split metadata case, FT_MUSIC, FT_SOUND
		888	if ($changed) { # new data
		889	my ($meta, $data) = unpack "(w/a)", $face->{data};
		890	$face->{data} = $meta;
		891
		892	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		893	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		894	}
		895
		896	$face->{data} = $self->{json_coder}->decode ($face->{data});
		897
		898	::add_license ($face);
		899
		900	if ($face->{type} == 3) { # FT_MUSIC
		901	::message ({ markup => "downloaded song #$facenum" })
		902	if $changed;
		903
		904	&::audio_music_push ($facenum);
		905	} elsif ($face->{type} == 5) { # FT_SOUND
		906	::message ({ markup => "downloaded sound #$facenum" })
		907	if $changed;
		908
		909	&::audio_sound_push ($facenum);
		910	}
		911
		912	} else {
		913	# flat resource case, FT_RSRC
		914	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		915	if $changed;
		916	}
		917
		918	if (my $cbs = $self->{face_cb}{$facenum}) {
		919	$_->($face, $changed) for @$cbs;
		920	}
759	}	921	}
760		922
761	sub smooth_update {	923	sub smooth_update {
762	my ($self, $facenum, $face) = @_;	924	my ($self, $facenum, $face) = @_;
763		925
764	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	926	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
765	}	927	}
766		928
767	sub set_texture {	929	sub have_tile {
768	my ($self, $id, $data) = @_;	930	my ($self, $tile, $data) = @_;
769		931
770	return unless $self->{map};	932	return unless $self->{map};
771		933
772	$self->{texture}[$id] = my $tex =	934	my $tex = $self->{texture}[$tile] \|\|=
773	new_from_image CFPlus::Texture	935	new CFPlus::Texture
		936	tile => $tile,
		937	image => $data, delete_image => 1,
774	$data, minify => 1, mipmap => 1;	938	minify => 1, mipmap => 1;
775		939
776	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	940	if (my $cbs = delete $self->{tile_cb}{$tile}) {
777	$self->{map_widget}->update;	941	$_->($tex) for @$cbs;
		942	}
		943	}
		944
		945	# call in non-void context registers a temporary
		946	# hook with handle, otherwise its permanent
		947	sub on_face_change {
		948	my ($self, $num, $cb) = @_;
		949
		950	push @{$self->{face_cb}{$num}}, $cb;
		951
		952	defined wantarray
		953	? CFPlus::guard {
		954	@{$self->{face_cb}{$num}}
		955	= grep $_ != $cb,
		956	@{$self->{face_cb}{$num}};
		957	}
		958	: ()
		959	}
		960
		961	# call in non-void context registers a temporary
		962	# hook with handle, otherwise its permanent
		963	sub register_face_handler {
		964	my ($self, $num, $cb) = @_;
		965
		966	return unless $num;
		967
		968	# invoke if available right now
		969	$cb->($self->{face}[$num], 0)
		970	unless exists $self->{face}[$num]{loading};
		971
		972	# future changes
		973	$self->on_face_change ($num => $cb)
778	}	974	}
779		975
780	sub sound_play {	976	sub sound_play {
781	my ($self, $x, $y, $soundnum, $type) = @_;	977	my ($self, $type, $face, $dx, $dy, $vol) = @_;
782		978
783	$self->{sound_play}->($x, $y, $soundnum, $type);	979	&::audio_sound_play ($face, $dx, $dy, $vol)
		980	unless $type & 1; # odd types are silent for future expansion
784	}	981	}
785		982
786	my $LAST_QUERY; # server is stupid, stupid, stupid	983	my $LAST_QUERY; # server is stupid, stupid, stupid
787		984
788	sub query {	985	sub query {
…		…
853	$self->{$type} = $text;	1050	$self->{$type} = $text;
854	} else {	1051	} else {
855	$self->logprint ("msg: ", $text);	1052	$self->logprint ("msg: ", $text);
856	return if $color < 0; # negative color == ignore if not understood	1053	return if $color < 0; # negative color == ignore if not understood
857		1054
858	my $fg = $CF_COLOR[$color % @CF_COLOR];	1055	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
859		1056
860	## try to create single paragraphs of multiple lines sent by the server	1057	## try to create single paragraphs of multiple lines sent by the server
861	# no longer neecssary with TRT servers	1058	# no longer neecssary with TRT servers
862	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1059	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
863		1060
864	::message ({ fg => $fg, markup => $_ })	1061	::message ({
		1062	fg => $fg,
		1063	markup => $_,
		1064	type => $type,
		1065	extra => [@extra],
		1066	color_flags => $color
865	for split /\n/, $text;	1067	}) for split /\n/, $text;
866		1068
867	$self->{statusbox}->add ($text,	1069	$self->{statusbox}->add ($text,
868	group => $text,	1070	group => $text,
869	fg => $fg,	1071	fg => $fg,
870	timeout => $color >= 2 ? 180 : 10,	1072	timeout => $color >= 2 ? 180 : 10,
…		…
926	$self->{map_widget}->clr_commands;	1128	$self->{map_widget}->clr_commands;
927		1129
928	::stop_game ();	1130	::stop_game ();
929	}	1131	}
930		1132
931	sub image_info {
932	my ($self, $numfaces) = @_;
933
934	$self->{num_faces} = $numfaces;
935	$self->{face_prefetch} = [1 .. $numfaces];
936	$self->face_prefetch;
937	}
938
939	sub face_prefetch {
940	my ($self) = @_;
941
942	return unless $::CFG->{face_prefetch};
943
944	if ($self->{num_faces}) {
945	return if @{ $self->{send_queue} \|\| [] };
946	my $todo = @{ $self->{face_prefetch} }
947	or return;
948
949	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
950
951	$self->send ("requestinfo image_sums $face $face");
952
953	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
954	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
955	} elsif (!exists $self->{num_faces}) {
956	$self->send ("requestinfo image_info");
957
958	$self->{num_faces} = 0;
959
960	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
961	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
962	}
963	}
964
965	sub update_floorbox {	1133	sub update_floorbox {
966	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1134	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
967	return unless $::CONN;	1135	return unless $::CONN;
968		1136
969	$::FLOORBOX->clear;	1137	$::FLOORBOX->clear;
		1138
		1139	my @add;
970		1140
971	my $row;	1141	my $row;
972	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1142	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
973	if ($row < 6) {	1143	if ($row < 6) {
974	local $_->{face_widget}; # hack to force recreation of widget	1144	local $_->{face_widget}; # hack to force recreation of widget
975	local $_->{desc_widget}; # hack to force recreation of widget	1145	local $_->{desc_widget}; # hack to force recreation of widget
976	CFPlus::Item::update_widgets $_;	1146	CFPlus::Item::update_widgets $_;
977		1147
		1148	push @add,
978	$::FLOORBOX->add (0, $row, $_->{face_widget});	1149	0, $row, $_->{face_widget},
979	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1150	1, $row, $_->{desc_widget};
980		1151
981	$row++;	1152	$row++;
982	} else {	1153	} else {
983	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1154	push @add, 1, $row, new CFPlus::UI::Button
984	text => "More...",	1155	text => "More...",
985	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1156	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
986	);	1157	;
987	last;	1158	last;
988	}	1159	}
989	}	1160	}
990	if ($::CONN->{open_container}) {	1161	if ($::CONN->{open_container}) {
991	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1162	push @add, 1, $row++, new CFPlus::UI::Button
992	text => "Close container",	1163	text => "Close container",
993	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1164	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
994	);	1165	;
995	}	1166	}
		1167
		1168	$::FLOORBOX->add_at (@add);
996	});	1169	});
997		1170
998	$::WANT_REFRESH++;	1171	$::WANT_REFRESH->start;
999	}	1172	}
1000		1173
1001	sub set_opencont {	1174	sub set_opencont {
1002	my ($conn, $tag, $name) = @_;	1175	my ($conn, $tag, $name) = @_;
1003	$conn->{open_container} = $tag;	1176	$conn->{open_container} = $tag;
1004	update_floorbox;	1177	update_floorbox;
1005		1178
1006	$::INV_RIGHT_HB->clear ();	1179	$::INVR_HB->clear ();
1007	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1180	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1008		1181
1009	if ($tag != 0) { # Floor isn't closable, is it?	1182	if ($tag != 0) { # Floor isn't closable, is it?
1010	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1183	$::INVR_HB->add (new CFPlus::UI::Button
1011	text => "Close container",	1184	text => "Close container",
1012	tooltip => "Close the currently open container (if one is open)",	1185	tooltip => "Close the currently open container (if one is open)",
1013	on_activate => sub {	1186	on_activate => sub {
1014	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1187	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1015	if $tag != 0;	1188	if $tag != 0;
1016	#if $CONN->{open_container} != 0;
1017	0	1189	0
1018	},	1190	},
1019	);	1191	);
1020	}	1192	}
1021		1193
…		…
1120	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1292	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1121	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1293	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1122	. "map size $self->{mapw}×$self->{maph}\n"	1294	. "map size $self->{mapw}×$self->{maph}\n"
1123	);	1295	);
1124		1296
1125	::setup_build_button ($self->{editor_support}->{builder_ui});
1126	}	1297	}
1127		1298
1128	sub logged_in {	1299	sub logged_in {
1129	my ($self) = @_;	1300	my ($self) = @_;
1130		1301
1131	$self->send_ext_req (cfplus_support => version => 1, sub {	1302	$self->send_ext_req (cfplus_support => version => 2, sub {
		1303	my (%msg) = @_;
		1304
1132	$self->{cfplus_ext} = $_[0]{version};	1305	$self->{cfplus_ext} = $msg{version};
1133	$self->update_server_info;	1306	$self->update_server_info;
1134		1307
1135	if ($self->{cfplus_ext} >= 2) {	1308	if ($self->{cfplus_ext} >= 2) {
1136	$self->send_ext_req ("editor_support", sub {	1309	$self->send_ext_req ("editor_support", sub {
1137	$self->{editor_support} = $_[0];	1310	$self->{editor_support} = { @_ };
1138	$self->update_server_info;	1311	$self->update_server_info;
1139		1312
1140	0	1313	0
1141	});	1314	});
1142	}	1315	}
…		…
1150	$self->send_command ("output-count $::CFG->{output_count}");	1323	$self->send_command ("output-count $::CFG->{output_count}");
1151	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1324	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1152	$self->send_command ("pickup $::CFG->{pickup}");	1325	$self->send_command ("pickup $::CFG->{pickup}");
1153	}	1326	}
1154		1327
1155	sub buildat {
1156	my ($self, $builditem, $x, $y) = @_;
1157
1158	if ($self->{cfplus_ext}) {
1159	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1160	}
1161	}
1162
1163	sub lookat {	1328	sub lookat {
1164	my ($self, $x, $y) = @_;	1329	my ($self, $x, $y) = @_;
1165		1330
1166	if ($self->{cfplus_ext}) {	1331	if ($self->{cfplus_ext}) {
1167	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1332	$self->send_ext_req (lookat => $x, $y, sub {
1168	my ($msg) = @_;	1333	my (%msg) = @_;
1169		1334
1170	if (exists $msg->{npc_dialog}) {	1335	if (exists $msg{npc_dialog}) {
1171	# start npc chat dialog	1336	# start npc chat dialog
1172	$self->{npc_dialog} = new CFPlus::NPCDialog::	1337	$self->{npc_dialog} = new CFPlus::NPCDialog::
1173	dx => $x,	1338	token => $msg{npc_dialog},
1174	dy => $y,
1175	title => "$msg->{npc_dialog} (NPC)",	1339	title => "$msg{npc_dialog}[0] (NPC)",
1176	conn => $self,	1340	conn => $self,
1177	;	1341	;
1178	}	1342	}
1179	});	1343	});
1180	}	1344	}
…		…
1245	on_activate => sub { $this->destroy; 1 },	1409	on_activate => sub { $this->destroy; 1 },
1246	;	1410	;
1247		1411
1248	$self->update_options;	1412	$self->update_options;
1249		1413
1250	$self->{id} = $self->{conn}->send_ext_req (	1414	$self->{id} = "npc-channel-" . $self->{conn}->token;
1251	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1415	$self->{conn}->connect_ext ($self->{id} => sub {
1252	sub { $this && $this->feed (@_) }	1416	$this->feed (@_) if $this;
1253	);	1417	});
		1418
		1419	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1254		1420
1255	$self->{entry}->grab_focus;	1421	$self->{entry}->grab_focus;
1256		1422
1257	$self->{textview}->add_paragraph ({	1423	$self->{textview}->add_paragraph ({
1258	fg => [1, 1, 0, 1],	1424	fg => [1, 1, 0, 1],
…		…
1281	);	1447	);
1282	}	1448	}
1283	}	1449	}
1284		1450
1285	sub feed {	1451	sub feed {
1286	my ($self, $msg) = @_;	1452	my ($self, $type, @arg) = @_;
1287		1453
1288	CFPlus::weaken $self;	1454	CFPlus::weaken $self;
1289		1455
1290	if ($msg->{msgtype} eq "reply") {	1456	if ($type eq "update") {
		1457	my (%info) = @arg;
		1458
1291	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1459	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1292	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1460	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1293
1294	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1295	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1296	my @link;
1297	$text =~ s{
1298	($match)
1299	}{
1300	my $kw = $1;
1301
1302	push @link, new CFPlus::UI::Label
1303	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1304	can_hover => 1,
1305	can_events => 1,
1306	padding_x => 0,
1307	padding_y => 0,
1308	on_button_up => sub {
1309	$self->send ($kw);
1310	};
1311
1312	"\x{fffc}"
1313	}giex;
1314		1461
		1462	if (exists $info{msg}) {
		1463	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1464	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1465	my @link;
		1466	$text =~ s{
		1467	($match)
		1468	}{
		1469	my $kw = $1;
		1470
		1471	push @link, new CFPlus::UI::Label
		1472	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1473	can_hover => 1,
		1474	can_events => 1,
		1475	padding_x => 0,
		1476	padding_y => 0,
		1477	on_button_up => sub {
		1478	$self->send ($kw);
		1479	};
		1480
		1481	"\x{fffc}"
		1482	}giex;
		1483
1315	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1484	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1316	$self->{textview}->scroll_to_bottom;	1485	$self->{textview}->scroll_to_bottom;
		1486	}
		1487
1317	$self->update_options;	1488	$self->update_options;
1318	} else {	1489	} else {
1319	$self->destroy;	1490	$self->destroy;
1320	}	1491	}
1321		1492
…		…
1326	my ($self, $msg) = @_;	1497	my ($self, $msg) = @_;
1327		1498
1328	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1499	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1329	$self->{textview}->scroll_to_bottom;	1500	$self->{textview}->scroll_to_bottom;
1330		1501
1331	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1502	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1332	}	1503	}
1333		1504
1334	sub destroy {	1505	sub destroy {
1335	my ($self) = @_;	1506	my ($self) = @_;
1336		1507
1337	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1508	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1338		1509
1339	if ($self->{conn}) {	1510	if ($self->{conn}) {
1340	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1511	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1341	delete $self->{conn}{npc_dialog};	1512	delete $self->{conn}{npc_dialog};
1342	$self->{conn}->disconnect_ext ($self->{id});	1513	$self->{conn}->disconnect_ext ($self->{id});
1343	}	1514	}
1344		1515
1345	$self->SUPER::destroy;	1516	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs. Revision 1.164 by root, Wed Aug 22 21:27:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC vs.
Revision 1.164 by root, Wed Aug 22 21:27:13 2007 UTC