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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.2 by root, Fri May 26 19:14:33 2006 UTC vs. Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.2 by root, Fri May 26 19:14:33 2006 UTC vs.
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC