[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.51 by root, Sun Jul 2 21:07:26 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;
…		…
48		59
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
		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;
53	}	86	}
54		87
55	sub stats_update {	88	sub stats_update {
56	my ($self, $stats) = @_;	89	my ($self, $stats) = @_;
57		90
…		…
66	}	99	}
67		100
68	sub user_send {	101	sub user_send {
69	my ($self, $command) = @_;	102	my ($self, $command) = @_;
70		103
		104	if ($self->{record}) {
		105	push @{$self->{record}}, $command;
		106	}
		107
		108	$self->logprint ("send: ", $command);
71	$self->send_command ($command);	109	$self->send_command ($command);
72	::status $command;	110	::status ($command);
		111	}
		112
		113	sub start_record {
		114	my ($self) = @_;
		115
		116	$self->{record} = [];
		117	}
		118
		119	sub stop_record {
		120	my ($self) = @_;
		121	return delete $self->{record};
73	}	122	}
74		123
75	sub map_scroll {	124	sub map_scroll {
76	my ($self, $dx, $dy) = @_;	125	my ($self, $dx, $dy) = @_;
77		126
…		…
81	sub feed_map1a {	130	sub feed_map1a {
82	my ($self, $data) = @_;	131	my ($self, $data) = @_;
83		132
84	$self->{map}->map1a_update ($data);	133	$self->{map}->map1a_update ($data);
85	$self->{map_widget}->update;	134	$self->{map_widget}->update;
		135	}
		136
		137	sub magicmap {
		138	my ($self, $w, $h, $x, $y, $data) = @_;
		139
		140	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
86	}	141	}
87		142
88	sub flush_map {	143	sub flush_map {
89	my ($self) = @_;	144	my ($self) = @_;
90		145
…		…
103		158
104	$self->flush_map;	159	$self->flush_map;
105	delete $self->{neigh_map};	160	delete $self->{neigh_map};
106		161
107	$self->{map}->clear;	162	$self->{map}->clear;
		163	delete $self->{map_widget}{magicmap};
108	}	164	}
109		165
110		166
111	sub load_map($$$) {	167	sub load_map($$$) {
112	my ($self, $hash, $x, $y) = @_;	168	my ($self, $hash, $x, $y) = @_;
…		…
253	unless ($id) {	309	unless ($id) {
254	# create new id for face	310	# create new id for face
255	# I love transactions	311	# I love transactions
256	for (1..100) {	312	for (1..100) {
257	my $txn = $CFClient::DB_ENV->txn_begin;	313	my $txn = $CFClient::DB_ENV->txn_begin;
258	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	314	my $status = $self->{facemap}->db_get (id => $id);
259	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	315	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
260	$id = ($id \|\| 16) + 1;	316	$id = ($id \|\| 64) + 1;
261	if ($self->{facemap}->put (id => $id) == 0	317	if ($self->{facemap}->put (id => $id) == 0
262	&& $self->{facemap}->put ($hash => $id) == 0) {	318	&& $self->{facemap}->put ($hash => $id) == 0) {
263	$txn->txn_commit;	319	$txn->txn_commit;
264		320
265	goto gotid;	321	goto gotid;
266	}	322	}
267	}	323	}
268	$txn->abort;	324	$txn->txn_abort;
269	}	325	}
270		326
271	CFClient::fatal "maximum number of transaction retries reached - database problems?";	327	CFClient::fatal "maximum number of transaction retries reached - database problems?";
272	}	328	}
273		329
…		…
323	my ($self, $flags, $prompt) = @_;	379	my ($self, $flags, $prompt) = @_;
324		380
325	$prompt = $LAST_QUERY unless length $prompt;	381	$prompt = $LAST_QUERY unless length $prompt;
326	$LAST_QUERY = $prompt;	382	$LAST_QUERY = $prompt;
327		383
328	my $dialog = new CFClient::UI::FancyFrame	384	$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	}	385	}
384		386
385	sub drawinfo {	387	sub drawinfo {
386	my ($self, $color, $text) = @_;	388	my ($self, $color, $text) = @_;
387		389
…		…
399	[0.55, 0.41, 0.13],	401	[0.55, 0.41, 0.13],
400	[0.99, 0.77, 0.26],	402	[0.99, 0.77, 0.26],
401	[0.74, 0.65, 0.41],	403	[0.74, 0.65, 0.41],
402	);	404	);
403		405
		406	$self->logprint ("info: ", $text);
		407
404	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	408	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		409
		410	# try to create single paragraphs of multiple lines sent by the server
		411	$text =~ s/(?<=\S)\n(?=\w)/ /g;
405		412
406	$text = CFClient::UI::Label::escape $text;	413	$text = CFClient::UI::Label::escape $text;
407	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	414	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	415	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409		416
410	$self->{logview}->add_paragraph ($color[$color],	417	$self->{logview}->add_paragraph ($color[$color], $_)
411	join "\n", map "$time $_", split /\n/, $text);	418	for map "$time $_", split /\n/, $text;
		419	$self->{logview}->scroll_to_bottom;
412		420
413	$self->{statusbox}->add ($text,	421	$self->{statusbox}->add ($text,
414	group => $text,	422	group => $text,
415	fg => $color[$color],	423	fg => $color[$color],
416	timeout => 10,	424	timeout => $color >= 2 ? 60 : 10,
417	tooltip_font => $::FONT_FIXED,	425	tooltip_font => $::FONT_FIXED,
418	);	426	);
419	}	427	}
420		428
421	sub drawextinfo {	429	sub drawextinfo {
…		…
425	}	433	}
426		434
427	sub spell_add {	435	sub spell_add {
428	my ($self, $spell) = @_;	436	my ($self, $spell) = @_;
429		437
430	# TODO	438	# try to create single paragraphs of multiple lines sent by the server
431	# create a widget dynamically, using spell face (CF::Protocol downloads them)	439	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		440	$spell->{message} =~ s/\n+$//;
		441	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		442
		443	$::SPELL_PAGE->add_spell ($spell);
		444
432	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	445	$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});	446	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
434	}	447	}
435		448
436	sub spell_delete {	449	sub spell_delete {
437	my ($self, $spell) = @_;	450	my ($self, $spell) = @_;
		451
		452	$::SPELL_PAGE->remove_spell ($spell);
438	}	453	}
439		454
440	sub addme_success {	455	sub addme_success {
441	my ($self) = @_;	456	my ($self) = @_;
442		457
443	$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 {
444	$self->send ("command output-count $::CFG->{output_count}");	459	my ($pom) = @_;
445		460
446	my $parser = new Pod::POM;
447	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449	my %skill_tooltip;	461	my %skill_help;
450		462
451	for my $head2 ($pod->head1->[-2]->head2) {	463	for my $head2 ($pom->head1->[3]->head2) {
452	$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
453	}	468	};
454		469
455	for my $skill (values %{$self->{skill_info}}) {	470	for my $skill (values %{$self->{skill_info}}) {
456	$self->{map_widget}->add_command ("ready_skill $skill",	471	$self->{map_widget}->add_command ("ready_skill $skill",
457	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	472	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
458	. $skill_tooltip{$skill});	473	. $skill_help->{$skill});
459	$self->{map_widget}->add_command ("use_skill $skill",	474	$self->{map_widget}->add_command ("use_skill $skill",
460	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	475	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
461	. $skill_tooltip{$skill});	476	. $skill_help->{$skill});
462	}	477	}
463	}	478	}
464		479
465	sub eof {	480	sub eof {
466	my ($self) = @_;	481	my ($self) = @_;
…		…
491	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	506	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492		507
493	$self->send ("requestinfo image_sums $face $face");	508	$self->send ("requestinfo image_sums $face $face");
494		509
495	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	510	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	511	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
497	} elsif (!exists $self->{num_faces}) {	512	} elsif (!exists $self->{num_faces}) {
498	$self->send ("requestinfo image_info");	513	$self->send ("requestinfo image_info");
499		514
500	$self->{num_faces} = 0;	515	$self->{num_faces} = 0;
501		516
502	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	517	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	518	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
504	}	519	}
505	}	520	}
506		521
507	sub update_floorbox {	522	sub update_floorbox {
508	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	523	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
509	return unless $::CONN;	524	return unless $::CONN;
510		525
511	$::FLOORBOX->clear;	526	$::FLOORBOX->clear;
512		527
513	my $row;	528	my $row;
514	for (@{ $::CONN->{container}{0} }) {	529	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
515	if ($row < 7) {	530	if ($row < 6) {
516	local $_->{face_widget}; # hack to force recreation of widget	531	local $_->{face_widget}; # hack to force recreation of widget
517	local $_->{desc_widget}; # hack to force recreation of widget	532	local $_->{desc_widget}; # hack to force recreation of widget
518	CFClient::Item::update_widgets $_;	533	CFClient::Item::update_widgets $_;
519		534
520	$::FLOORBOX->add (0, $row, $_->{face_widget});	535	$::FLOORBOX->add (0, $row, $_->{face_widget});
521	$::FLOORBOX->add (1, $row, $_->{desc_widget});	536	$::FLOORBOX->add (1, $row, $_->{desc_widget});
522		537
523	$row++;	538	$row++;
524	} else {	539	} else {
525	$::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 { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		543	);
526	last;	544	last;
527	}	545	}
528	}	546	}
529	});	547	});
530		548
…		…
532	}	550	}
533		551
534	sub set_opencont {	552	sub set_opencont {
535	my ($conn, $tag, $name) = @_;	553	my ($conn, $tag, $name) = @_;
536	$conn->{open_container} = $tag;	554	$conn->{open_container} = $tag;
537	$::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	0
		568	},
		569	);
		570	}
		571
538	$::INVR->set_items ($conn->{container}{$tag});	572	$::INVR->set_items ($conn->{container}{$tag});
539	}	573	}
540		574
541	sub update_container {	575	sub update_containers {
542	my ($tag) = @_;	576	my ($self) = @_;
543		577
544	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	578	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		579	for my $tag (keys %{ delete $self->{update_container} }) {
		580	if ($tag == 0) {
		581	update_floorbox;
		582	$::INVR->set_items ($self->{container}{0})
545	if $tag == $::CONN->{open_container};	583	if $tag == $self->{open_container};
		584	} elsif ($tag == $self->{player}{tag}) {
		585	$::INV->set_items ($self->{container}{$tag})
		586	} else {
		587	$::INVR->set_items ($self->{container}{$tag})
		588	if $tag == $self->{open_container};
		589	}
		590	}
		591	});
546	}	592	}
547		593
548	sub container_add {	594	sub container_add {
549	my ($self, $tag, $items) = @_;	595	my ($self, $tag, $items) = @_;
550		596
551	#d# print "container_add: container $tag ($self->{player}{tag})\n";	597	$self->{update_container}{$tag}++;
552		598	$self->update_containers;
553	if ($tag == 0) {
554	update_floorbox;
555	update_container (0);
556	} elsif ($tag == $self->{player}{tag}) {
557	$::INV->set_items ($self->{container}{$self->{player}{tag}})
558	} else {
559	update_container ($tag);
560	}
561
562	# $self-<{player}{tag} => player inv
563	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
564	}	599	}
565		600
566	sub container_clear {	601	sub container_clear {
567	my ($self, $tag) = @_;	602	my ($self, $tag) = @_;
568		603
569	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	604	$self->{update_container}{$tag}++;
570		605	$self->update_containers;
571	if ($tag == 0) {
572	update_floorbox;
573	update_container (0);
574	} elsif ($tag == $self->{player}{tag}) {
575	$::INV->set_items ($self->{container}{$tag})
576	}
577
578	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
579	}	606	}
580		607
581	sub item_delete {	608	sub item_delete {
582	my ($self, @items) = @_;	609	my ($self, @items) = @_;
583		610
		611	$self->{update_container}{$_->{container}}++
584	for (@items) {	612	for @items;
585	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
586
587	if ($_->{container} == 0) {
588	update_floorbox;
589	update_container ($_->{tag});
590	} elsif ($_->{container} == $self->{player}{tag}) {
591	$::INV->set_items ($self->{container}{$self->{player}{tag}})
592	} else {
593	update_container ($_->{tag});
594	}
595	}	613
		614	$self->update_containers;
596	}	615	}
597		616
598	sub item_update {	617	sub item_update {
599	my ($self, $item) = @_;	618	my ($self, $item) = @_;
600		619
601	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	620	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
602		621
603	if ($item->{tag} == $self->{player}{tag}) {
604	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
605	return;
606	}
607
608	CFClient::Item::update_widgets $item;	622	CFClient::Item::update_widgets $item;
609		623
610	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	624	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
611	set_opencont ($::CONN, 0, "Floor");	625	set_opencont ($::CONN, 0, "Floor");
612		626
613	} elsif ($item->{flags} & F_OPEN) {	627	} elsif ($item->{flags} & F_OPEN) {
614	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	628	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		629
615	} else {	630	} else {
		631	$self->{update_container}{$item->{container}}++;
		632	$self->update_containers;
616	if ($item->{container} == 0) {	633	# if ($item->{container} == 0) {
617	update_floorbox;	634	# update_floorbox;
618	update_container (0);	635	# update_container (0);
619	} elsif ($item->{container} == $self->{player}{tag}) {	636	# } elsif ($item->{container} == $self->{player}{tag}) {
620	$::INV->set_items ($self->{container}{$item->{container}})	637	# $::INV->set_items ($self->{container}{$item->{container}})
621	}	638	# }
622	}	639	}
623	}	640	}
624		641
625	sub player_update {	642	sub player_update {
626	my ($self, $player) = @_;	643	my ($self, $player) = @_;
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	644	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628	}	645	}
629		646
		647	sub update_server_info {
		648	my ($self) = @_;
		649
		650	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		651
		652	$::SERVER_INFO->set_markup (
		653	"server <tt>$self->{host}:$self->{port}</tt>\n"
		654	. "protocol version <tt>$self->{version}</tt>\n"
		655	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		656	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		657	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		658	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		659	. "map size $self->{mapw}×$self->{maph}\n"
		660	);
		661	}
		662
		663	sub logged_in {
		664	my ($self) = @_;
		665
		666	$self->send_ext_req (cfplus_support => "1", sub {
		667	$self->{cfplus_ext} = $_[0];
		668	$self->update_server_info;
		669	});
		670
		671	$self->update_server_info;
		672
		673	$self->send_command ("output-sync $::CFG->{output_sync}");
		674	$self->send_command ("output-count $::CFG->{output_count}");
		675	$self->send_command ("pickup $::CFG->{pickup}");
		676	}
		677
		678	sub lookat {
		679	my ($self, $x, $y) = @_;
		680
		681	if ($self->{cfplus_ext}) {
		682	$self->send_ext_req (lookat => "$x $y", sub {
		683	my %res = split /\x00/, $_[0];
		684
		685	if (exists $res{npc_dialog}) {
		686	# start npc chat dialog
		687	$self->{npc_dialog} = new CFClient::NPCDialog::
		688	dx => $x,
		689	dy => $y,
		690	title => "$res{npc_dialog} (NPC)",
		691	conn => $self,
		692	;
		693	}
		694	});
		695	}
		696
		697	$self->send ("lookat $x $y");
		698	}
		699
		700	sub destroy {
		701	my ($self) = @_;
		702
		703	$self->{npc_dialog}->destroy
		704	if $self->{npc_dialog};
		705
		706	$self->SUPER::destroy;
		707	}
		708
		709	package CFClient::NPCDialog;
		710
		711	our @ISA = 'CFClient::UI::FancyFrame';
		712
		713	sub new {
		714	my $class = shift;
		715
		716	my $self = $class->SUPER::new (
		717	x => 'center',
		718	y => 'center',
		719	name => "npc_dialog",
		720	force_w => $::WIDTH * 0.7,
		721	force_h => $::HEIGHT * 0.7,
		722	title => "NPC Dialog",
		723	kw => { hi => 0, yes => 0, no => 0 },
		724	@_,
		725	);
		726
		727	Scalar::Util::weaken (my $this = $self);
		728
		729	# better use a pane...
		730	$self->add (my $hbox = new CFClient::UI::HBox);
		731	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		732
		733	$hbox->add (my $vbox = new CFClient::UI::VBox);
		734
		735	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		736	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		737	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		738	. "Sometimes you have to tell an NPC something you cannot find out during "
		739	. "a normal conversation (such as a password). In those cases you have to use "
		740	. "this text entry. You can also enter responses manually instead of using the response "
		741	. "buttons below.",
		742	on_activate => sub {
		743	my ($entry, $text) = @_;
		744
		745	return unless $text =~ /\S/;
		746
		747	$entry->set_text ("");
		748	$this->send ($text);
		749
		750	0
		751	},
		752	);
		753
		754	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		755
		756	$self->{bye_button} = new CFClient::UI::Button
		757	text => "Bye (close)",
		758	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		759	on_activate => sub { $this->destroy; 0 },
		760	;
		761
		762	$self->update_options;
		763
		764	$self->{token} = $self->{conn}->ext_token;
		765	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		766	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		767
		768	$self->{entry}->grab_focus;
		769
		770	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		771
		772	$self->show;
		773	$self
		774	};
		775
		776	sub update_options {
		777	my ($self) = @_;
		778
		779	Scalar::Util::weaken $self;
		780
		781	$self->{options}->clear;
		782	$self->{options}->add ($self->{bye_button});
		783
		784	for my $kw (sort keys %{ $self->{kw} }) {
		785	$self->{options}->add (new CFClient::UI::Button
		786	text => $kw,
		787	on_activate => sub {
		788	$self->send ($kw);
		789	0
		790	},
		791	);
		792	}
		793	}
		794
		795	sub feed {
		796	my ($self, $data) = @_;
		797
		798	Scalar::Util::weaken $self;
		799
		800	my ($type, $msg) = split / /, $data, 2;
		801
		802	if ($type eq "msg") {
		803	my ($msg, @kw) = split /\x00/, $msg;
		804	$self->{kw}{$_} = 1 for @kw;
		805
		806	$msg = "\n" . CFClient::UI::Label::escape $msg;
		807	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		808	my @link;
		809	$msg =~ s{
		810	($match)
		811	}{
		812	my $kw = $1;
		813
		814	push @link, new CFClient::UI::Label
		815	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		816	can_hover => 1,
		817	can_events => 1,
		818	padding_x => 0,
		819	padding_y => 0,
		820	on_button_up => sub {
		821	$self->send ($kw);
		822	};
		823
		824	chr 0xfffc
		825	}giex;
		826
		827	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		828	$self->{textview}->scroll_to_bottom;
		829	$self->update_options;
		830	} else {
		831	$self->destroy;
		832	}
		833
		834	1
		835	}
		836
		837	sub send {
		838	my ($self, $msg) = @_;
		839
		840	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		841	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		842	$self->{textview}->scroll_to_bottom;
		843	}
		844
		845	sub destroy {
		846	my ($self) = @_;
		847
		848	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		849
		850	delete $self->{conn}{npc_dialog};
		851	$self->{conn}->disconnect_ext ($self->{token});
		852
		853	$self->SUPER::destroy;
		854	}
		855
630	1;	856	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.51 by root, Sun Jul 2 21:07:26 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.51 by root, Sun Jul 2 21:07:26 2006 UTC