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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.47 by root, Wed Jun 28 21:43:15 2006 UTC

…		…
7		7
8	use CFClient;	8	use CFClient;
9	use CFClient::UI;	9	use CFClient::UI;
10		10
11	use base 'Crossfire::Protocol::Base';	11	use base 'Crossfire::Protocol::Base';
		12
		13	our %open_logs;
12		14
13	sub new {	15	sub new {
14	my $class = shift;	16	my $class = shift;
15		17
16	my $self = $class->SUPER::new (@_);	18	my $self = $class->SUPER::new (@_);
…		…
57		59
58	# per server	60	# per server
59	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	61	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";
60		62
61	$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;
62	}	86	}
63		87
64	sub stats_update {	88	sub stats_update {
65	my ($self, $stats) = @_;	89	my ($self, $stats) = @_;
66		90
…		…
79		103
80	if ($self->{record}) {	104	if ($self->{record}) {
81	push @{$self->{record}}, $command;	105	push @{$self->{record}}, $command;
82	}	106	}
83		107
		108	$self->logprint ("send: ", $command);
84	$self->send_command ($command);	109	$self->send_command ($command);
85	::status $command;	110	::status ($command);
86	}	111	}
87		112
88	sub start_record {	113	sub start_record {
89	my ($self) = @_;	114	my ($self) = @_;
90		115
…		…
105	sub feed_map1a {	130	sub feed_map1a {
106	my ($self, $data) = @_;	131	my ($self, $data) = @_;
107		132
108	$self->{map}->map1a_update ($data);	133	$self->{map}->map1a_update ($data);
109	$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);
110	}	141	}
111		142
112	sub flush_map {	143	sub flush_map {
113	my ($self) = @_;	144	my ($self) = @_;
114		145
…		…
127		158
128	$self->flush_map;	159	$self->flush_map;
129	delete $self->{neigh_map};	160	delete $self->{neigh_map};
130		161
131	$self->{map}->clear;	162	$self->{map}->clear;
		163	delete $self->{map_widget}{magicmap};
132	}	164	}
133		165
134		166
135	sub load_map($$$) {	167	sub load_map($$$) {
136	my ($self, $hash, $x, $y) = @_;	168	my ($self, $hash, $x, $y) = @_;
…		…
279	# I love transactions	311	# I love transactions
280	for (1..100) {	312	for (1..100) {
281	my $txn = $CFClient::DB_ENV->txn_begin;	313	my $txn = $CFClient::DB_ENV->txn_begin;
282	my $status = $self->{facemap}->db_get (id => $id);	314	my $status = $self->{facemap}->db_get (id => $id);
283	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	315	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
284	$id = ($id \|\| 16) + 1;	316	$id = ($id \|\| 64) + 1;
285	if ($self->{facemap}->put (id => $id) == 0	317	if ($self->{facemap}->put (id => $id) == 0
286	&& $self->{facemap}->put ($hash => $id) == 0) {	318	&& $self->{facemap}->put ($hash => $id) == 0) {
287	$txn->txn_commit;	319	$txn->txn_commit;
288		320
289	goto gotid;	321	goto gotid;
…		…
347	my ($self, $flags, $prompt) = @_;	379	my ($self, $flags, $prompt) = @_;
348		380
349	$prompt = $LAST_QUERY unless length $prompt;	381	$prompt = $LAST_QUERY unless length $prompt;
350	$LAST_QUERY = $prompt;	382	$LAST_QUERY = $prompt;
351		383
352	my $dialog = new CFClient::UI::FancyFrame	384	$self->{query}-> ($self, $flags, $prompt);
353	x => "center",
354	y => "center",
355	title => "Query",
356	child => my $vbox = new CFClient::UI::VBox,
357	;
358
359	$vbox->add (new CFClient::UI::Label
360	max_w => $::WIDTH * 0.4,
361	ellipsise => 0,
362	text => $prompt);
363
364	if ($flags & CS_QUERY_YESNO) {
365	$vbox->add (my $hbox = new CFClient::UI::HBox);
366	$hbox->add (new CFClient::UI::Button
367	text => "No",
368	on_activate => sub {
369	$self->send ("reply n");
370	$dialog->destroy;
371	$self->{map_widget}->focus_in;
372	}
373	);
374	$hbox->add (new CFClient::UI::Button
375	text => "Yes",
376	on_activate => sub {
377	$self->send ("reply y");
378	$dialog->destroy;
379	},
380	);
381
382	$dialog->focus_in;
383
384	} elsif ($flags & CS_QUERY_SINGLECHAR) {
385	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
386	$vbox->add (my $entry = new CFClient::UI::Entry
387	on_changed => sub {
388	$self->send ("reply $_[1]");
389	$dialog->destroy;
390	},
391	);
392
393	$entry->focus_in;
394
395	} else {
396	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
397
398	$vbox->add (my $entry = new CFClient::UI::Entry
399	$flags & CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
400	on_activate => sub {
401	$self->send ("reply $_[1]");
402	$dialog->destroy;
403	},
404	);
405
406	$entry->focus_in;
407	}
408
409	$dialog->show;
410	}	385	}
411		386
412	sub drawinfo {	387	sub drawinfo {
413	my ($self, $color, $text) = @_;	388	my ($self, $color, $text) = @_;
414		389
…		…
426	[0.55, 0.41, 0.13],	401	[0.55, 0.41, 0.13],
427	[0.99, 0.77, 0.26],	402	[0.99, 0.77, 0.26],
428	[0.74, 0.65, 0.41],	403	[0.74, 0.65, 0.41],
429	);	404	);
430		405
		406	$self->logprint ("info: ", $text);
		407
431	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;
432		412
433	$text = CFClient::UI::Label::escape $text;	413	$text = CFClient::UI::Label::escape $text;
434	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	414	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
435	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	415	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
436		416
437	$self->{logview}->add_paragraph ($color[$color],	417	$self->{logview}->add_paragraph ($color[$color], $_)
438	join "\n", map "$time $_", split /\n/, $text);	418	for map "$time $_", split /\n/, $text;
		419	$self->{logview}->scroll_to_bottom;
439		420
440	$self->{statusbox}->add ($text,	421	$self->{statusbox}->add ($text,
441	group => $text,	422	group => $text,
442	fg => $color[$color],	423	fg => $color[$color],
443	timeout => $color >= 2 ? 60 : 10,	424	timeout => $color >= 2 ? 60 : 10,
…		…
452	}	433	}
453		434
454	sub spell_add {	435	sub spell_add {
455	my ($self, $spell) = @_;	436	my ($self, $spell) = @_;
456		437
457	# TODO	438	# try to create single paragraphs of multiple lines sent by the server
458	# 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
459	$::SETUP_SPELLS->add_spell ($spell);	443	$::SETUP_SPELLS->add_spell ($spell);
460		444
461	$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});
462	$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});
463	}	447	}
…		…
539	return unless $::CONN;	523	return unless $::CONN;
540		524
541	$::FLOORBOX->clear;	525	$::FLOORBOX->clear;
542		526
543	my $row;	527	my $row;
544	for (@{ $::CONN->{container}{0} }) {	528	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
545	if ($row < 7) {	529	if ($row < 6) {
546	local $_->{face_widget}; # hack to force recreation of widget	530	local $_->{face_widget}; # hack to force recreation of widget
547	local $_->{desc_widget}; # hack to force recreation of widget	531	local $_->{desc_widget}; # hack to force recreation of widget
548	CFClient::Item::update_widgets $_;	532	CFClient::Item::update_widgets $_;
549		533
550	$::FLOORBOX->add (0, $row, $_->{face_widget});	534	$::FLOORBOX->add (0, $row, $_->{face_widget});
551	$::FLOORBOX->add (1, $row, $_->{desc_widget});	535	$::FLOORBOX->add (1, $row, $_->{desc_widget});
552		536
553	$row++;	537	$row++;
554	} else {	538	} else {
555	$::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	);
556	last;	543	last;
557	}	544	}
558	}	545	}
559	});	546	});
560		547
…		…
574	tooltip => "Close the currently open container (if one is open)",	561	tooltip => "Close the currently open container (if one is open)",
575	on_activate => sub {	562	on_activate => sub {
576	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	563	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
577	if $tag != 0;	564	if $tag != 0;
578	#if $CONN->{open_container} != 0;	565	#if $CONN->{open_container} != 0;
		566	0
579	},	567	},
580	);	568	);
581	}	569	}
582		570
583	$::INVR->set_items ($conn->{container}{$tag});	571	$::INVR->set_items ($conn->{container}{$tag});
…		…
591	}	579	}
592		580
593	sub container_add {	581	sub container_add {
594	my ($self, $tag, $items) = @_;	582	my ($self, $tag, $items) = @_;
595		583
596	#d# print "container_add: container $tag ($self->{player}{tag})\n";	584	$self->{update_container}{$tag}++;
		585	$self->update_containers;
		586	}
597		587
		588	sub update_containers {
		589	my ($self) = @_;
		590
		591	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		592	for my $tag (keys %{ delete $self->{update_container} }) {
598	if ($tag == 0) {	593	if ($tag == 0) {
599	update_floorbox;	594	update_floorbox;
600	update_container (0);	595	update_container (0);
601	} elsif ($tag == $self->{player}{tag}) {	596	} elsif ($tag == $self->{player}{tag}) {
602	$::INV->set_items ($self->{container}{$self->{player}{tag}})	597	$::INV->set_items ($self->{container}{$tag})
603	} else {	598	} else {
604	update_container ($tag);	599	update_container ($tag);
		600	}
		601	}
605	}	602	});
606
607	# $self-<{player}{tag} => player inv
608	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
609	}	603	}
610		604
611	sub container_clear {	605	sub container_clear {
612	my ($self, $tag) = @_;	606	my ($self, $tag) = @_;
613		607
614	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	608	$self->{update_container}{$tag}++;
615		609	$self->update_containers;
616	if ($tag == 0) {
617	update_floorbox;
618	update_container (0);
619	} elsif ($tag == $self->{player}{tag}) {
620	$::INV->set_items ($self->{container}{$tag})
621	} else {
622	update_container ($tag);
623	}
624
625	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
626	}	610	}
627		611
628	sub item_delete {	612	sub item_delete {
629	my ($self, @items) = @_;	613	my ($self, @items) = @_;
630		614
		615	$self->{update_container}{$_->{tag}}++
631	for (@items) {	616	for @items;
632	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
633
634	if ($_->{container} == 0) {
635	update_floorbox;
636	update_container ($_->{tag});
637	} elsif ($_->{container} == $self->{player}{tag}) {
638	$::INV->set_items ($self->{container}{$self->{player}{tag}})
639	} else {
640	update_container ($_->{container});
641	}
642	}	617
		618	$self->update_containers;
643	}	619	}
644		620
645	sub item_update {	621	sub item_update {
646	my ($self, $item) = @_;	622	my ($self, $item) = @_;
647		623
…		…
657	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	633	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
658	set_opencont ($::CONN, 0, "Floor");	634	set_opencont ($::CONN, 0, "Floor");
659		635
660	} elsif ($item->{flags} & F_OPEN) {	636	} elsif ($item->{flags} & F_OPEN) {
661	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	637	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		638
662	} else {	639	} else {
		640	$self->{update_container}{$item->{container}}++;
		641	$self->update_containers;
663	if ($item->{container} == 0) {	642	# if ($item->{container} == 0) {
664	update_floorbox;	643	# update_floorbox;
665	update_container (0);	644	# update_container (0);
666	} elsif ($item->{container} == $self->{player}{tag}) {	645	# } elsif ($item->{container} == $self->{player}{tag}) {
667	$::INV->set_items ($self->{container}{$item->{container}})	646	# $::INV->set_items ($self->{container}{$item->{container}})
668	}	647	# }
669	}	648	}
670	}	649	}
671		650
672	sub player_update {	651	sub player_update {
673	my ($self, $player) = @_;	652	my ($self, $player) = @_;
		653
674	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	654	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
		655	}
675		656
676	# do it here because it is ignored earlier, and there is no "login" event	657	sub update_server_info {
		658	my ($self) = @_;
		659
		660	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		661
		662	$::SERVER_INFO->set_markup (
		663	"server <tt>$self->{host}:$self->{port}</tt>\n"
		664	. "protocol version <tt>$self->{version}</tt>\n"
		665	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		666	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		667	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		668	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		669	. "map size $self->{mapw}×$self->{maph}\n"
		670	);
		671	}
		672
		673	sub logged_in {
		674	my ($self) = @_;
		675
		676	$self->send_ext_req (cfplus_support => "1", sub {
		677	$self->{cfplus_ext} = $_[0];
		678	$self->update_server_info;
		679	});
		680
		681	$self->update_server_info;
		682
677	$self->send_command ("output-sync $::CFG->{output_sync}");	683	$self->send_command ("output-sync $::CFG->{output_sync}");
678	$self->send_command ("output-count $::CFG->{output_count}");	684	$self->send_command ("output-count $::CFG->{output_count}");
		685	$self->send_command ("pickup $::CFG->{pickup}");
		686	}
		687
		688	sub lookat {
		689	my ($self, $x, $y) = @_;
		690
		691	if ($self->{cfplus_ext}) {
		692	$self->send_ext_req (lookat => "$x $y", sub {
		693	my %res = split /\x00/, $_[0];
		694
		695	if (exists $res{npc_dialog}) {
		696	# start npc chat dialog
		697	$self->{npc_dialog} = new CFClient::NPCDialog::
		698	dx => $x,
		699	dy => $y,
		700	title => "$res{npc_dialog} (NPC)",
		701	conn => $self,
		702	;
		703	}
		704	});
		705	}
		706
		707	$self->send ("lookat $x $y");
		708	}
		709
		710	sub destroy {
		711	my ($self) = @_;
		712
		713	$self->{npc_dialog}->destroy
		714	if $self->{npc_dialog};
		715
		716	$self->SUPER::destroy;
		717	}
		718
		719	package CFClient::NPCDialog;
		720
		721	our @ISA = 'CFClient::UI::FancyFrame';
		722
		723	sub new {
		724	my $class = shift;
		725
		726	my $self = $class->SUPER::new (
		727	x => 'center',
		728	y => 'center',
		729	name => "npc_dialog",
		730	force_w => $::WIDTH * 0.7,
		731	force_h => $::HEIGHT * 0.7,
		732	title => "NPC Dialog",
		733	kw => { hi => 0, yes => 0, no => 0 },
		734	@_,
		735	);
		736
		737	Scalar::Util::weaken (my $this = $self);
		738
		739	# better use a pane...
		740	$self->add (my $hbox = new CFClient::UI::HBox);
		741	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
		742
		743	$hbox->add (my $vbox = new CFClient::UI::VBox);
		744
		745	$vbox->add (new CFClient::UI::Label text => "Message Entry:");
		746	$vbox->add ($self->{entry} = new CFClient::UI::Entry
		747	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		748	. "Sometimes you have to tell an NPC something you cannot find out during "
		749	. "a normal conversation (such as a password). In those cases you have to use "
		750	. "this text entry. You can also enter responses manually instead of using the response "
		751	. "buttons below.",
		752	on_activate => sub {
		753	my ($entry, $text) = @_;
		754
		755	return unless $text =~ /\S/;
		756
		757	$entry->set_text ("");
		758	$this->send ($text);
		759
		760	0
		761	},
		762	);
		763
		764	$vbox->add ($self->{options} = new CFClient::UI::VBox);
		765
		766	$self->{bye_button} = new CFClient::UI::Button
		767	text => "Bye (close)",
		768	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		769	on_activate => sub { $this->destroy; 0 },
		770	;
		771
		772	$self->update_options;
		773
		774	$self->{token} = $self->{conn}->ext_token;
		775	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		776	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		777
		778	$self->{entry}->grab_focus;
		779
		780	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
		781
		782	$self->show;
		783	$self
		784	};
		785
		786	sub update_options {
		787	my ($self) = @_;
		788
		789	Scalar::Util::weaken $self;
		790
		791	$self->{options}->clear;
		792	$self->{options}->add ($self->{bye_button});
		793
		794	for my $kw (sort keys %{ $self->{kw} }) {
		795	$self->{options}->add (new CFClient::UI::Button
		796	text => $kw,
		797	on_activate => sub {
		798	$self->send ($kw);
		799	0
		800	},
		801	);
		802	}
		803	}
		804
		805	sub feed {
		806	my ($self, $data) = @_;
		807
		808	Scalar::Util::weaken $self;
		809
		810	my ($type, $msg) = split / /, $data, 2;
		811
		812	if ($type eq "msg") {
		813	my ($msg, @kw) = split /\x00/, $msg;
		814	$self->{kw}{$_} = 1 for @kw;
		815
		816	$msg = "\n" . CFClient::UI::Label::escape $msg;
		817	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		818	my @link;
		819	$msg =~ s{
		820	($match)
		821	}{
		822	my $kw = $1;
		823
		824	push @link, new CFClient::UI::Label
		825	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		826	can_hover => 1,
		827	can_events => 1,
		828	padding_x => 0,
		829	padding_y => 0,
		830	on_button_up => sub {
		831	$self->send ($kw);
		832	};
		833
		834	chr 0xfffc
		835	}giex;
		836
		837	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		838	$self->{textview}->scroll_to_bottom;
		839	$self->update_options;
		840	} else {
		841	$self->destroy;
		842	}
		843
		844	1
		845	}
		846
		847	sub send {
		848	my ($self, $msg) = @_;
		849
		850	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		851	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		852	$self->{textview}->scroll_to_bottom;
		853	}
		854
		855	sub destroy {
		856	my ($self) = @_;
		857
		858	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		859
		860	delete $self->{conn}{npc_dialog};
		861	$self->{conn}->disconnect_ext ($self->{token});
		862
		863	$self->SUPER::destroy;
679	}	864	}
680		865
681	1;	866	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs. Revision 1.47 by root, Wed Jun 28 21:43:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.21 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.47 by root, Wed Jun 28 21:43:15 2006 UTC