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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.15 by root, Thu Jun 1 18:56:05 2006 UTC vs.
Revision 1.58 by root, Tue Jul 11 19:53:23 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;
…		…
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	}
54		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	sub _stat_numdiff {
		89	my ($self, $name, $old, $new) = @_;
		90
		91	my $diff = $new - $old;
		92
		93	$diff = 0.01 * int $diff * 100;
		94
		95	0.1 >= abs $diff ? ()
		96	: $diff < 0 ? "$name$diff" : "$name+$diff"
		97	}
		98
		99	sub _stat_skillmaskdiff {
		100	my ($self, $name, $old, $new) = @_;
		101
		102	my $diff = $old ^ $new
		103	or return;
		104
		105	my @diff = map
		106	{
		107	$diff & $_
		108	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		109	: ()
		110	}
		111	sort { $a <=> $b } keys %{$self->{spell_paths}};
		112
		113	join "", @diff
		114	}
		115
		116	# all stats that are chacked against changes
		117	my @statchange = (
		118	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		119	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		120	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		121	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		122	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		123	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		124	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		125	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		126	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		127	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		128	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		129	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		130	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		131	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		132	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		133	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		134	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		135	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		136	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		137	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		138	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		139	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		140	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		141	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		142	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		143	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		144	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		145	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		146	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		147	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		148	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		149	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		150	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		151	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		152	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		153	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		154	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		155	);
		156
55	sub stats_update {	157	sub stats_update {
56	my ($self, $stats) = @_;	158	my ($self, $stats) = @_;
57		159
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	160	if (my $prev = $self->{prev_stats}) {
59	my $diff = $exp - $self->{prev_exp};	161	if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {
60	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	162	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61	if exists $self->{prev_exp} && $diff;	163	}
62	$self->{prev_exp} = $exp;	164
		165	if (
		166	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		167	) {
		168	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		169	$self->{statusbox}->add ($msg, group => $msg, fg => [0.8, 1, 0.2, 1], timeout => 10);
		170	}
63	}	171	}
		172
		173	$self->{prev_stats} = { %$stats };
64		174
65	::update_stats_window ($stats);	175	::update_stats_window ($stats);
66	}	176	}
67		177
68	sub user_send {	178	sub user_send {
…		…
70		180
71	if ($self->{record}) {	181	if ($self->{record}) {
72	push @{$self->{record}}, $command;	182	push @{$self->{record}}, $command;
73	}	183	}
74		184
		185	$self->logprint ("send: ", $command);
75	$self->send_command ($command);	186	$self->send_command ($command);
76	::status $command;	187	::status ($command);
77	}	188	}
78		189
79	sub start_record {	190	sub start_record {
80	my ($self) = @_;	191	my ($self) = @_;
81		192
…		…
96	sub feed_map1a {	207	sub feed_map1a {
97	my ($self, $data) = @_;	208	my ($self, $data) = @_;
98		209
99	$self->{map}->map1a_update ($data);	210	$self->{map}->map1a_update ($data);
100	$self->{map_widget}->update;	211	$self->{map_widget}->update;
		212	}
		213
		214	sub magicmap {
		215	my ($self, $w, $h, $x, $y, $data) = @_;
		216
		217	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
101	}	218	}
102		219
103	sub flush_map {	220	sub flush_map {
104	my ($self) = @_;	221	my ($self) = @_;
105		222
…		…
118		235
119	$self->flush_map;	236	$self->flush_map;
120	delete $self->{neigh_map};	237	delete $self->{neigh_map};
121		238
122	$self->{map}->clear;	239	$self->{map}->clear;
		240	delete $self->{map_widget}{magicmap};
123	}	241	}
124		242
125		243
126	sub load_map($$$) {	244	sub load_map($$$) {
127	my ($self, $hash, $x, $y) = @_;	245	my ($self, $hash, $x, $y) = @_;
…		…
270	# I love transactions	388	# I love transactions
271	for (1..100) {	389	for (1..100) {
272	my $txn = $CFClient::DB_ENV->txn_begin;	390	my $txn = $CFClient::DB_ENV->txn_begin;
273	my $status = $self->{facemap}->db_get (id => $id);	391	my $status = $self->{facemap}->db_get (id => $id);
274	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	392	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
275	$id = ($id \|\| 16) + 1;	393	$id = ($id \|\| 64) + 1;
276	if ($self->{facemap}->put (id => $id) == 0	394	if ($self->{facemap}->put (id => $id) == 0
277	&& $self->{facemap}->put ($hash => $id) == 0) {	395	&& $self->{facemap}->put ($hash => $id) == 0) {
278	$txn->txn_commit;	396	$txn->txn_commit;
279		397
280	goto gotid;	398	goto gotid;
…		…
302	undef	420	undef
303	};	421	};
304	}	422	}
305		423
306	sub face_update {	424	sub face_update {
307	my ($self, $facenum, $face) = @_;	425	my ($self, $facenum, $face, $changed) = @_;
308		426
309	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	427	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
310		428
311	$self->set_texture ($face->{id} => delete $face->{image});	429	$self->set_texture ($face->{id} => delete $face->{image});
312	}	430	}
313		431
314	sub set_texture {	432	sub set_texture {
…		…
338	my ($self, $flags, $prompt) = @_;	456	my ($self, $flags, $prompt) = @_;
339		457
340	$prompt = $LAST_QUERY unless length $prompt;	458	$prompt = $LAST_QUERY unless length $prompt;
341	$LAST_QUERY = $prompt;	459	$LAST_QUERY = $prompt;
342		460
343	my $dialog = new CFClient::UI::FancyFrame	461	$self->{query}-> ($self, $flags, $prompt);
344	x => "center",
345	y => "center",
346	title => "Query",
347	child => my $vbox = new CFClient::UI::VBox,
348	;
349
350	$vbox->add (new CFClient::UI::Label
351	max_w => $::WIDTH * 0.4,
352	ellipsise => 0,
353	text => $prompt);
354
355	if ($flags & CS_QUERY_YESNO) {
356	$vbox->add (my $hbox = new CFClient::UI::HBox);
357	$hbox->add (new CFClient::UI::Button
358	text => "No",
359	on_activate => sub {
360	$self->send ("reply n");
361	$dialog->destroy;
362	$self->{map_widget}->focus_in;
363	}
364	);
365	$hbox->add (new CFClient::UI::Button
366	text => "Yes",
367	on_activate => sub {
368	$self->send ("reply y");
369	$dialog->destroy;
370	},
371	);
372
373	$dialog->focus_in;
374
375	} elsif ($flags & CS_QUERY_SINGLECHAR) {
376	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
377	$vbox->add (my $entry = new CFClient::UI::Entry
378	on_changed => sub {
379	$self->send ("reply $_[1]");
380	$dialog->destroy;
381	},
382	);
383
384	$entry->focus_in;
385
386	} else {
387	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
388
389	$vbox->add (my $entry = new CFClient::UI::Entry
390	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
391	on_activate => sub {
392	$self->send ("reply $_[1]");
393	$dialog->destroy;
394	},
395	);
396
397	$entry->focus_in;
398	}
399
400	$dialog->show;
401	}	462	}
402		463
403	sub drawinfo {	464	sub drawinfo {
404	my ($self, $color, $text) = @_;	465	my ($self, $color, $text) = @_;
405		466
…		…
417	[0.55, 0.41, 0.13],	478	[0.55, 0.41, 0.13],
418	[0.99, 0.77, 0.26],	479	[0.99, 0.77, 0.26],
419	[0.74, 0.65, 0.41],	480	[0.74, 0.65, 0.41],
420	);	481	);
421		482
		483	$self->logprint ("info: ", $text);
		484
422	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	485	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		486
		487	# try to create single paragraphs of multiple lines sent by the server
		488	$text =~ s/(?<=\S)\n(?=\w)/ /g;
423		489
424	$text = CFClient::UI::Label::escape $text;	490	$text = CFClient::UI::Label::escape $text;
425	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	491	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	492	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427		493
428	$self->{logview}->add_paragraph ($color[$color],	494	$self->{logview}->add_paragraph ($color[$color], $_)
429	join "\n", map "$time $_", split /\n/, $text);	495	for map "$time $_", split /\n/, $text;
		496	$self->{logview}->scroll_to_bottom;
430		497
431	$self->{statusbox}->add ($text,	498	$self->{statusbox}->add ($text,
432	group => $text,	499	group => $text,
433	fg => $color[$color],	500	fg => $color[$color],
434	timeout => 10,	501	timeout => $color >= 2 ? 60 : 10,
435	tooltip_font => $::FONT_FIXED,	502	tooltip_font => $::FONT_FIXED,
436	);	503	);
437	}	504	}
438		505
439	sub drawextinfo {	506	sub drawextinfo {
…		…
443	}	510	}
444		511
445	sub spell_add {	512	sub spell_add {
446	my ($self, $spell) = @_;	513	my ($self, $spell) = @_;
447		514
448	# TODO	515	# try to create single paragraphs of multiple lines sent by the server
449	# create a widget dynamically, using spell face (CF::Protocol downloads them)	516	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		517	$spell->{message} =~ s/\n+$//;
		518	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		519
450	$::SPELL_LIST->add_spell ($spell);	520	$::SPELL_PAGE->add_spell ($spell);
451		521
452	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	522	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
453	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	523	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
454	}	524	}
455		525
456	sub spell_delete {	526	sub spell_delete {
457	my ($self, $spell) = @_;	527	my ($self, $spell) = @_;
		528
458	$::SPELL_LIST->remove_spell ($spell);	529	$::SPELL_PAGE->remove_spell ($spell);
459	}	530	}
460		531
461	sub addme_success {	532	sub addme_success {
462	my ($self) = @_;	533	my ($self) = @_;
463		534
464	my $parser = new Pod::POM;	535	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
465	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");	536	my ($pom) = @_;
466		537
467	my %skill_tooltip;	538	my %skill_help;
468		539
469	for my $head2 ($pod->head1->[-2]->head2) {	540	for my $head2 ($pom->head1->[3]->head2) {
470	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	541	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;
		542	}
		543
		544	\%skill_help
471	}	545	};
472		546
473	for my $skill (values %{$self->{skill_info}}) {	547	for my $skill (values %{$self->{skill_info}}) {
474	$self->{map_widget}->add_command ("ready_skill $skill",	548	$self->{map_widget}->add_command ("ready_skill $skill",
475	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	549	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
476	. $skill_tooltip{$skill});	550	. $skill_help->{$skill});
477	$self->{map_widget}->add_command ("use_skill $skill",	551	$self->{map_widget}->add_command ("use_skill $skill",
478	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	552	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
479	. $skill_tooltip{$skill});	553	. $skill_help->{$skill});
480	}	554	}
481	}	555	}
482		556
483	sub eof {	557	sub eof {
484	my ($self) = @_;	558	my ($self) = @_;
…		…
509	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	583	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
510		584
511	$self->send ("requestinfo image_sums $face $face");	585	$self->send ("requestinfo image_sums $face $face");
512		586
513	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	587	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
514	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	588	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
515	} elsif (!exists $self->{num_faces}) {	589	} elsif (!exists $self->{num_faces}) {
516	$self->send ("requestinfo image_info");	590	$self->send ("requestinfo image_info");
517		591
518	$self->{num_faces} = 0;	592	$self->{num_faces} = 0;
519		593
520	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	594	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
521	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	595	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
522	}	596	}
523	}	597	}
524		598
525	sub update_floorbox {	599	sub update_floorbox {
526	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	600	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
527	return unless $::CONN;	601	return unless $::CONN;
528		602
529	$::FLOORBOX->clear;	603	$::FLOORBOX->clear;
530		604
531	my $row;	605	my $row;
532	for (@{ $::CONN->{container}{0} }) {	606	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
533	if ($row < 7) {	607	if ($row < 6) {
534	local $_->{face_widget}; # hack to force recreation of widget	608	local $_->{face_widget}; # hack to force recreation of widget
535	local $_->{desc_widget}; # hack to force recreation of widget	609	local $_->{desc_widget}; # hack to force recreation of widget
536	CFClient::Item::update_widgets $_;	610	CFClient::Item::update_widgets $_;
537		611
538	$::FLOORBOX->add (0, $row, $_->{face_widget});	612	$::FLOORBOX->add (0, $row, $_->{face_widget});
539	$::FLOORBOX->add (1, $row, $_->{desc_widget});	613	$::FLOORBOX->add (1, $row, $_->{desc_widget});
540		614
541	$row++;	615	$row++;
542	} else {	616	} else {
543	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	617	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
		618	text => "More...",
		619	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		620	);
544	last;	621	last;
545	}	622	}
546	}	623	}
547	});	624	});
548		625
…		…
562	tooltip => "Close the currently open container (if one is open)",	639	tooltip => "Close the currently open container (if one is open)",
563	on_activate => sub {	640	on_activate => sub {
564	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	641	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
565	if $tag != 0;	642	if $tag != 0;
566	#if $CONN->{open_container} != 0;	643	#if $CONN->{open_container} != 0;
		644	0
567	},	645	},
568	);	646	);
569	}	647	}
570		648
571	$::INVR->set_items ($conn->{container}{$tag});	649	$::INVR->set_items ($conn->{container}{$tag});
572	}	650	}
573		651
574	sub update_container {	652	sub update_containers {
575	my ($tag) = @_;	653	my ($self) = @_;
576		654
577	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	655	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		656	my $todo = delete $self->{update_container}
		657	or return;
		658
		659	for my $tag (keys %$todo) {
		660	if ($tag == 0) {
		661	update_floorbox;
		662	$::INVR->set_items ($self->{container}{0})
578	if $tag == $::CONN->{open_container};	663	if $tag == $self->{open_container};
		664	} elsif ($tag == $self->{player}{tag}) {
		665	$::INV->set_items ($self->{container}{$tag})
		666	} else {
		667	$::INVR->set_items ($self->{container}{$tag})
		668	if $tag == $self->{open_container};
		669	}
		670	}
		671	});
579	}	672	}
580		673
581	sub container_add {	674	sub container_add {
582	my ($self, $tag, $items) = @_;	675	my ($self, $tag, $items) = @_;
583		676
584	#d# print "container_add: container $tag ($self->{player}{tag})\n";	677	$self->{update_container}{$tag}++;
585		678	$self->update_containers;
586	if ($tag == 0) {
587	update_floorbox;
588	update_container (0);
589	} elsif ($tag == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($tag);
593	}
594
595	# $self-<{player}{tag} => player inv
596	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
597	}	679	}
598		680
599	sub container_clear {	681	sub container_clear {
600	my ($self, $tag) = @_;	682	my ($self, $tag) = @_;
601		683
602	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	684	$self->{update_container}{$tag}++;
603		685	$self->update_containers;
604	if ($tag == 0) {
605	update_floorbox;
606	update_container (0);
607	} elsif ($tag == $self->{player}{tag}) {
608	$::INV->set_items ($self->{container}{$tag})
609	} else {
610	update_container ($tag);
611	}
612
613	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
614	}	686	}
615		687
616	sub item_delete {	688	sub item_delete {
617	my ($self, @items) = @_;	689	my ($self, @items) = @_;
618		690
		691	$self->{update_container}{$_->{container}}++
619	for (@items) {	692	for @items;
620	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
621
622	if ($_->{container} == 0) {
623	update_floorbox;
624	update_container ($_->{tag});
625	} elsif ($_->{container} == $self->{player}{tag}) {
626	$::INV->set_items ($self->{container}{$self->{player}{tag}})
627	} else {
628	update_container ($_->{container});
629	}
630	}	693
		694	$self->update_containers;
631	}	695	}
632		696
633	sub item_update {	697	sub item_update {
634	my ($self, $item) = @_;	698	my ($self, $item) = @_;
635		699
636	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	700	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
637		701
638	if ($item->{tag} == $self->{player}{tag}) {
639	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
640	return;
641	}
642
643	CFClient::Item::update_widgets $item;	702	CFClient::Item::update_widgets $item;
644		703
645	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	704	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
646	set_opencont ($::CONN, 0, "Floor");	705	set_opencont ($::CONN, 0, "Floor");
647		706
648	} elsif ($item->{flags} & F_OPEN) {	707	} elsif ($item->{flags} & F_OPEN) {
649	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	708	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		709
650	} else {	710	} else {
651	if ($item->{container} == 0) {	711	$self->{update_container}{$item->{container}}++;
652	update_floorbox;
653	update_container (0);	712	$self->update_containers;
654	} elsif ($item->{container} == $self->{player}{tag}) {
655	$::INV->set_items ($self->{container}{$item->{container}})
656	}
657	}	713	}
658	}	714	}
659		715
660	sub player_update {	716	sub player_update {
661	my ($self, $player) = @_;	717	my ($self, $player) = @_;
662	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	718	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
		719	}
663		720
664	# do it here because it is ignored earlier, and there is no "login" event	721	sub update_server_info {
		722	my ($self) = @_;
		723
		724	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		725
		726	$::SERVER_INFO->set_markup (
		727	"server <tt>$self->{host}:$self->{port}</tt>\n"
		728	. "protocol version <tt>$self->{version}</tt>\n"
		729	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		730	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		731	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		732	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		733	. "map size $self->{mapw}×$self->{maph}\n"
		734	);
		735	}
		736
		737	sub logged_in {
		738	my ($self) = @_;
		739
		740	$self->send_ext_req (cfplus_support => "1", sub {
		741	$self->{cfplus_ext} = $_[0];
		742	$self->update_server_info;
		743	});
		744
		745	$self->update_server_info;
		746
665	$self->send_command ("output-sync $::CFG->{output_sync}");	747	$self->send_command ("output-sync $::CFG->{output_sync}");
666	$self->send_command ("output-count $::CFG->{output_count}");	748	$self->send_command ("output-count $::CFG->{output_count}");
		749	$self->send_command ("pickup $::CFG->{pickup}");
		750	}
		751
		752	sub lookat {
		753	my ($self, $x, $y) = @_;
		754
		755	if ($self->{cfplus_ext}) {
		756	$self->send_ext_req (lookat => "$x $y", sub {
		757	my %res = split /\x00/, $_[0];
		758
		759	if (exists $res{npc_dialog}) {
		760	# start npc chat dialog
		761	$self->{npc_dialog} = new CFClient::NPCDialog::
		762	dx => $x,
		763	dy => $y,
		764	title => "$res{npc_dialog} (NPC)",
		765	conn => $self,
		766	;
		767	}
		768	});
		769	}
		770
		771	$self->send ("lookat $x $y");
		772	}
		773
		774	sub destroy {
		775	my ($self) = @_;
		776
		777	$self->{npc_dialog}->destroy
		778	if $self->{npc_dialog};
		779
		780	$self->SUPER::destroy;
		781	}
		782
		783	package CFClient::NPCDialog;
		784
		785	our @ISA = 'CFClient::UI::FancyFrame';
		786
		787	sub new {
		788	my $class = shift;
		789
		790	my $self = $class->SUPER::new (
		791	x => 'center',
		792	y => 'center',
		793	name => "npc_dialog",
		794	force_w => $::WIDTH * 0.7,
		795	force_h => $::HEIGHT * 0.7,
		796	title => "NPC Dialog",
		797	kw => { hi => 0, yes => 0, no => 0 },
		798	@_,
		799	);
		800
		801	Scalar::Util::weaken (my $this = $self);
		802
		803	# better use a pane...
		804	$self->add (my $hbox = new CFClient::UI::HBox);
		805	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		806
		807	$hbox->add (my $vbox = new CFClient::UI::VBox);
		808
		809	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		810	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		811	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		812	. "Sometimes you have to tell an NPC something you cannot find out during "
		813	. "a normal conversation (such as a password). In those cases you have to use "
		814	. "this text entry. You can also enter responses manually instead of using the response "
		815	. "buttons below.",
		816	on_activate => sub {
		817	my ($entry, $text) = @_;
		818
		819	return unless $text =~ /\S/;
		820
		821	$entry->set_text ("");
		822	$this->send ($text);
		823
		824	0
		825	},
		826	);
		827
		828	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		829
		830	$self->{bye_button} = new CFClient::UI::Button
		831	text => "Bye (close)",
		832	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		833	on_activate => sub { $this->destroy; 0 },
		834	;
		835
		836	$self->update_options;
		837
		838	$self->{token} = $self->{conn}->ext_token;
		839	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		840	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		841
		842	$self->{entry}->grab_focus;
		843
		844	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		845
		846	$self->show;
		847	$self
		848	};
		849
		850	sub update_options {
		851	my ($self) = @_;
		852
		853	Scalar::Util::weaken $self;
		854
		855	$self->{options}->clear;
		856	$self->{options}->add ($self->{bye_button});
		857
		858	for my $kw (sort keys %{ $self->{kw} }) {
		859	$self->{options}->add (new CFClient::UI::Button
		860	text => $kw,
		861	on_activate => sub {
		862	$self->send ($kw);
		863	0
		864	},
		865	);
		866	}
		867	}
		868
		869	sub feed {
		870	my ($self, $data) = @_;
		871
		872	Scalar::Util::weaken $self;
		873
		874	my ($type, $msg) = split / /, $data, 2;
		875
		876	if ($type eq "msg") {
		877	my ($msg, @kw) = split /\x00/, $msg;
		878	$self->{kw}{$_} = 1 for @kw;
		879
		880	$msg = "\n" . CFClient::UI::Label::escape $msg;
		881	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		882	my @link;
		883	$msg =~ s{
		884	($match)
		885	}{
		886	my $kw = $1;
		887
		888	push @link, new CFClient::UI::Label
		889	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		890	can_hover => 1,
		891	can_events => 1,
		892	padding_x => 0,
		893	padding_y => 0,
		894	on_button_up => sub {
		895	$self->send ($kw);
		896	};
		897
		898	chr 0xfffc
		899	}giex;
		900
		901	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		902	$self->{textview}->scroll_to_bottom;
		903	$self->update_options;
		904	} else {
		905	$self->destroy;
		906	}
		907
		908	1
		909	}
		910
		911	sub send {
		912	my ($self, $msg) = @_;
		913
		914	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		915	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		916	$self->{textview}->scroll_to_bottom;
		917	}
		918
		919	sub destroy {
		920	my ($self) = @_;
		921
		922	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		923
		924	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
		925	delete $self->{conn}{npc_dialog};
		926	$self->{conn}->disconnect_ext ($self->{token});
		927
		928	$self->SUPER::destroy;
667	}	929	}
668		930
669	1;	931	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.15 by root, Thu Jun 1 18:56:05 2006 UTC vs. Revision 1.58 by root, Tue Jul 11 19:53:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.15 by root, Thu Jun 1 18:56:05 2006 UTC vs.
Revision 1.58 by root, Tue Jul 11 19:53:23 2006 UTC