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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.34 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.51 by root, Sun Jul 2 21:07:26 2006 UTC

…		…
83		83
84	print $fh "$ts ", @a, "\n";	84	print $fh "$ts ", @a, "\n";
85	$fh->flush;	85	$fh->flush;
86	}	86	}
87		87
88
89
90	sub stats_update {	88	sub stats_update {
91	my ($self, $stats) = @_;	89	my ($self, $stats) = @_;
92		90
93	if (my $exp = $stats->{+CS_STAT_EXP64}) {	91	if (my $exp = $stats->{+CS_STAT_EXP64}) {
94	my $diff = $exp - $self->{prev_exp};	92	my $diff = $exp - $self->{prev_exp};
…		…
107	push @{$self->{record}}, $command;	105	push @{$self->{record}}, $command;
108	}	106	}
109		107
110	$self->logprint ("send: ", $command);	108	$self->logprint ("send: ", $command);
111	$self->send_command ($command);	109	$self->send_command ($command);
112	::status $command;	110	::status ($command);
113	}	111	}
114		112
115	sub start_record {	113	sub start_record {
116	my ($self) = @_;	114	my ($self) = @_;
117		115
…		…
132	sub feed_map1a {	130	sub feed_map1a {
133	my ($self, $data) = @_;	131	my ($self, $data) = @_;
134		132
135	$self->{map}->map1a_update ($data);	133	$self->{map}->map1a_update ($data);
136	$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);
137	}	141	}
138		142
139	sub flush_map {	143	sub flush_map {
140	my ($self) = @_;	144	my ($self) = @_;
141		145
…		…
154		158
155	$self->flush_map;	159	$self->flush_map;
156	delete $self->{neigh_map};	160	delete $self->{neigh_map};
157		161
158	$self->{map}->clear;	162	$self->{map}->clear;
		163	delete $self->{map_widget}{magicmap};
159	}	164	}
160		165
161		166
162	sub load_map($$$) {	167	sub load_map($$$) {
163	my ($self, $hash, $x, $y) = @_;	168	my ($self, $hash, $x, $y) = @_;
…		…
306	# I love transactions	311	# I love transactions
307	for (1..100) {	312	for (1..100) {
308	my $txn = $CFClient::DB_ENV->txn_begin;	313	my $txn = $CFClient::DB_ENV->txn_begin;
309	my $status = $self->{facemap}->db_get (id => $id);	314	my $status = $self->{facemap}->db_get (id => $id);
310	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	315	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
311	$id = ($id \|\| 16) + 1;	316	$id = ($id \|\| 64) + 1;
312	if ($self->{facemap}->put (id => $id) == 0	317	if ($self->{facemap}->put (id => $id) == 0
313	&& $self->{facemap}->put ($hash => $id) == 0) {	318	&& $self->{facemap}->put ($hash => $id) == 0) {
314	$txn->txn_commit;	319	$txn->txn_commit;
315		320
316	goto gotid;	321	goto gotid;
…		…
407		412
408	$text = CFClient::UI::Label::escape $text;	413	$text = CFClient::UI::Label::escape $text;
409	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	414	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
410	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	415	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
411		416
412	$self->{logview}->add_paragraph ($color[$color],	417	$self->{logview}->add_paragraph ($color[$color], $_)
413	join "\n", map "$time $_", split /\n/, $text);	418	for map "$time $_", split /\n/, $text;
		419	$self->{logview}->scroll_to_bottom;
414		420
415	$self->{statusbox}->add ($text,	421	$self->{statusbox}->add ($text,
416	group => $text,	422	group => $text,
417	fg => $color[$color],	423	fg => $color[$color],
418	timeout => $color >= 2 ? 60 : 10,	424	timeout => $color >= 2 ? 60 : 10,
…		…
432	# try to create single paragraphs of multiple lines sent by the server	438	# try to create single paragraphs of multiple lines sent by the server
433	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	439	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
434	$spell->{message} =~ s/\n+$//;	440	$spell->{message} =~ s/\n+$//;
435	$spell->{message} \|\|= "Server did not provide a description for this spell.";	441	$spell->{message} \|\|= "Server did not provide a description for this spell.";
436		442
437	$::SETUP_SPELLS->add_spell ($spell);	443	$::SPELL_PAGE->add_spell ($spell);
438		444
439	$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});
440	$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});
441	}	447	}
442		448
443	sub spell_delete {	449	sub spell_delete {
444	my ($self, $spell) = @_;	450	my ($self, $spell) = @_;
		451
445	$::SETUP_SPELLS->remove_spell ($spell);	452	$::SPELL_PAGE->remove_spell ($spell);
446	}	453	}
447		454
448	sub addme_success {	455	sub addme_success {
449	my ($self) = @_;	456	my ($self) = @_;
450		457
…		…
517	return unless $::CONN;	524	return unless $::CONN;
518		525
519	$::FLOORBOX->clear;	526	$::FLOORBOX->clear;
520		527
521	my $row;	528	my $row;
522	for (@{ $::CONN->{container}{0} }) {	529	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
523	if ($row < 6) {	530	if ($row < 6) {
524	local $_->{face_widget}; # hack to force recreation of widget	531	local $_->{face_widget}; # hack to force recreation of widget
525	local $_->{desc_widget}; # hack to force recreation of widget	532	local $_->{desc_widget}; # hack to force recreation of widget
526	CFClient::Item::update_widgets $_;	533	CFClient::Item::update_widgets $_;
527		534
…		…
530		537
531	$row++;	538	$row++;
532	} else {	539	} else {
533	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	540	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
534	text => "More...",	541	text => "More...",
535	on_activate => sub { $::INV_WINDOW->toggle_visibility },	542	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
536	);	543	);
537	last;	544	last;
538	}	545	}
539	}	546	}
540	});	547	});
…		…
555	tooltip => "Close the currently open container (if one is open)",	562	tooltip => "Close the currently open container (if one is open)",
556	on_activate => sub {	563	on_activate => sub {
557	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	564	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
558	if $tag != 0;	565	if $tag != 0;
559	#if $CONN->{open_container} != 0;	566	#if $CONN->{open_container} != 0;
		567	0
560	},	568	},
561	);	569	);
562	}	570	}
563		571
564	$::INVR->set_items ($conn->{container}{$tag});	572	$::INVR->set_items ($conn->{container}{$tag});
565	}	573	}
566		574
567	sub update_container {	575	sub update_containers {
568	my ($tag) = @_;	576	my ($self) = @_;
569		577
570	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	578	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		579	for my $tag (keys %{ delete $self->{update_container} }) {
		580	if ($tag == 0) {
		581	update_floorbox;
		582	$::INVR->set_items ($self->{container}{0})
571	if $tag == $::CONN->{open_container};	583	if $tag == $self->{open_container};
		584	} elsif ($tag == $self->{player}{tag}) {
		585	$::INV->set_items ($self->{container}{$tag})
		586	} else {
		587	$::INVR->set_items ($self->{container}{$tag})
		588	if $tag == $self->{open_container};
		589	}
		590	}
		591	});
572	}	592	}
573		593
574	sub container_add {	594	sub container_add {
575	my ($self, $tag, $items) = @_;	595	my ($self, $tag, $items) = @_;
576		596
577	#d# print "container_add: container $tag ($self->{player}{tag})\n";	597	$self->{update_container}{$tag}++;
578		598	$self->update_containers;
579	if ($tag == 0) {
580	update_floorbox;
581	update_container (0);
582	} elsif ($tag == $self->{player}{tag}) {
583	$::INV->set_items ($self->{container}{$self->{player}{tag}})
584	} else {
585	update_container ($tag);
586	}
587
588	# $self-<{player}{tag} => player inv
589	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
590	}	599	}
591		600
592	sub container_clear {	601	sub container_clear {
593	my ($self, $tag) = @_;	602	my ($self, $tag) = @_;
594		603
595	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	604	$self->{update_container}{$tag}++;
596		605	$self->update_containers;
597	if ($tag == 0) {
598	update_floorbox;
599	update_container (0);
600	} elsif ($tag == $self->{player}{tag}) {
601	$::INV->set_items ($self->{container}{$tag})
602	} else {
603	update_container ($tag);
604	}
605
606	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
607	}	606	}
608		607
609	sub item_delete {	608	sub item_delete {
610	my ($self, @items) = @_;	609	my ($self, @items) = @_;
611		610
		611	$self->{update_container}{$_->{container}}++
612	for (@items) {	612	for @items;
613	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
614
615	if ($_->{container} == 0) {
616	update_floorbox;
617	update_container ($_->{tag});
618	} elsif ($_->{container} == $self->{player}{tag}) {
619	$::INV->set_items ($self->{container}{$self->{player}{tag}})
620	} else {
621	update_container ($_->{container});
622	}
623	}	613
		614	$self->update_containers;
624	}	615	}
625		616
626	sub item_update {	617	sub item_update {
627	my ($self, $item) = @_;	618	my ($self, $item) = @_;
628		619
629	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	620	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
630		621
631	if ($item->{tag} == $self->{player}{tag}) {
632	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
633	return;
634	}
635
636	CFClient::Item::update_widgets $item;	622	CFClient::Item::update_widgets $item;
637		623
638	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	624	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
639	set_opencont ($::CONN, 0, "Floor");	625	set_opencont ($::CONN, 0, "Floor");
640		626
641	} elsif ($item->{flags} & F_OPEN) {	627	} elsif ($item->{flags} & F_OPEN) {
642	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	628	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		629
643	} else {	630	} else {
		631	$self->{update_container}{$item->{container}}++;
		632	$self->update_containers;
644	if ($item->{container} == 0) {	633	# if ($item->{container} == 0) {
645	update_floorbox;	634	# update_floorbox;
646	update_container (0);	635	# update_container (0);
647	} elsif ($item->{container} == $self->{player}{tag}) {	636	# } elsif ($item->{container} == $self->{player}{tag}) {
648	$::INV->set_items ($self->{container}{$item->{container}})	637	# $::INV->set_items ($self->{container}{$item->{container}})
649	}	638	# }
650	}	639	}
651	}	640	}
652		641
653	sub player_update {	642	sub player_update {
654	my ($self, $player) = @_;	643	my ($self, $player) = @_;
655
656	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	644	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);
657	}	645	}
658		646
659	sub update_server_info {	647	sub update_server_info {
660	my ($self) = @_;	648	my ($self) = @_;
…		…
756		744
757	return unless $text =~ /\S/;	745	return unless $text =~ /\S/;
758		746
759	$entry->set_text ("");	747	$entry->set_text ("");
760	$this->send ($text);	748	$this->send ($text);
		749
		750	0
761	},	751	},
762	);	752	);
763		753
764	$vbox->add ($self->{options} = new CFClient::UI::VBox);	754	$vbox->add ($self->{options} = new CFClient::UI::VBox);
765		755
766	$self->{close_button} = new CFClient::UI::Button	756	$self->{bye_button} = new CFClient::UI::Button
767	text => "Bye (close)",	757	text => "Bye (close)",
768	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	758	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
769	on_activate => sub { $this->destroy },	759	on_activate => sub { $this->destroy; 0 },
770	;	760	;
771		761
772	$self->update_options;	762	$self->update_options;
773		763
774	$self->{token} = $self->{conn}->ext_token;	764	$self->{token} = $self->{conn}->ext_token;
775	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	765	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
776	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	766	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
777		767
778	$self->{entry}->focus_in;	768	$self->{entry}->grab_focus;
779		769
780	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	770	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");
781		771
782	$self->show;	772	$self->show;
783	$self	773	$self
…		…
787	my ($self) = @_;	777	my ($self) = @_;
788		778
789	Scalar::Util::weaken $self;	779	Scalar::Util::weaken $self;
790		780
791	$self->{options}->clear;	781	$self->{options}->clear;
792	$self->{options}->add ($self->{close_button});	782	$self->{options}->add ($self->{bye_button});
793		783
794	for my $kw (sort keys %{ $self->{kw} }) {	784	for my $kw (sort keys %{ $self->{kw} }) {
795	$self->{options}->add (new CFClient::UI::Button	785	$self->{options}->add (new CFClient::UI::Button
796	text => $kw,	786	text => $kw,
797	on_activate => sub {	787	on_activate => sub {
798	$self->send ($kw);	788	$self->send ($kw);
		789	0
799	},	790	},
800	);	791	);
801	}	792	}
802	}	793	}
803		794
804	sub feed {	795	sub feed {
805	my ($self, $data) = @_;	796	my ($self, $data) = @_;
		797
		798	Scalar::Util::weaken $self;
806		799
807	my ($type, $msg) = split / /, $data, 2;	800	my ($type, $msg) = split / /, $data, 2;
808		801
809	if ($type eq "msg") {	802	if ($type eq "msg") {
810	my ($msg, @kw) = split /\x00/, $msg;	803	my ($msg, @kw) = split /\x00/, $msg;
811	$self->{kw}{$_} = 1 for @kw;	804	$self->{kw}{$_} = 1 for @kw;
812		805
813	$msg = CFClient::UI::Label::escape $msg;	806	$msg = "\n" . CFClient::UI::Label::escape $msg;
814	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	807	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
815	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.	808	my @link;
		809	$msg =~ s{
		810	($match)
		811	}{
		812	my $kw = $1;
		813
		814	push @link, new CFClient::UI::Label
		815	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		816	can_hover => 1,
		817	can_events => 1,
		818	padding_x => 0,
		819	padding_y => 0,
		820	on_button_up => sub {
		821	$self->send ($kw);
		822	};
		823
		824	chr 0xfffc
		825	}giex;
816		826
817	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");	827	$self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]);
		828	$self->{textview}->scroll_to_bottom;
818	$self->update_options;	829	$self->update_options;
819	} else {	830	} else {
820	$self->destroy;	831	$self->destroy;
821	}	832	}
822		833
…		…
826	sub send {	837	sub send {
827	my ($self, $msg) = @_;	838	my ($self, $msg) = @_;
828		839
829	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	840	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
830	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);	841	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
		842	$self->{textview}->scroll_to_bottom;
831	}	843	}
832		844
833	sub destroy {	845	sub destroy {
834	my ($self) = @_;	846	my ($self) = @_;
835		847
836	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1	848	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
837		849
838	delete $self->{conn}{npc_dialog};	850	delete $self->{conn}{npc_dialog};
839	$self->{conn}->disconnect_ext ($self->{token});	851	$self->{conn}->disconnect_ext ($self->{token});
840		852
841	$self->SUPER::destroy;	853	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.34 by elmex, Tue Jun 13 14:35:17 2006 UTC vs. Revision 1.51 by root, Sun Jul 2 21:07:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.34 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.51 by root, Sun Jul 2 21:07:26 2006 UTC