[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.52 by root, Mon Jul 3 22:04:25 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 ($old, $new) = @_;
		90
		91	my $diff = $new - $old;
		92	$diff > 0 ? "+$diff" : $diff
		93	}
		94
		95	sub _stat_skillmaskdiff {
		96	my ($old, $new) = @_;
		97
		98	my @diff;
		99
		100	my $changed = $old ^ $new;
		101
		102	my @diff = map {
		103	$changed & (1<<$_)
		104	? (($new & (1<<$_) ? "+" : "-") . "skill$_")
		105	: ()
		106	}
		107	0 .. 31; # TODO
		108
		109	join "", @diff
		110	}
		111
		112	# all stats that are chacked against changes
		113	my @statchange = (
		114	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		115	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		116	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		117	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		118	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		119	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		120	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		121	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		122	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		123	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		124	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		125	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		126	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		127	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		128	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		129	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		130	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		131	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		132	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		133	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		134	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		135	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		136	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		137	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		138	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		139	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		140	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		141	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		142	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		143	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		144	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		145	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		146	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		147	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		148	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		149	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		150	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		151	);
		152
55	sub stats_update {	153	sub stats_update {
56	my ($self, $stats) = @_;	154	my ($self, $stats) = @_;
57		155
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	156	if (my $prev = $self->{prev_stats}) {
59	my $diff = $exp - $self->{prev_exp};	157	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)	158	$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;	159	}
62	$self->{prev_exp} = $exp;	160
		161	if (
		162	my @diffs = map {
		163	$stats->{$_->[0]} != $prev->{$_->[0]}
		164	? $_->[2] . $_->[1]->($prev->{$_->[0]}, $stats->{$_->[0]}) : ();
		165	}
		166	@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 {
69	my ($self, $command) = @_;	179	my ($self, $command) = @_;
70		180
		181	if ($self->{record}) {
		182	push @{$self->{record}}, $command;
		183	}
		184
		185	$self->logprint ("send: ", $command);
71	$self->send_command ($command);	186	$self->send_command ($command);
72	::status $command;	187	::status ($command);
		188	}
		189
		190	sub start_record {
		191	my ($self) = @_;
		192
		193	$self->{record} = [];
		194	}
		195
		196	sub stop_record {
		197	my ($self) = @_;
		198	return delete $self->{record};
73	}	199	}
74		200
75	sub map_scroll {	201	sub map_scroll {
76	my ($self, $dx, $dy) = @_;	202	my ($self, $dx, $dy) = @_;
77		203
…		…
81	sub feed_map1a {	207	sub feed_map1a {
82	my ($self, $data) = @_;	208	my ($self, $data) = @_;
83		209
84	$self->{map}->map1a_update ($data);	210	$self->{map}->map1a_update ($data);
85	$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);
86	}	218	}
87		219
88	sub flush_map {	220	sub flush_map {
89	my ($self) = @_;	221	my ($self) = @_;
90		222
…		…
103		235
104	$self->flush_map;	236	$self->flush_map;
105	delete $self->{neigh_map};	237	delete $self->{neigh_map};
106		238
107	$self->{map}->clear;	239	$self->{map}->clear;
		240	delete $self->{map_widget}{magicmap};
108	}	241	}
109		242
110		243
111	sub load_map($$$) {	244	sub load_map($$$) {
112	my ($self, $hash, $x, $y) = @_;	245	my ($self, $hash, $x, $y) = @_;
…		…
253	unless ($id) {	386	unless ($id) {
254	# create new id for face	387	# create new id for face
255	# I love transactions	388	# I love transactions
256	for (1..100) {	389	for (1..100) {
257	my $txn = $CFClient::DB_ENV->txn_begin;	390	my $txn = $CFClient::DB_ENV->txn_begin;
258	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	391	my $status = $self->{facemap}->db_get (id => $id);
259	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	392	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
260	$id = ($id \|\| 16) + 1;	393	$id = ($id \|\| 64) + 1;
261	if ($self->{facemap}->put (id => $id) == 0	394	if ($self->{facemap}->put (id => $id) == 0
262	&& $self->{facemap}->put ($hash => $id) == 0) {	395	&& $self->{facemap}->put ($hash => $id) == 0) {
263	$txn->txn_commit;	396	$txn->txn_commit;
264		397
265	goto gotid;	398	goto gotid;
266	}	399	}
267	}	400	}
268	$txn->abort;	401	$txn->txn_abort;
269	}	402	}
270		403
271	CFClient::fatal "maximum number of transaction retries reached - database problems?";	404	CFClient::fatal "maximum number of transaction retries reached - database problems?";
272	}	405	}
273		406
…		…
323	my ($self, $flags, $prompt) = @_;	456	my ($self, $flags, $prompt) = @_;
324		457
325	$prompt = $LAST_QUERY unless length $prompt;	458	$prompt = $LAST_QUERY unless length $prompt;
326	$LAST_QUERY = $prompt;	459	$LAST_QUERY = $prompt;
327		460
328	my $dialog = new CFClient::UI::FancyFrame	461	$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	}	462	}
384		463
385	sub drawinfo {	464	sub drawinfo {
386	my ($self, $color, $text) = @_;	465	my ($self, $color, $text) = @_;
387		466
…		…
399	[0.55, 0.41, 0.13],	478	[0.55, 0.41, 0.13],
400	[0.99, 0.77, 0.26],	479	[0.99, 0.77, 0.26],
401	[0.74, 0.65, 0.41],	480	[0.74, 0.65, 0.41],
402	);	481	);
403		482
		483	$self->logprint ("info: ", $text);
		484
404	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;
405		489
406	$text = CFClient::UI::Label::escape $text;	490	$text = CFClient::UI::Label::escape $text;
407	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	491	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
408	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	492	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
409		493
410	$self->{logview}->add_paragraph ($color[$color],	494	$self->{logview}->add_paragraph ($color[$color], $_)
411	join "\n", map "$time $_", split /\n/, $text);	495	for map "$time $_", split /\n/, $text;
		496	$self->{logview}->scroll_to_bottom;
412		497
413	$self->{statusbox}->add ($text,	498	$self->{statusbox}->add ($text,
414	group => $text,	499	group => $text,
415	fg => $color[$color],	500	fg => $color[$color],
416	timeout => 10,	501	timeout => $color >= 2 ? 60 : 10,
417	tooltip_font => $::FONT_FIXED,	502	tooltip_font => $::FONT_FIXED,
418	);	503	);
419	}	504	}
420		505
421	sub drawextinfo {	506	sub drawextinfo {
…		…
425	}	510	}
426		511
427	sub spell_add {	512	sub spell_add {
428	my ($self, $spell) = @_;	513	my ($self, $spell) = @_;
429		514
430	# TODO	515	# try to create single paragraphs of multiple lines sent by the server
431	# 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
		520	$::SPELL_PAGE->add_spell ($spell);
		521
432	$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});
433	$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});
434	}	524	}
435		525
436	sub spell_delete {	526	sub spell_delete {
437	my ($self, $spell) = @_;	527	my ($self, $spell) = @_;
		528
		529	$::SPELL_PAGE->remove_spell ($spell);
438	}	530	}
439		531
440	sub addme_success {	532	sub addme_success {
441	my ($self) = @_;	533	my ($self) = @_;
442		534
443	$self->send ("command output-sync $::CFG->{output_sync}");	535	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}");	536	my ($pom) = @_;
445		537
446	my $parser = new Pod::POM;
447	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
448
449	my %skill_tooltip;	538	my %skill_help;
450		539
451	for my $head2 ($pod->head1->[-2]->head2) {	540	for my $head2 ($pom->head1->[3]->head2) {
452	$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
453	}	545	};
454		546
455	for my $skill (values %{$self->{skill_info}}) {	547	for my $skill (values %{$self->{skill_info}}) {
456	$self->{map_widget}->add_command ("ready_skill $skill",	548	$self->{map_widget}->add_command ("ready_skill $skill",
457	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	549	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
458	. $skill_tooltip{$skill});	550	. $skill_help->{$skill});
459	$self->{map_widget}->add_command ("use_skill $skill",	551	$self->{map_widget}->add_command ("use_skill $skill",
460	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	552	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
461	. $skill_tooltip{$skill});	553	. $skill_help->{$skill});
462	}	554	}
463	}	555	}
464		556
465	sub eof {	557	sub eof {
466	my ($self) = @_;	558	my ($self) = @_;
…		…
491	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	583	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
492		584
493	$self->send ("requestinfo image_sums $face $face");	585	$self->send ("requestinfo image_sums $face $face");
494		586
495	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	587	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",
496	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	588	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
497	} elsif (!exists $self->{num_faces}) {	589	} elsif (!exists $self->{num_faces}) {
498	$self->send ("requestinfo image_info");	590	$self->send ("requestinfo image_info");
499		591
500	$self->{num_faces} = 0;	592	$self->{num_faces} = 0;
501		593
502	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	594	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",
503	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	595	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
504	}	596	}
505	}	597	}
506		598
507	sub update_floorbox {	599	sub update_floorbox {
508	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	600	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
509	return unless $::CONN;	601	return unless $::CONN;
510		602
511	$::FLOORBOX->clear;	603	$::FLOORBOX->clear;
512		604
513	my $row;	605	my $row;
514	for (@{ $::CONN->{container}{0} }) {	606	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
515	if ($row < 7) {	607	if ($row < 6) {
516	local $_->{face_widget}; # hack to force recreation of widget	608	local $_->{face_widget}; # hack to force recreation of widget
517	local $_->{desc_widget}; # hack to force recreation of widget	609	local $_->{desc_widget}; # hack to force recreation of widget
518	CFClient::Item::update_widgets $_;	610	CFClient::Item::update_widgets $_;
519		611
520	$::FLOORBOX->add (0, $row, $_->{face_widget});	612	$::FLOORBOX->add (0, $row, $_->{face_widget});
521	$::FLOORBOX->add (1, $row, $_->{desc_widget});	613	$::FLOORBOX->add (1, $row, $_->{desc_widget});
522		614
523	$row++;	615	$row++;
524	} else {	616	} else {
525	$::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	);
526	last;	621	last;
527	}	622	}
528	}	623	}
529	});	624	});
530		625
…		…
532	}	627	}
533		628
534	sub set_opencont {	629	sub set_opencont {
535	my ($conn, $tag, $name) = @_;	630	my ($conn, $tag, $name) = @_;
536	$conn->{open_container} = $tag;	631	$conn->{open_container} = $tag;
537	$::INVR_LBL->set_text ($name);	632
		633	$::INV_RIGHT_HB->clear ();
		634	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
		635
		636	if ($tag != 0) { # Floor isn't closable, is it?
		637	$::INV_RIGHT_HB->add (new CFClient::UI::Button
		638	text => "Close container",
		639	tooltip => "Close the currently open container (if one is open)",
		640	on_activate => sub {
		641	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
		642	if $tag != 0;
		643	#if $CONN->{open_container} != 0;
		644	0
		645	},
		646	);
		647	}
		648
538	$::INVR->set_items ($conn->{container}{$tag});	649	$::INVR->set_items ($conn->{container}{$tag});
539	}	650	}
540		651
541	sub update_container {	652	sub update_containers {
542	my ($tag) = @_;	653	my ($self) = @_;
543		654
544	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	655	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		656	for my $tag (keys %{ delete $self->{update_container} }) {
		657	if ($tag == 0) {
		658	update_floorbox;
		659	$::INVR->set_items ($self->{container}{0})
545	if $tag == $::CONN->{open_container};	660	if $tag == $self->{open_container};
		661	} elsif ($tag == $self->{player}{tag}) {
		662	$::INV->set_items ($self->{container}{$tag})
		663	} else {
		664	$::INVR->set_items ($self->{container}{$tag})
		665	if $tag == $self->{open_container};
		666	}
		667	}
		668	});
546	}	669	}
547		670
548	sub container_add {	671	sub container_add {
549	my ($self, $tag, $items) = @_;	672	my ($self, $tag, $items) = @_;
550		673
551	#d# print "container_add: container $tag ($self->{player}{tag})\n";	674	$self->{update_container}{$tag}++;
552		675	$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	}	676	}
565		677
566	sub container_clear {	678	sub container_clear {
567	my ($self, $tag) = @_;	679	my ($self, $tag) = @_;
568		680
569	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	681	$self->{update_container}{$tag}++;
570		682	$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	}	683	}
580		684
581	sub item_delete {	685	sub item_delete {
582	my ($self, @items) = @_;	686	my ($self, @items) = @_;
583		687
		688	$self->{update_container}{$_->{container}}++
584	for (@items) {	689	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	}	690
		691	$self->update_containers;
596	}	692	}
597		693
598	sub item_update {	694	sub item_update {
599	my ($self, $item) = @_;	695	my ($self, $item) = @_;
600		696
601	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	697	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
602		698
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;	699	CFClient::Item::update_widgets $item;
609		700
610	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	701	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
611	set_opencont ($::CONN, 0, "Floor");	702	set_opencont ($::CONN, 0, "Floor");
612		703
613	} elsif ($item->{flags} & F_OPEN) {	704	} elsif ($item->{flags} & F_OPEN) {
614	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	705	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		706
615	} else {	707	} else {
		708	$self->{update_container}{$item->{container}}++;
		709	$self->update_containers;
616	if ($item->{container} == 0) {	710	# if ($item->{container} == 0) {
617	update_floorbox;	711	# update_floorbox;
618	update_container (0);	712	# update_container (0);
619	} elsif ($item->{container} == $self->{player}{tag}) {	713	# } elsif ($item->{container} == $self->{player}{tag}) {
620	$::INV->set_items ($self->{container}{$item->{container}})	714	# $::INV->set_items ($self->{container}{$item->{container}})
621	}	715	# }
622	}	716	}
623	}	717	}
624		718
625	sub player_update {	719	sub player_update {
626	my ($self, $player) = @_;	720	my ($self, $player) = @_;
627	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	721	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
628	}	722	}
629		723
		724	sub update_server_info {
		725	my ($self) = @_;
		726
		727	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		728
		729	$::SERVER_INFO->set_markup (
		730	"server <tt>$self->{host}:$self->{port}</tt>\n"
		731	. "protocol version <tt>$self->{version}</tt>\n"
		732	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		733	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		734	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		735	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		736	. "map size $self->{mapw}×$self->{maph}\n"
		737	);
		738	}
		739
		740	sub logged_in {
		741	my ($self) = @_;
		742
		743	$self->send_ext_req (cfplus_support => "1", sub {
		744	$self->{cfplus_ext} = $_[0];
		745	$self->update_server_info;
		746	});
		747
		748	$self->update_server_info;
		749
		750	$self->send_command ("output-sync $::CFG->{output_sync}");
		751	$self->send_command ("output-count $::CFG->{output_count}");
		752	$self->send_command ("pickup $::CFG->{pickup}");
		753	}
		754
		755	sub lookat {
		756	my ($self, $x, $y) = @_;
		757
		758	if ($self->{cfplus_ext}) {
		759	$self->send_ext_req (lookat => "$x $y", sub {
		760	my %res = split /\x00/, $_[0];
		761
		762	if (exists $res{npc_dialog}) {
		763	# start npc chat dialog
		764	$self->{npc_dialog} = new CFClient::NPCDialog::
		765	dx => $x,
		766	dy => $y,
		767	title => "$res{npc_dialog} (NPC)",
		768	conn => $self,
		769	;
		770	}
		771	});
		772	}
		773
		774	$self->send ("lookat $x $y");
		775	}
		776
		777	sub destroy {
		778	my ($self) = @_;
		779
		780	$self->{npc_dialog}->destroy
		781	if $self->{npc_dialog};
		782
		783	$self->SUPER::destroy;
		784	}
		785
		786	package CFClient::NPCDialog;
		787
		788	our @ISA = 'CFClient::UI::FancyFrame';
		789
		790	sub new {
		791	my $class = shift;
		792
		793	my $self = $class->SUPER::new (
		794	x => 'center',
		795	y => 'center',
		796	name => "npc_dialog",
		797	force_w => $::WIDTH * 0.7,
		798	force_h => $::HEIGHT * 0.7,
		799	title => "NPC Dialog",
		800	kw => { hi => 0, yes => 0, no => 0 },
		801	@_,
		802	);
		803
		804	Scalar::Util::weaken (my $this = $self);
		805
		806	# better use a pane...
		807	$self->add (my $hbox = new CFClient::UI::HBox);
		808	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		809
		810	$hbox->add (my $vbox = new CFClient::UI::VBox);
		811
		812	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		813	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		814	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		815	. "Sometimes you have to tell an NPC something you cannot find out during "
		816	. "a normal conversation (such as a password). In those cases you have to use "
		817	. "this text entry. You can also enter responses manually instead of using the response "
		818	. "buttons below.",
		819	on_activate => sub {
		820	my ($entry, $text) = @_;
		821
		822	return unless $text =~ /\S/;
		823
		824	$entry->set_text ("");
		825	$this->send ($text);
		826
		827	0
		828	},
		829	);
		830
		831	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		832
		833	$self->{bye_button} = new CFClient::UI::Button
		834	text => "Bye (close)",
		835	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		836	on_activate => sub { $this->destroy; 0 },
		837	;
		838
		839	$self->update_options;
		840
		841	$self->{token} = $self->{conn}->ext_token;
		842	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		843	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		844
		845	$self->{entry}->grab_focus;
		846
		847	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		848
		849	$self->show;
		850	$self
		851	};
		852
		853	sub update_options {
		854	my ($self) = @_;
		855
		856	Scalar::Util::weaken $self;
		857
		858	$self->{options}->clear;
		859	$self->{options}->add ($self->{bye_button});
		860
		861	for my $kw (sort keys %{ $self->{kw} }) {
		862	$self->{options}->add (new CFClient::UI::Button
		863	text => $kw,
		864	on_activate => sub {
		865	$self->send ($kw);
		866	0
		867	},
		868	);
		869	}
		870	}
		871
		872	sub feed {
		873	my ($self, $data) = @_;
		874
		875	Scalar::Util::weaken $self;
		876
		877	my ($type, $msg) = split / /, $data, 2;
		878
		879	if ($type eq "msg") {
		880	my ($msg, @kw) = split /\x00/, $msg;
		881	$self->{kw}{$_} = 1 for @kw;
		882
		883	$msg = "\n" . CFClient::UI::Label::escape $msg;
		884	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		885	my @link;
		886	$msg =~ s{
		887	($match)
		888	}{
		889	my $kw = $1;
		890
		891	push @link, new CFClient::UI::Label
		892	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		893	can_hover => 1,
		894	can_events => 1,
		895	padding_x => 0,
		896	padding_y => 0,
		897	on_button_up => sub {
		898	$self->send ($kw);
		899	};
		900
		901	chr 0xfffc
		902	}giex;
		903
		904	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		905	$self->{textview}->scroll_to_bottom;
		906	$self->update_options;
		907	} else {
		908	$self->destroy;
		909	}
		910
		911	1
		912	}
		913
		914	sub send {
		915	my ($self, $msg) = @_;
		916
		917	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		918	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		919	$self->{textview}->scroll_to_bottom;
		920	}
		921
		922	sub destroy {
		923	my ($self) = @_;
		924
		925	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		926
		927	delete $self->{conn}{npc_dialog};
		928	$self->{conn}->disconnect_ext ($self->{token});
		929
		930	$self->SUPER::destroy;
		931	}
		932
630	1;	933	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.52 by root, Mon Jul 3 22:04:25 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.52 by root, Mon Jul 3 22:04:25 2006 UTC