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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.1 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.49 by root, Wed Jun 28 23:39:15 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.1 by root, Fri May 26 18:56:14 2006 UTC vs. Revision 1.49 by root, Wed Jun 28 23:39:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.1 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.49 by root, Wed Jun 28 23:39:15 2006 UTC