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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.35 by root, Thu Jun 15 13:40:02 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
		8	use CFClient;
8	use CFClient::UI;	9	use CFClient::UI;
9		10
10	use base 'Crossfire::Protocol::Base';	11	use base 'Crossfire::Protocol::Base';
		12
		13	our %open_logs;
11		14
12	sub new {	15	sub new {
13	my $class = shift;	16	my $class = shift;
14		17
15	my $self = $class->SUPER::new (@_);	18	my $self = $class->SUPER::new (@_);
16		19
17	$self->{map_widget}->clr_commands;	20	$self->{map_widget}->clr_commands;
18		21
19	my $parser = new Pod::POM;	22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");	23	my ($pom) = @_;
21		24
		25	my @cmd_help;
		26
22	for my $head2 ($pod->head1->[-2]->head2) {	27	for my $head2 ($pom->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	28	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
24	or next;	29	or next;
25		30
26	my $cmd = $1;	31	my $cmd = $1;
27	my @args = split /\\|/, $2;	32	my @args = split /\\|/, $2;
28	@args = (".*") unless @args;	33	@args = (".*") unless @args;
29		34
30	$_ = $_ eq ".*" ? "" : " $_"	35	$_ = $_ eq ".*" ? "" : " $_"
31	for @args;	36	for @args;
32		37
33	my $text = CFClient::pod_to_pango $head2->content;	38	my $text = CFClient::pod_to_pango $head2->content;
34		39
35	$self->{map_widget}->add_command ("$cmd$_", $text)	40	push @cmd_help, ["$cmd$_", $text]
36	for sort { (length $a) <=> (length $b) }	41	for sort { (length $a) <=> (length $b) }
37	@args;	42	@args;
		43	}
		44
		45	\@cmd_help
38	}	46	};
		47
		48	$self->{map_widget}->add_command (@$_)
		49	for @$cmd_help;
39		50
40	$self->{noface} = new_from_file CFClient::Texture	51	$self->{noface} = new_from_file CFClient::Texture
41	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	52	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
42		53
43	$self->{open_container} = 0;	54	$self->{open_container} = 0;
…		…
49	# per server	60	# per server
50	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	61	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
51		62
52	$self	63	$self
53	}	64	}
		65
		66	sub logprint {
		67	my ($self, @a) = @_;
		68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";
		69
		70	my $fh = $open_logs{$filename};
		71	unless ($fh) {
		72	# FIXME: handle this more gracefully?
		73	open $fh, ">>", $filename
		74	or die "Couldn't open logfile: log.$self->{host}: $!";
		75
		76	$open_logs{$filename} = $fh;
		77	}
		78
		79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);
		80
		81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
		82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
		83
		84	print $fh "$ts ", @a, "\n";
		85	$fh->flush;
		86	}
		87
		88
54		89
55	sub stats_update {	90	sub stats_update {
56	my ($self, $stats) = @_;	91	my ($self, $stats) = @_;
57		92
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	93	if (my $exp = $stats->{+CS_STAT_EXP64}) {
…		…
66	}	101	}
67		102
68	sub user_send {	103	sub user_send {
69	my ($self, $command) = @_;	104	my ($self, $command) = @_;
70		105
		106	if ($self->{record}) {
		107	push @{$self->{record}}, $command;
		108	}
		109
		110	$self->logprint ("send: ", $command);
71	$self->send_command ($command);	111	$self->send_command ($command);
72	::status $command;	112	::status $command;
		113	}
		114
		115	sub start_record {
		116	my ($self) = @_;
		117
		118	$self->{record} = [];
		119	}
		120
		121	sub stop_record {
		122	my ($self) = @_;
		123	return delete $self->{record};
73	}	124	}
74		125
75	sub map_scroll {	126	sub map_scroll {
76	my ($self, $dx, $dy) = @_;	127	my ($self, $dx, $dy) = @_;
77		128
…		…
253	unless ($id) {	304	unless ($id) {
254	# create new id for face	305	# create new id for face
255	# I love transactions	306	# I love transactions
256	for (1..100) {	307	for (1..100) {
257	my $txn = $CFClient::DB_ENV->txn_begin;	308	my $txn = $CFClient::DB_ENV->txn_begin;
258	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	309	my $status = $self->{facemap}->db_get (id => $id);
259	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	310	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
260	$id = ($id \|\| 16) + 1;	311	$id = ($id \|\| 64) + 1;
261	if ($self->{facemap}->put (id => $id) == 0	312	if ($self->{facemap}->put (id => $id) == 0
262	&& $self->{facemap}->put ($hash => $id) == 0) {	313	&& $self->{facemap}->put ($hash => $id) == 0) {
263	$txn->txn_commit;	314	$txn->txn_commit;
264		315
265	goto gotid;	316	goto gotid;
266	}	317	}
267	}	318	}
268	$txn->abort;	319	$txn->txn_abort;
269	}	320	}
270		321
271	CFClient::fatal "maximum number of transaction retries reached - database problems?";	322	CFClient::fatal "maximum number of transaction retries reached - database problems?";
272	}	323	}
273		324
…		…
323	my ($self, $flags, $prompt) = @_;	374	my ($self, $flags, $prompt) = @_;
324		375
325	$prompt = $LAST_QUERY unless length $prompt;	376	$prompt = $LAST_QUERY unless length $prompt;
326	$LAST_QUERY = $prompt;	377	$LAST_QUERY = $prompt;
327		378
328	my $dialog = new CFClient::UI::FancyFrame	379	$self->{query}-> ($self, $flags, $prompt);
329	title => "Query",
330	child => my $vbox = new CFClient::UI::VBox;
331
332	$vbox->add (new CFClient::UI::Label
333	max_w => $::WIDTH * 0.4,
334	ellipsise => 0,
335	text => $prompt);
336
337	if ($flags & CS_QUERY_YESNO) {
338	$vbox->add (my $hbox = new CFClient::UI::HBox);
339	$hbox->add (new CFClient::UI::Button
340	text => "No",
341	connect_activate => sub {
342	$self->send ("reply n");
343	$dialog->destroy;
344	$self->{map_widget}->focus_in;
345	}
346	);
347	$hbox->add (new CFClient::UI::Button
348	text => "Yes",
349	connect_activate => sub {
350	$self->send ("reply y");
351	$dialog->destroy;
352	},
353	);
354
355	$dialog->focus_in;
356
357	} elsif ($flags & CS_QUERY_SINGLECHAR) {
358	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
359	$vbox->add (my $entry = new CFClient::UI::Entry
360	connect_changed => sub {
361	$self->send ("reply $_[1]");
362	$dialog->destroy;
363	},
364	);
365
366	$entry->focus_in;
367
368	} else {
369	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
370
371	$vbox->add (my $entry = new CFClient::UI::Entry
372	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
373	connect_activate => sub {
374	$self->send ("reply $_[1]");
375	$dialog->destroy;
376	},
377	);
378
379	$entry->focus_in;
380	}
381
382	$dialog->show_centered;
383	}	380	}
384		381
385	sub drawinfo {	382	sub drawinfo {
386	my ($self, $color, $text) = @_;	383	my ($self, $color, $text) = @_;
387		384
…		…
399	[0.55, 0.41, 0.13],	396	[0.55, 0.41, 0.13],
400	[0.99, 0.77, 0.26],	397	[0.99, 0.77, 0.26],
401	[0.74, 0.65, 0.41],	398	[0.74, 0.65, 0.41],
402	);	399	);
403		400
		401	$self->logprint ("info: ", $text);
		402
404	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	403	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		404
		405	# try to create single paragraphs of multiple lines sent by the server
		406	$text =~ s/(?<=\S)\n(?=\w)/ /g;
405		407
406	$text = CFClient::UI::Label::escape $text;	408	$text = CFClient::UI::Label::escape $text;
407	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	409	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	410	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409		411
…		…
411	join "\n", map "$time $_", split /\n/, $text);	413	join "\n", map "$time $_", split /\n/, $text);
412		414
413	$self->{statusbox}->add ($text,	415	$self->{statusbox}->add ($text,
414	group => $text,	416	group => $text,
415	fg => $color[$color],	417	fg => $color[$color],
416	timeout => 10,	418	timeout => $color >= 2 ? 60 : 10,
417	tooltip_font => $::FONT_FIXED,	419	tooltip_font => $::FONT_FIXED,
418	);	420	);
419	}	421	}
420		422
421	sub drawextinfo {	423	sub drawextinfo {
…		…
425	}	427	}
426		428
427	sub spell_add {	429	sub spell_add {
428	my ($self, $spell) = @_;	430	my ($self, $spell) = @_;
429		431
430	# TODO	432	# try to create single paragraphs of multiple lines sent by the server
431	# create a widget dynamically, using spell face (CF::Protocol downloads them)	433	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		434	$spell->{message} =~ s/\n+$//;
		435	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		436
		437	$::SETUP_SPELLS->add_spell ($spell);
		438
432	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	439	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
433	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	440	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
434	}	441	}
435		442
436	sub spell_delete {	443	sub spell_delete {
437	my ($self, $spell) = @_;	444	my ($self, $spell) = @_;
		445	$::SETUP_SPELLS->remove_spell ($spell);
438	}	446	}
439		447
440	sub addme_success {	448	sub addme_success {
441	my ($self) = @_;	449	my ($self) = @_;
442		450
443	$self->send ("command output-sync $::CFG->{output_sync}");	451	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
444	$self->send ("command output-count $::CFG->{output_count}");	452	my ($pom) = @_;
445		453
446	my $parser = new Pod::POM;
447	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449	my %skill_tooltip;	454	my %skill_help;
450		455
451	for my $head2 ($pod->head1->[-2]->head2) {	456	for my $head2 ($pom->head1->[3]->head2) {
452	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	457	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
		458	}
		459
		460	\%skill_help
453	}	461	};
454		462
455	for my $skill (values %{$self->{skill_info}}) {	463	for my $skill (values %{$self->{skill_info}}) {
456	$self->{map_widget}->add_command ("ready_skill $skill",	464	$self->{map_widget}->add_command ("ready_skill $skill",
457	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	465	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
458	. $skill_tooltip{$skill});	466	. $skill_help->{$skill});
459	$self->{map_widget}->add_command ("use_skill $skill",	467	$self->{map_widget}->add_command ("use_skill $skill",
460	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	468	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
461	. $skill_tooltip{$skill});	469	. $skill_help->{$skill});
462	}	470	}
463	}	471	}
464		472
465	sub eof {	473	sub eof {
466	my ($self) = @_;	474	my ($self) = @_;
…		…
491	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	499	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492		500
493	$self->send ("requestinfo image_sums $face $face");	501	$self->send ("requestinfo image_sums $face $face");
494		502
495	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	503	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	504	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
497	} elsif (!exists $self->{num_faces}) {	505	} elsif (!exists $self->{num_faces}) {
498	$self->send ("requestinfo image_info");	506	$self->send ("requestinfo image_info");
499		507
500	$self->{num_faces} = 0;	508	$self->{num_faces} = 0;
501		509
502	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	510	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	511	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
504	}	512	}
505	}	513	}
506		514
507	sub update_floorbox {	515	sub update_floorbox {
508	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	516	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
…		…
510		518
511	$::FLOORBOX->clear;	519	$::FLOORBOX->clear;
512		520
513	my $row;	521	my $row;
514	for (@{ $::CONN->{container}{0} }) {	522	for (@{ $::CONN->{container}{0} }) {
515	if ($row < 7) {	523	if ($row < 6) {
516	local $_->{face_widget}; # hack to force recreation of widget	524	local $_->{face_widget}; # hack to force recreation of widget
517	local $_->{desc_widget}; # hack to force recreation of widget	525	local $_->{desc_widget}; # hack to force recreation of widget
518	CFClient::Item::update_widgets $_;	526	CFClient::Item::update_widgets $_;
519		527
520	$::FLOORBOX->add (0, $row, $_->{face_widget});	528	$::FLOORBOX->add (0, $row, $_->{face_widget});
521	$::FLOORBOX->add (1, $row, $_->{desc_widget});	529	$::FLOORBOX->add (1, $row, $_->{desc_widget});
522		530
523	$row++;	531	$row++;
524	} else {	532	} else {
525	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	533	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
		534	text => "More...",
		535	on_activate => sub { $::INV_WINDOW->toggle_visibility },
		536	);
526	last;	537	last;
527	}	538	}
528	}	539	}
529	});	540	});
530		541
…		…
532	}	543	}
533		544
534	sub set_opencont {	545	sub set_opencont {
535	my ($conn, $tag, $name) = @_;	546	my ($conn, $tag, $name) = @_;
536	$conn->{open_container} = $tag;	547	$conn->{open_container} = $tag;
537	$::INVR_LBL->set_text ($name);	548
		549	$::INV_RIGHT_HB->clear ();
		550	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
		551
		552	if ($tag != 0) { # Floor isn't closable, is it?
		553	$::INV_RIGHT_HB->add (new CFClient::UI::Button
		554	text => "Close container",
		555	tooltip => "Close the currently open container (if one is open)",
		556	on_activate => sub {
		557	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
		558	if $tag != 0;
		559	#if $CONN->{open_container} != 0;
		560	},
		561	);
		562	}
		563
538	$::INVR->set_items ($conn->{container}{$tag});	564	$::INVR->set_items ($conn->{container}{$tag});
539	}	565	}
540		566
541	sub update_container {	567	sub update_container {
542	my ($tag) = @_;	568	my ($tag) = @_;
…		…
571	if ($tag == 0) {	597	if ($tag == 0) {
572	update_floorbox;	598	update_floorbox;
573	update_container (0);	599	update_container (0);
574	} elsif ($tag == $self->{player}{tag}) {	600	} elsif ($tag == $self->{player}{tag}) {
575	$::INV->set_items ($self->{container}{$tag})	601	$::INV->set_items ($self->{container}{$tag})
		602	} else {
		603	update_container ($tag);
576	}	604	}
577		605
578	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};	606	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579	}	607	}
580		608
…		…
588	update_floorbox;	616	update_floorbox;
589	update_container ($_->{tag});	617	update_container ($_->{tag});
590	} elsif ($_->{container} == $self->{player}{tag}) {	618	} elsif ($_->{container} == $self->{player}{tag}) {
591	$::INV->set_items ($self->{container}{$self->{player}{tag}})	619	$::INV->set_items ($self->{container}{$self->{player}{tag}})
592	} else {	620	} else {
593	update_container ($_->{tag});	621	update_container ($_->{container});
594	}	622	}
595	}	623	}
596	}	624	}
597		625
598	sub item_update {	626	sub item_update {
…		…
622	}	650	}
623	}	651	}
624		652
625	sub player_update {	653	sub player_update {
626	my ($self, $player) = @_;	654	my ($self, $player) = @_;
		655
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	656	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628	}	657	}
629		658
		659	sub update_server_info {
		660	my ($self) = @_;
		661
		662	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		663
		664	$::SERVER_INFO->set_markup (
		665	"server <tt>$self->{host}:$self->{port}</tt>\n"
		666	. "protocol version <tt>$self->{version}</tt>\n"
		667	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		668	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		669	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		670	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		671	. "map size $self->{mapw}×$self->{maph}\n"
		672	);
		673	}
		674
		675	sub logged_in {
		676	my ($self) = @_;
		677
		678	$self->send_ext_req (cfplus_support => "1", sub {
		679	$self->{cfplus_ext} = $_[0];
		680	$self->update_server_info;
		681	});
		682
		683	$self->update_server_info;
		684
		685	$self->send_command ("output-sync $::CFG->{output_sync}");
		686	$self->send_command ("output-count $::CFG->{output_count}");
		687	$self->send_command ("pickup $::CFG->{pickup}");
		688	}
		689
		690	sub lookat {
		691	my ($self, $x, $y) = @_;
		692
		693	if ($self->{cfplus_ext}) {
		694	$self->send_ext_req (lookat => "$x $y", sub {
		695	my %res = split /\x00/, $_[0];
		696
		697	if (exists $res{npc_dialog}) {
		698	# start npc chat dialog
		699	$self->{npc_dialog} = new CFClient::NPCDialog::
		700	dx => $x,
		701	dy => $y,
		702	title => "$res{npc_dialog} (NPC)",
		703	conn => $self,
		704	;
		705	}
		706	});
		707	}
		708
		709	$self->send ("lookat $x $y");
		710	}
		711
		712	sub destroy {
		713	my ($self) = @_;
		714
		715	$self->{npc_dialog}->destroy
		716	if $self->{npc_dialog};
		717
		718	$self->SUPER::destroy;
		719	}
		720
		721	package CFClient::NPCDialog;
		722
		723	our @ISA = 'CFClient::UI::FancyFrame';
		724
		725	sub new {
		726	my $class = shift;
		727
		728	my $self = $class->SUPER::new (
		729	x => 'center',
		730	y => 'center',
		731	name => "npc_dialog",
		732	force_w => $::WIDTH * 0.7,
		733	force_h => $::HEIGHT * 0.7,
		734	title => "NPC Dialog",
		735	kw => { hi => 0, yes => 0, no => 0 },
		736	@_,
		737	);
		738
		739	Scalar::Util::weaken (my $this = $self);
		740
		741	# better use a pane...
		742	$self->add (my $hbox = new CFClient::UI::HBox);
		743	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		744
		745	$hbox->add (my $vbox = new CFClient::UI::VBox);
		746
		747	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		748	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		749	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		750	. "Sometimes you have to tell an NPC something you cannot find out during "
		751	. "a normal conversation (such as a password). In those cases you have to use "
		752	. "this text entry. You can also enter responses manually instead of using the response "
		753	. "buttons below.",
		754	on_activate => sub {
		755	my ($entry, $text) = @_;
		756
		757	return unless $text =~ /\S/;
		758
		759	$entry->set_text ("");
		760	$this->send ($text);
		761	},
		762	);
		763
		764	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		765
		766	$self->{close_button} = new CFClient::UI::Button
		767	text => "Bye (close)",
		768	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		769	on_activate => sub { $this->destroy },
		770	;
		771
		772	$self->update_options;
		773
		774	$self->{token} = $self->{conn}->ext_token;
		775	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		776	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		777
		778	$self->{entry}->focus_in;
		779
		780	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		781
		782	$self->show;
		783	$self
		784	};
		785
		786	sub update_options {
		787	my ($self) = @_;
		788
		789	Scalar::Util::weaken $self;
		790
		791	$self->{options}->clear;
		792	$self->{options}->add ($self->{close_button});
		793
		794	for my $kw (sort keys %{ $self->{kw} }) {
		795	$self->{options}->add (new CFClient::UI::Button
		796	text => $kw,
		797	on_activate => sub {
		798	$self->send ($kw);
		799	},
		800	);
		801	}
		802	}
		803
		804	sub feed {
		805	my ($self, $data) = @_;
		806
		807	my ($type, $msg) = split / /, $data, 2;
		808
		809	if ($type eq "msg") {
		810	my ($msg, @kw) = split /\x00/, $msg;
		811	$self->{kw}{$_} = 1 for @kw;
		812
		813	$msg = CFClient::UI::Label::escape $msg;
		814	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		815	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.
		816
		817	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");
		818	$self->update_options;
		819	} else {
		820	$self->destroy;
		821	}
		822
		823	1
		824	}
		825
		826	sub send {
		827	my ($self, $msg) = @_;
		828
		829	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		830	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		831	}
		832
		833	sub destroy {
		834	my ($self) = @_;
		835
		836	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1
		837
		838	delete $self->{conn}{npc_dialog};
		839	$self->{conn}->disconnect_ext ($self->{token});
		840
		841	$self->SUPER::destroy;
		842	}
		843
630	1;	844	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs. Revision 1.35 by root, Thu Jun 15 13:40:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.6 by root, Sat May 27 19:49:07 2006 UTC vs.
Revision 1.35 by root, Thu Jun 15 13:40:02 2006 UTC