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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.151 by root, Sun Aug 12 09:39:49 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFPlus;	8	use CFPlus;
		9	use CFPlus::DB;
9	use CFPlus::UI;	10	use CFPlus::UI;
10	use CFPlus::Pod;	11	use CFPlus::Pod;
		12	use CFPlus::Macro;
		13	use CFPlus::Item;
		14
		15	use Crossfire::Protocol::Base 0.95;
11		16
12	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
13		18
14	sub new {	19	sub new {
15	my $class = shift;	20	my ($class, %arg) = @_;
16		21
17	my $self = $class->SUPER::new (@_);	22	my $self = $class->SUPER::new (%arg,
		23	setup_req => {
		24	extmap => 1,
		25	excmd => 1,
		26	ywidget => 1,#d#
		27	%{$arg{setup_req} \|\| {}},
		28	},
		29	);
18		30
19	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
20		32
21	my @cmd_help = map {	33	my @cmd_help = map {
22	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
…		…
33	for @args;	45	for @args;
34		46
35	map ["$cmd$_", $text],	47	map ["$cmd$_", $text],
36	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
37	@args	49	@args
38	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
39	CFPlus::Pod::find command_help => "*";	51	CFPlus::Pod::find command => "*";
40		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		63
		64	if (my $ts = $cap{tileset}) {
		65	if (my ($default) = grep $_->[2] & 1, @$ts) {
		66	$self->{tileset} = $default;
		67	$self->{tilesize} = $default->[3];
		68	$self->setup_req (tileset => $default->[0]);
		69
		70	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		71	my $h = int $self->{maph} * 32 / $self->{tilesize};
		72
		73	$self->setup_req (mapsize => "${w}x${h}");
		74	}
		75	}
		76	});
		77
		78	$self->{json_coder}
		79	->convert_blessed
		80	->filter_json_single_key_object (__w_ => sub {
		81	$self->{widget}{$_[0]}
		82	});
		83
		84	# widgetset new
		85	$self->connect_ext (ws_n => sub {
		86	my ($id) = @_;
		87
		88	$self->{widgetset}{$id} = {
		89	w => {},
		90	};
		91	});
		92
		93	# widgetset destroy
		94	$self->connect_ext (ws_d => sub {
		95	my ($id) = @_;
		96
		97	my $ws = delete $self->{widgetset}{$id}
		98	or return;
		99
		100	$_->destroy
		101	for values %{$ws->{w}};
		102	});
		103
		104	# widgetset create
		105	$self->connect_ext (ws_c => sub {
		106	my ($ws, $id, $class, $args) = @_;
		107
		108	for my $ev (grep /^on_/, keys %$args) {
		109	$args->{$ev} = sub {
		110	my $id = shift->{s_id};
		111	$self->send_exti_msg (w_e => $id, $ev, \@_);
		112
		113	1
		114	};
		115	}
		116
		117	if (my $widget = eval {
		118	local $SIG{__DIE__};
		119	"CFPlus::UI::$class"->new (
		120	%$args,
		121	s_ws => $ws,
		122	s_id => $id,
		123	)
		124	}
		125	) {
		126	$self->{widget}{$id}
		127	= $self->{widgetset}{$ws}{w}{$id}
		128	= $widget;
		129
		130	$widget->connect (on_destroy => sub {
		131	my ($widget) = @_;
		132
		133	delete $self->{widget}{$widget->{s_id}};
		134	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
		135	});
		136	} else {
		137	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		138	$self->send_exti_msg (w_e => $id, "destroy");
		139	}
		140	});
		141
		142	# widget call
		143	$self->connect_ext (w_c => sub {
		144	my ($id, $rid, $method, $args) = @_;
		145
		146	my $w = $self->{widget}{$id}
		147	or return;
		148
		149	$args \|\|= [];
		150
		151	if ($rid) {
		152	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
		153	} else {
		154	$w->$method (@$args);
		155	}
		156	});
		157
		158	# widget set
		159	$self->connect_ext (w_s => sub {
		160	my ($id, $attr) = @_;
		161
		162	my $w = $self->{widget}{$id}
		163	or return;
		164
		165	for (my $i = 0; $i < $#$attr; $i += 2) {
		166	my ($member, $value) = @$attr[$i, $i+1];
		167	if (defined $value) {
		168	$w->{$member} = $value;
		169	} else {
		170	delete $w->{$member};
		171	}
		172	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		173	}
		174	});
		175
		176	# widget get
		177	$self->connect_ext (w_g => sub {
		178	my ($id, $rid, $attr) = @_;
		179
		180	my $w = $self->{widget}{$id}
		181	or return;
		182
		183	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		184	});
		185
		186	# message window
		187	$self->connect_ext (channel_info => sub {
		188	my ($info) = @_;
		189	$self->{channels}->{$info->{id}} = $info;
		190	$::MESSAGE_WINDOW->add_channel ($info);
		191	});
		192
		193	# destroy widgets on logout
		194	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		195	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		196	$_->destroy
		197	for values %{delete $ws->{w} \|\| {}};
		198	}
		199	});
		200
41	$self->{map_widget}->add_command (@$_)	201	$self->{map_widget}->add_command (@$_)
42	for @cmd_help;	202	for @cmd_help;
43		203
		204	{
		205	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
		206	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
		207	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		208	}
		209
		210	{
44	$self->{noface} = new_from_file CFPlus::Texture	211	$self->{noface} = my $tex = new_from_file CFPlus::Texture
45	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;	212	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		213	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		214	}
46		215
47	$self->{open_container} = 0;	216	$self->{open_container} = 0;
48		217
49	# "global"
50	$self->{tilecache} = CFPlus::db_table "tilecache";
51	$self->{facemap} = CFPlus::db_table "facemap";
52
53	# per server	218	# per server
54	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";	219	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55		220
56	$self	221	$self
		222	}
		223
		224	sub update_fx_want {
		225	my ($self) = @_;
		226
		227	$self->send_exti_msg (fx_want => {
		228	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		229	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		230	});
57	}	231	}
58		232
59	sub logprint {	233	sub logprint {
60	my ($self, @a) = @_;	234	my ($self, @a) = @_;
61		235
62	$self->{log_fh} \|\|= do {	236	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
63	my $path = "$Crossfire::VARDIR/log.$self->{host}";
64
65	open my $fh, ">>:utf8", $path
66	or die "Couldn't open logfile $path: $!";
67
68	$fh->autoflush (1);
69
70	$fh;
71	};
72
73	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
74
75	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
76	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
77
78	print {$self->{log_fh}} "$ts ", @a, "\n";
79	}	237	}
80		238
81	sub _stat_numdiff {	239	sub _stat_numdiff {
82	my ($self, $name, $old, $new) = @_;	240	my ($self, $name, $old, $new) = @_;
83		241
…		…
216	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	374	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
217	$::GAUGES->{food} ->set_value ($fo, $fo_m);	375	$::GAUGES->{food} ->set_value ($fo, $fo_m);
218	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	376	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
219	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	377	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
220	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	378	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
221	my $rng = $stats->{+CS_STAT_RANGE};	379	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
222	$rng =~ s/^Range: //; # thank you so much dear server
223	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
224	my $title = $stats->{+CS_STAT_TITLE};	380	my $title = $stats->{+CS_STAT_TITLE};
225	$title =~ s/^Player: //;	381	$title =~ s/^Player: //;
226	$::STATWIDS->{title} ->set_text ("Title: " . $title);	382	$::STATWIDS->{title} ->set_text ("Title: " . $title);
227		383
228	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	384	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
248	my @skills = keys %{ $self->{skill_info} };	404	my @skills = keys %{ $self->{skill_info} };
249		405
250	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	406	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
251	$sktbl->clear;	407	$sktbl->clear;
252		408
		409	my @add;
		410
		411	push @add,
253	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	412	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
254	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	413	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
255	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	414	2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
256	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	415	3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
257	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	416	4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
258	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	417	5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		418	;
259		419
260	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	420	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
261		421
262	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	422	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	423	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
277	if ($ev->{button} == 1) {	437	if ($ev->{button} == 1) {
278	$::CONN->user_send ("ready_skill $name");	438	$::CONN->user_send ("ready_skill $name");
279	} elsif ($ev->{button} == 2) {	439	} elsif ($ev->{button} == 2) {
280	$::CONN->user_send ("use_skill $name");	440	$::CONN->user_send ("use_skill $name");
281	} elsif ($ev->{button} == 3) {	441	} elsif ($ev->{button} == 3) {
		442	my $shortname = CFPlus::shorten $name, 14;
282	(new CFPlus::UI::Menu	443	(new CFPlus::UI::Menu
283	items => [	444	items => [
284	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],	445	["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
285	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],	446	["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
286	],	447	],
287	)->popup ($ev);	448	)->popup ($ev);
288	} else {	449	} else {
289	return 0;	450	return 0;
290	}	451	}
291		452
292	1	453	1
293	};	454	};
294		455
		456	push @add,
295	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	457	$x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	458	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
297	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	459	$x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	460	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
299	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	461	$x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
300	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	462	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		463	;
301		464
302	$x++ and ($x, $y) = (0, $y + 1);	465	$x++ and ($x, $y) = (0, $y + 1);
303	}	466	}
		467
		468	$sktbl->add_at (@add);
304	}	469	}
305		470
306	for (grep exists $stats->{$_}, @skills) {	471	for (grep exists $stats->{$_}, @skills) {
307	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	472	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
308	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	473	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
309	}	474	}
310	}	475	}
311		476
		477	sub macro_send {
		478	my ($self, $macro) = @_;
		479
		480	for my $cmd (@{ $macro->{action} }) {
		481	$self->send_command ($cmd);
		482	}
		483	}
		484
312	sub user_send {	485	sub user_send {
313	my ($self, $command) = @_;	486	my ($self, $command) = @_;
314		487
		488	$self->{record}->($command)
315	if ($self->{record}) {	489	if $self->{record};
316	push @{$self->{record}}, $command;
317	}
318		490
319	$self->logprint ("send: ", $command);	491	$self->logprint ("send: ", $command);
320	$self->send_command ($command);	492	$self->send_command ($command);
321	::status ($command);	493	::status ($command);
322	}	494	}
323		495
324	sub start_record {	496	sub record {
325	my ($self) = @_;	497	my ($self, $cb) = @_;
326		498
327	$self->{record} = [];	499	$self->{record} = $cb;
328	}
329
330	sub stop_record {
331	my ($self) = @_;
332	return delete $self->{record};
333	}	500	}
334		501
335	sub map_scroll {	502	sub map_scroll {
336	my ($self, $dx, $dy) = @_;	503	my ($self, $dx, $dy) = @_;
337		504
…		…
339	}	506	}
340		507
341	sub feed_map1a {	508	sub feed_map1a {
342	my ($self, $data) = @_;	509	my ($self, $data) = @_;
343		510
344	$self->{map}->map1a_update ($data);	511	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		512	my $delay;
		513
		514	for my $tile (@$missing) {
		515	next if $self->{delay}{$tile};
		516
		517	$delay = 1;
		518
		519	if (my $tex = $::CONN->{texture}[$tile]) {
		520	$tex->upload;
		521	} else {
		522	$self->{delay}{$tile} = 1;
		523
		524	# we assume the face is in-flight and will eventually come
		525	push @{$self->{face_cb}{$tile}}, sub {
		526	delete $self->{delay}{$tile};
		527	$_[0]->upload;
		528	};
		529	}
		530	}
		531
		532	if ($delay) {
		533	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		534	Event->timer (after => 0.03, cb => sub {
		535	$_[0]->w->cancel;
		536	$self->{map_widget}->update;
		537	});
		538	} else {
345	$self->{map_widget}->update;	539	$self->{map_widget}->update;
		540	}
346	}	541	}
347		542
348	sub magicmap {	543	sub magicmap {
349	my ($self, $w, $h, $x, $y, $data) = @_;	544	my ($self, $w, $h, $x, $y, $data) = @_;
350		545
…		…
358	or return;	553	or return;
359		554
360	my ($hash, $x, $y, $w, $h) = @$map_info;	555	my ($hash, $x, $y, $w, $h) = @$map_info;
361		556
362	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	557	my $data = $self->{map}->get_rect ($x, $y, $w, $h);
363	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	558	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
364	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	559	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
365	}	560	}
366		561
367	sub map_clear {	562	sub map_clear {
368	my ($self) = @_;	563	my ($self) = @_;
…		…
372		567
373	$self->{map}->clear;	568	$self->{map}->clear;
374	delete $self->{map_widget}{magicmap};	569	delete $self->{map_widget}{magicmap};
375	}	570	}
376		571
		572	sub bg_fetch {
		573	my ($self) = @_;
		574
		575	my $id;
		576
		577	do {
		578	$id = pop @{$self->{bg_fetch}}
		579	or return;
		580	} while $self->{texture}[$id];
		581
		582	CFPlus::DB::exists tilecache => $id, sub {
		583	my ($exists) = @_;
		584
		585	return unless $self->{map}; # stop when destroyed
		586
		587	if ($exists) {
		588	$self->have_tile ($id);
		589	$self->{texture}[$id]->upload;
		590	}
		591
		592	$self->bg_fetch;
		593	};
		594	}
377		595
378	sub load_map($$$) {	596	sub load_map($$$) {
379	my ($self, $hash, $x, $y) = @_;	597	my ($self, $hash, $x, $y) = @_;
380		598
381	if (defined (my $data = $self->{mapcache}->get ($hash))) {	599	my $gen = $self->{map_change_gen};
		600
		601	CFPlus::DB::get $self->{mapcache} => $hash, sub {
		602	return unless $gen == $self->{map_change_gen};
		603
		604	my ($data) = @_;
		605
		606	if (defined $data) {
382	$data = Compress::LZF::decompress $data;	607	$data = Compress::LZF::decompress $data;
383	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	608	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
384	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385	my $data = $self->{tilecache}->get ($id)
386	or next;
387		609
388	$self->set_texture ($id => $data);	610	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		611	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		612	$self->bg_fetch unless $inprogress;
389	}	613	}
390	}	614	};
391	}	615	}
392		616
393	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	617	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394	# (server resource,s latency, bandwidth), so this hack is warranted.	618	# (server resource,s latency, bandwidth), so this hack is warranted.
395	# the right fix is to make real tiled maps with an overview file	619	# the right fix is to make real tiled maps with an overview file
…		…
459		683
460	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	684	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
461	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	685	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
462		686
463	} else {	687	} else {
		688	my $gen = $self->{map_change_gen};
464	$self->send_mapinfo ("spatial $path$tile", sub {	689	$self->send_mapinfo ("spatial $path$tile", sub {
		690	return unless $gen == $self->{map_change_gen};
		691
465	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	692	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
466		693
467	return if $mode ne "spatial";	694	return if $mode ne "spatial";
468		695
469	$x += $self->{map}->ox;	696	$x += $self->{map}->ox;
…		…
483		710
484	sub map_change {	711	sub map_change {
485	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	712	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
486		713
487	$self->flush_map;	714	$self->flush_map;
		715
		716	++$self->{map_change_gen};
488		717
489	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	718	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
490		719
491	my $mapmapw = $self->{mapmap}->{w};	720	my $mapmapw = $self->{mapmap}->{w};
492	my $mapmaph = $self->{mapmap}->{h};	721	my $mapmaph = $self->{mapmap}->{h};
…		…
509	$self->load_map ($hash, $x, $y);	738	$self->load_map ($hash, $x, $y);
510	$self->flood_fill (0, 0, 0, "", $hash, $flags);	739	$self->flood_fill (0, 0, 0, "", $hash, $flags);
511	}	740	}
512		741
513	sub face_find {	742	sub face_find {
514	my ($self, $facenum, $face) = @_;	743	my ($self, $facenum, $face, $cb) = @_;
515		744
516	my $hash = "$face->{chksum},$face->{name}";	745	if ($face->{type} == 0) { # FT_FACE
		746	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
517		747
518	my $id = $self->{facemap}->get ($hash);	748	$face->{id} = $id;
519
520	unless ($id) {
521	# create new id for face
522	# I love transactions
523	for (1..100) {
524	my $txn = $CFPlus::DB_ENV->txn_begin;
525	my $status = $self->{facemap}->db_get (id => $id);
526	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
527	$id = ($id \|\| 64) + 1;
528	if ($self->{facemap}->put (id => $id) == 0
529	&& $self->{facemap}->put ($hash => $id) == 0) {
530	$txn->txn_commit;
531
532	goto gotid;
533	}
534	}
535	$txn->txn_abort;
536	}
537
538	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539	}
540
541	gotid:
542	$face->{id} = $id;
543	$self->{map}->set_face ($facenum => $id);
544	$self->{faceid}[$facenum] = $id;#d#	749	$self->{faceid}[$facenum] = $id;
545		750
546	my $face = $self->{tilecache}->get ($id);	751	$self->{map}->set_tileid ($facenum => $id);
547		752
548	if ($face) {	753	CFPlus::DB::get tilecache => $id, $cb;
549	#$self->face_prefetch;	754
550	$face	755	} elsif ($face->{type} & 1) { # with metadata
551	} else {	756	CFPlus::DB::get res_meta => $face->{name}, $cb;
552	my $tex = $self->{noface};
553	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554	undef
555	};	757	}
556	}	758	}
557		759
558	sub face_update {	760	sub face_update {
559	my ($self, $facenum, $face, $changed) = @_;	761	my ($self, $facenum, $face, $changed) = @_;
560		762
561	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	763	if ($face->{type} == 0) { # FT_FACE
		764	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		765	if $changed;
562		766
563	$self->set_texture ($face->{id} => delete $face->{image});	767	$self->have_tile ($face->{id});
564	}
565		768
566	sub set_texture {	769	} elsif ($face->{type} & 1) { # split metadata
		770	if ($changed) { # new data
		771	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		772	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		773
		774	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		775	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		776	} else {
		777	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		778	}
		779
		780	::add_license ($face);
		781
		782	if ($face->{type} == 3) { # FT_MUSIC
		783	$self->{music_meta}{$facenum} = $face;
		784
		785	::message ({ markup => "downloaded song #$facenum" })
		786	if $changed;
		787
		788	&::audio_music_push ($facenum);
		789	} elsif ($face->{type} == 5) { # FT_SOUND
		790	$self->{sound_meta}{$facenum} = $face;
		791
		792	::message ({ markup => "downloaded sound #$facenum" })
		793	if $changed;
		794
		795	&::audio_sound_push ($facenum);
		796	}
		797
		798	}
		799	}
		800
		801	sub smooth_update {
		802	my ($self, $facenum, $face) = @_;
		803
		804	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		805	}
		806
		807	sub have_tile {
		808	my ($self, $tile) = @_;
		809
		810	return unless $self->{map};
		811
		812	my $tex = $self->{texture}[$tile] \|\|=
		813	new CFPlus::Texture
		814	tile => $tile, minify => 1, mipmap => 1, delay => 1;
		815
		816	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
		817	}
		818
		819	sub connect_face_update {
567	my ($self, $id, $data) = @_;	820	my ($self, $id, $cb) = @_;
568		821
569	$self->{texture}[$id] \|\|= do {	822	push @{$self->{face_cb}{$id}}, $cb;
570	my $tex =
571	new_from_image CFPlus::Texture
572	$data, minify => 1, mipmap => 1;
573		823
574	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	824	CFPlus::guard {
575	$self->{map_widget}->update;	825	@{$self->{face_cb}{$id}}
576		826	= grep $_ != $cb,
577	$tex	827	@{$self->{face_cb}{$id}};
578	};	828	}
579	}	829	}
580		830
581	sub sound_play {	831	sub sound_play {
582	my ($self, $x, $y, $soundnum, $type) = @_;	832	my ($self, $type, $face, $dx, $dy, $vol) = @_;
583		833
584	$self->{sound_play}->($x, $y, $soundnum, $type);	834	&::audio_sound_play ($face, $dx, $dy, $vol)
		835	unless $type & 1; # odd types are silent for future expansion
585	}	836	}
586		837
587	my $LAST_QUERY; # server is stupid, stupid, stupid	838	my $LAST_QUERY; # server is stupid, stupid, stupid
588		839
589	sub query {	840	sub query {
…		…
593	$LAST_QUERY = $prompt;	844	$LAST_QUERY = $prompt;
594		845
595	$self->{query}-> ($self, $flags, $prompt);	846	$self->{query}-> ($self, $flags, $prompt);
596	}	847	}
597		848
598	sub drawinfo {	849	sub sanitise_xml($) {
599	my ($self, $color, $text) = @_;	850	local $_ = shift;
600		851
601	my @color = (	852	# we now weed out all tags we do not support
		853	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		854	# now all entities
		855	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		856
		857	# handle some elements
		858	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		859	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		860
		861	$_
		862	}
		863
		864	our %NAME_TO_COLOR = (
		865	black => 0,
		866	white => 1,
		867	darkblue => 2,
		868	red => 3,
		869	orange => 4,
		870	lightblue => 5,
		871	darkorange => 6,
		872	green => 7,
		873	darkgreen => 8,
		874	grey => 9,
		875	brown => 10,
		876	yellow => 11,
		877	tan => 12,
		878	);
		879
		880	our @CF_COLOR = (
602	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	881	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
603	[1.00, 1.00, 1.00],	882	[1.00, 1.00, 1.00],
604	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	883	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
605	[1.00, 0.00, 0.00],	884	[1.00, 0.00, 0.00],
606	[1.00, 0.54, 0.00],	885	[1.00, 0.54, 0.00],
607	[0.11, 0.56, 1.00],	886	[0.11, 0.56, 1.00],
608	[0.93, 0.46, 0.00],	887	[0.93, 0.46, 0.00],
609	[0.18, 0.54, 0.34],	888	[0.18, 0.54, 0.34],
610	[0.56, 0.73, 0.56],	889	[0.56, 0.73, 0.56],
611	[0.80, 0.80, 0.80],	890	[0.80, 0.80, 0.80],
612	[0.75, 0.61, 0.20],	891	[0.75, 0.61, 0.20],
613	[0.99, 0.77, 0.26],	892	[0.99, 0.77, 0.26],
614	[0.74, 0.65, 0.41],	893	[0.74, 0.65, 0.41],
615	);	894	);
616		895
		896	sub msg {
		897	my ($self, $color, $type, $text, @extra) = @_;
		898
		899	$text = sanitise_xml $text;
		900
		901	if (my $cb = $self->{cb_msg}{$type}) {
		902	$_->($self, $color, $type, $text, @extra) for values %$cb;
		903	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		904	$type =~ s/-/_/g;
		905	$self->{$type} = $text;
		906	} else {
617	$self->logprint ("info: ", $text);	907	$self->logprint ("msg: ", $text);
		908	return if $color < 0; # negative color == ignore if not understood
618		909
619	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	910	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
620		911
621	# try to create single paragraphs of multiple lines sent by the server	912	## try to create single paragraphs of multiple lines sent by the server
		913	# no longer neecssary with TRT servers
622	$text =~ s/(?<=\S)\n(?=\w)/ /g;	914	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
623		915
624	$text = CFPlus::asxml $text;	916	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
625	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	917	for split /\n/, $text;
626	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
627		918
628	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
629	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
630	$self->{logview}->scroll_to_bottom;
631
632	$self->{statusbox}->add ($text,	919	$self->{statusbox}->add ($text,
633	group => $text,	920	group => $text,
634	fg => $color[$color],	921	fg => $fg,
635	timeout => $color >= 2 ? 180 : 10,	922	timeout => $color >= 2 ? 180 : 10,
636	tooltip_font => $::FONT_FIXED,	923	tooltip_font => $::FONT_FIXED,
637	);	924	);
638	}	925	}
639
640	sub drawextinfo {
641	my ($self, $color, $type, $subtype, $message) = @_;
642
643	$self->drawinfo ($color, $message);
644	}	926	}
645		927
646	sub spell_add {	928	sub spell_add {
647	my ($self, $spell) = @_;	929	my ($self, $spell) = @_;
648		930
649	# try to create single paragraphs out of the multiple lines sent by the server	931	# try to create single paragraphs out of the multiple lines sent by the server
650	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	932	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651	$spell->{message} =~ s/\n+$//;	933	$spell->{message} =~ s/\n+$//;
652	$spell->{message} \|\|= "Server did not provide a description for this spell.";	934	$spell->{message} \|\|= "Server did not provide a description for this spell.";
653		935
654	$::SPELL_PAGE->add_spell ($spell);	936	$::SPELL_LIST->add_spell ($spell);
655		937
656	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});	938	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
657	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});	939	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
658	}	940	}
659		941
660	sub spell_delete {	942	sub spell_delete {
661	my ($self, $spell) = @_;	943	my ($self, $spell) = @_;
662		944
663	$::SPELL_PAGE->remove_spell ($spell);	945	$::SPELL_LIST->remove_spell ($spell);
		946	}
		947
		948	sub setup {
		949	my ($self, $setup) = @_;
		950
		951	$self->{map_widget}->set_tilesize ($self->{tilesize});
		952	$::MAP->resize ($self->{mapw}, $self->{maph});
664	}	953	}
665		954
666	sub addme_success {	955	sub addme_success {
667	my ($self) = @_;	956	my ($self) = @_;
668		957
…		…
689	$self->{map_widget}->clr_commands;	978	$self->{map_widget}->clr_commands;
690		979
691	::stop_game ();	980	::stop_game ();
692	}	981	}
693		982
694	sub image_info {
695	my ($self, $numfaces) = @_;
696
697	$self->{num_faces} = $numfaces;
698	$self->{face_prefetch} = [1 .. $numfaces];
699	$self->face_prefetch;
700	}
701
702	sub face_prefetch {
703	my ($self) = @_;
704
705	return unless $::CFG->{face_prefetch};
706
707	if ($self->{num_faces}) {
708	return if @{ $self->{send_queue} \|\| [] };
709	my $todo = @{ $self->{face_prefetch} }
710	or return;
711
712	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
713
714	$self->send ("requestinfo image_sums $face $face");
715
716	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
717	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
718	} elsif (!exists $self->{num_faces}) {
719	$self->send ("requestinfo image_info");
720
721	$self->{num_faces} = 0;
722
723	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
724	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
725	}
726	}
727
728	sub update_floorbox {	983	sub update_floorbox {
729	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	984	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
730	return unless $::CONN;	985	return unless $::CONN;
731		986
732	$::FLOORBOX->clear;	987	$::FLOORBOX->clear;
		988
		989	my @add;
733		990
734	my $row;	991	my $row;
735	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	992	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
736	if ($row < 6) {	993	if ($row < 6) {
737	local $_->{face_widget}; # hack to force recreation of widget	994	local $_->{face_widget}; # hack to force recreation of widget
738	local $_->{desc_widget}; # hack to force recreation of widget	995	local $_->{desc_widget}; # hack to force recreation of widget
739	CFPlus::Item::update_widgets $_;	996	CFPlus::Item::update_widgets $_;
740		997
		998	push @add,
741	$::FLOORBOX->add (0, $row, $_->{face_widget});	999	0, $row, $_->{face_widget},
742	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1000	1, $row, $_->{desc_widget};
743		1001
744	$row++;	1002	$row++;
745	} else {	1003	} else {
746	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1004	push @add, 1, $row, new CFPlus::UI::Button
747	text => "More...",	1005	text => "More...",
748	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1006	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
749	);	1007	;
750	last;	1008	last;
751	}	1009	}
752	}	1010	}
753	if ($::CONN->{open_container}) {	1011	if ($::CONN->{open_container}) {
754	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1012	push @add, 1, $row++, new CFPlus::UI::Button
755	text => "Close container",	1013	text => "Close container",
756	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1014	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
757	);	1015	;
758	}	1016	}
759	});
760		1017
		1018	$::FLOORBOX->add_at (@add);
		1019	});
		1020
761	$::WANT_REFRESH++;	1021	$::WANT_REFRESH->start;
762	}	1022	}
763		1023
764	sub set_opencont {	1024	sub set_opencont {
765	my ($conn, $tag, $name) = @_;	1025	my ($conn, $tag, $name) = @_;
766	$conn->{open_container} = $tag;	1026	$conn->{open_container} = $tag;
…		…
874	$::SERVER_INFO->set_markup (	1134	$::SERVER_INFO->set_markup (
875	"server <tt>$self->{host}:$self->{port}</tt>\n"	1135	"server <tt>$self->{host}:$self->{port}</tt>\n"
876	. "protocol version <tt>$self->{version}</tt>\n"	1136	. "protocol version <tt>$self->{version}</tt>\n"
877	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1137	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1138	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1139	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
		1140	. "editing support $yesno[!!$self->{editor_support}]\n"
		1141	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1142	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
879	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1143	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1144	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881	. "map size $self->{mapw}×$self->{maph}\n"	1145	. "map size $self->{mapw}×$self->{maph}\n"
882	);	1146	);
		1147
883	}	1148	}
884		1149
885	sub logged_in {	1150	sub logged_in {
886	my ($self) = @_;	1151	my ($self) = @_;
887		1152
888	$self->send_ext_req (cfplus_support => version => 1, sub {	1153	$self->send_ext_req (cfplus_support => version => 2, sub {
		1154	my (%msg) = @_;
		1155
889	$self->{cfplus_ext} = $_[0]{version};	1156	$self->{cfplus_ext} = $msg{version};
890	$self->update_server_info;	1157	$self->update_server_info;
		1158
		1159	if ($self->{cfplus_ext} >= 2) {
		1160	$self->send_ext_req ("editor_support", sub {
		1161	$self->{editor_support} = { @_ };
		1162	$self->update_server_info;
		1163
		1164	0
		1165	});
		1166	}
891		1167
892	0	1168	0
893	});	1169	});
894		1170
895	$self->update_server_info;	1171	$self->update_server_info;
896		1172
897	$self->send_command ("output-sync $::CFG->{output_sync}");	1173	$self->send_command ("output-sync $::CFG->{output_sync}");
898	$self->send_command ("output-count $::CFG->{output_count}");	1174	$self->send_command ("output-count $::CFG->{output_count}");
		1175	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
899	$self->send_command ("pickup $::CFG->{pickup}");	1176	$self->send_command ("pickup $::CFG->{pickup}");
900	}	1177	}
901		1178
902	sub lookat {	1179	sub lookat {
903	my ($self, $x, $y) = @_;	1180	my ($self, $x, $y) = @_;
904		1181
905	if ($self->{cfplus_ext}) {	1182	if ($self->{cfplus_ext}) {
906	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1183	$self->send_ext_req (lookat => $x, $y, sub {
907	my ($msg) = @_;	1184	my (%msg) = @_;
908		1185
909	if (exists $msg->{npc_dialog}) {	1186	if (exists $msg{npc_dialog}) {
910	# start npc chat dialog	1187	# start npc chat dialog
911	$self->{npc_dialog} = new CFPlus::NPCDialog::	1188	$self->{npc_dialog} = new CFPlus::NPCDialog::
912	dx => $x,	1189	token => $msg{npc_dialog},
913	dy => $y,
914	title => "$msg->{npc_dialog} (NPC)",	1190	title => "$msg{npc_dialog}[0] (NPC)",
915	conn => $self,	1191	conn => $self,
916	;	1192	;
917	}	1193	}
918	});	1194	});
919	}	1195	}
…		…
922	}	1198	}
923		1199
924	sub destroy {	1200	sub destroy {
925	my ($self) = @_;	1201	my ($self) = @_;
926		1202
927	$self->{npc_dialog}->destroy	1203	(delete $self->{npc_dialog})->destroy
928	if $self->{npc_dialog};	1204	if $self->{npc_dialog};
929		1205
930	$self->SUPER::destroy;	1206	$self->SUPER::destroy;
		1207
		1208	%$self = ();
931	}	1209	}
932		1210
933	package CFPlus::NPCDialog;	1211	package CFPlus::NPCDialog;
934		1212
935	our @ISA = 'CFPlus::UI::FancyFrame';	1213	our @ISA = 'CFPlus::UI::Toplevel';
936		1214
937	sub new {	1215	sub new {
938	my $class = shift;	1216	my $class = shift;
939		1217
940	my $self = $class->SUPER::new (	1218	my $self = $class->SUPER::new (
…		…
947	kw => { hi => 0, yes => 0, no => 0 },	1225	kw => { hi => 0, yes => 0, no => 0 },
948	has_close_button => 1,	1226	has_close_button => 1,
949	@_,	1227	@_,
950	);	1228	);
951		1229
952	Scalar::Util::weaken (my $this = $self);	1230	CFPlus::weaken (my $this = $self);
953		1231
954	$self->connect (delete => sub { $this->destroy; 1 });	1232	$self->connect (delete => sub { $this->destroy; 1 });
955		1233
956	# better use a pane...	1234	# better use a pane...
957	$self->add (my $hbox = new CFPlus::UI::HBox);	1235	$self->add (my $hbox = new CFPlus::UI::HBox);
…		…
982	on_activate => sub { $this->destroy; 1 },	1260	on_activate => sub { $this->destroy; 1 },
983	;	1261	;
984		1262
985	$self->update_options;	1263	$self->update_options;
986		1264
987	$self->{id} = $self->{conn}->send_ext_req (	1265	$self->{id} = "npc-channel-" . $self->{conn}->token;
988	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1266	$self->{conn}->connect_ext ($self->{id} => sub {
989	sub { $this && $this->feed (@_) }	1267	$this->feed (@_) if $this;
990	);	1268	});
		1269
		1270	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
991		1271
992	$self->{entry}->grab_focus;	1272	$self->{entry}->grab_focus;
993		1273
994	$self->{textview}->add_paragraph ({	1274	$self->{textview}->add_paragraph ({
995	fg => [1, 1, 0, 1],	1275	fg => [1, 1, 0, 1],
…		…
1001	};	1281	};
1002		1282
1003	sub update_options {	1283	sub update_options {
1004	my ($self) = @_;	1284	my ($self) = @_;
1005		1285
1006	Scalar::Util::weaken $self;	1286	CFPlus::weaken $self;
1007		1287
1008	$self->{options}->clear;	1288	$self->{options}->clear;
1009	$self->{options}->add ($self->{bye_button});	1289	$self->{options}->add ($self->{bye_button});
1010		1290
1011	for my $kw (sort keys %{ $self->{kw} }) {	1291	for my $kw (sort keys %{ $self->{kw} }) {
…		…
1018	);	1298	);
1019	}	1299	}
1020	}	1300	}
1021		1301
1022	sub feed {	1302	sub feed {
1023	my ($self, $msg) = @_;	1303	my ($self, $type, @arg) = @_;
1024		1304
1025	Scalar::Util::weaken $self;	1305	CFPlus::weaken $self;
1026		1306
1027	if ($msg->{msgtype} eq "reply") {	1307	if ($type eq "update") {
		1308	my (%info) = @arg;
		1309
1028	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1310	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1029	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1311	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1030
1031	my $text = "\n" . CFPlus::asxml $msg->{msg};
1032	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1033	my @link;
1034	$text =~ s{
1035	($match)
1036	}{
1037	my $kw = $1;
1038
1039	push @link, new CFPlus::UI::Label
1040	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1041	can_hover => 1,
1042	can_events => 1,
1043	padding_x => 0,
1044	padding_y => 0,
1045	on_button_up => sub {
1046	$self->send ($kw);
1047	};
1048
1049	"\x{fffc}"
1050	}giex;
1051		1312
		1313	if (exists $info{msg}) {
		1314	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1315	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1316	my @link;
		1317	$text =~ s{
		1318	($match)
		1319	}{
		1320	my $kw = $1;
		1321
		1322	push @link, new CFPlus::UI::Label
		1323	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1324	can_hover => 1,
		1325	can_events => 1,
		1326	padding_x => 0,
		1327	padding_y => 0,
		1328	on_button_up => sub {
		1329	$self->send ($kw);
		1330	};
		1331
		1332	"\x{fffc}"
		1333	}giex;
		1334
1052	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1335	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053	$self->{textview}->scroll_to_bottom;	1336	$self->{textview}->scroll_to_bottom;
		1337	}
		1338
1054	$self->update_options;	1339	$self->update_options;
1055	} else {	1340	} else {
1056	$self->destroy;	1341	$self->destroy;
1057	}	1342	}
1058		1343
…		…
1063	my ($self, $msg) = @_;	1348	my ($self, $msg) = @_;
1064		1349
1065	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1350	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1066	$self->{textview}->scroll_to_bottom;	1351	$self->{textview}->scroll_to_bottom;
1067		1352
1068	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1353	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1069	}	1354	}
1070		1355
1071	sub destroy {	1356	sub destroy {
1072	my ($self) = @_;	1357	my ($self) = @_;
1073		1358
1074	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1359	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1075		1360
1076	if ($self->{conn}) {	1361	if ($self->{conn}) {
1077	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1362	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1078	delete $self->{conn}{npc_dialog};	1363	delete $self->{conn}{npc_dialog};
1079	$self->{conn}->disconnect_ext ($self->{id});	1364	$self->{conn}->disconnect_ext ($self->{id});
1080	}	1365	}
1081		1366
1082	$self->SUPER::destroy;	1367	$self->SUPER::destroy;
1083	}	1368	}
1084		1369
1085	1	1370	1
		1371

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs. Revision 1.151 by root, Sun Aug 12 09:39:49 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.75 by root, Sun Aug 13 19:47:05 2006 UTC vs.
Revision 1.151 by root, Sun Aug 12 09:39:49 2007 UTC