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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.54 by root, Mon Jul 3 22:58:37 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 (@_);
…		…
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
62	}	64	}
63		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
64	sub stats_update {	157	sub stats_update {
65	my ($self, $stats) = @_;	158	my ($self, $stats) = @_;
66		159
67	if (my $exp = $stats->{+CS_STAT_EXP64}) {	160	if (my $prev = $self->{prev_stats}) {
68	my $diff = $exp - $self->{prev_exp};	161	if (my $diff = $stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) {
69	$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);
70	if exists $self->{prev_exp} && $diff;	163	}
71	$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	}
72	}	171	}
		172
		173	$self->{prev_stats} = { %$stats };
73		174
74	::update_stats_window ($stats);	175	::update_stats_window ($stats);
75	}	176	}
76		177
77	sub user_send {	178	sub user_send {
…		…
79		180
80	if ($self->{record}) {	181	if ($self->{record}) {
81	push @{$self->{record}}, $command;	182	push @{$self->{record}}, $command;
82	}	183	}
83		184
		185	$self->logprint ("send: ", $command);
84	$self->send_command ($command);	186	$self->send_command ($command);
85	::status $command;	187	::status ($command);
86	}	188	}
87		189
88	sub start_record {	190	sub start_record {
89	my ($self) = @_;	191	my ($self) = @_;
90		192
…		…
105	sub feed_map1a {	207	sub feed_map1a {
106	my ($self, $data) = @_;	208	my ($self, $data) = @_;
107		209
108	$self->{map}->map1a_update ($data);	210	$self->{map}->map1a_update ($data);
109	$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);
110	}	218	}
111		219
112	sub flush_map {	220	sub flush_map {
113	my ($self) = @_;	221	my ($self) = @_;
114		222
…		…
127		235
128	$self->flush_map;	236	$self->flush_map;
129	delete $self->{neigh_map};	237	delete $self->{neigh_map};
130		238
131	$self->{map}->clear;	239	$self->{map}->clear;
		240	delete $self->{map_widget}{magicmap};
132	}	241	}
133		242
134		243
135	sub load_map($$$) {	244	sub load_map($$$) {
136	my ($self, $hash, $x, $y) = @_;	245	my ($self, $hash, $x, $y) = @_;
…		…
279	# I love transactions	388	# I love transactions
280	for (1..100) {	389	for (1..100) {
281	my $txn = $CFClient::DB_ENV->txn_begin;	390	my $txn = $CFClient::DB_ENV->txn_begin;
282	my $status = $self->{facemap}->db_get (id => $id);	391	my $status = $self->{facemap}->db_get (id => $id);
283	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	392	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
284	$id = ($id \|\| 16) + 1;	393	$id = ($id \|\| 64) + 1;
285	if ($self->{facemap}->put (id => $id) == 0	394	if ($self->{facemap}->put (id => $id) == 0
286	&& $self->{facemap}->put ($hash => $id) == 0) {	395	&& $self->{facemap}->put ($hash => $id) == 0) {
287	$txn->txn_commit;	396	$txn->txn_commit;
288		397
289	goto gotid;	398	goto gotid;
…		…
369	[0.55, 0.41, 0.13],	478	[0.55, 0.41, 0.13],
370	[0.99, 0.77, 0.26],	479	[0.99, 0.77, 0.26],
371	[0.74, 0.65, 0.41],	480	[0.74, 0.65, 0.41],
372	);	481	);
373		482
		483	$self->logprint ("info: ", $text);
		484
374	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	485	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
375		486
376	# try to create single paragraphs of multiple lines sent by the server	487	# try to create single paragraphs of multiple lines sent by the server
377	$text =~ s/(?<=\S)\n(?=\w)/ /g;	488	$text =~ s/(?<=\S)\n(?=\w)/ /g;
378		489
379	$text = CFClient::UI::Label::escape $text;	490	$text = CFClient::UI::Label::escape $text;
380	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	491	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
381	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	492	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
382		493
383	$self->{logview}->add_paragraph ($color[$color],	494	$self->{logview}->add_paragraph ($color[$color], $_)
384	join "\n", map "$time $_", split /\n/, $text);	495	for map "$time $_", split /\n/, $text;
		496	$self->{logview}->scroll_to_bottom;
385		497
386	$self->{statusbox}->add ($text,	498	$self->{statusbox}->add ($text,
387	group => $text,	499	group => $text,
388	fg => $color[$color],	500	fg => $color[$color],
389	timeout => $color >= 2 ? 60 : 10,	501	timeout => $color >= 2 ? 60 : 10,
…		…
403	# try to create single paragraphs of multiple lines sent by the server	515	# try to create single paragraphs of multiple lines sent by the server
404	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	516	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
405	$spell->{message} =~ s/\n+$//;	517	$spell->{message} =~ s/\n+$//;
406	$spell->{message} \|\|= "Server did not provide a description for this spell.";	518	$spell->{message} \|\|= "Server did not provide a description for this spell.";
407		519
408	$::SETUP_SPELLS->add_spell ($spell);	520	$::SPELL_PAGE->add_spell ($spell);
409		521
410	$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});
411	$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});
412	}	524	}
413		525
414	sub spell_delete {	526	sub spell_delete {
415	my ($self, $spell) = @_;	527	my ($self, $spell) = @_;
		528
416	$::SETUP_SPELLS->remove_spell ($spell);	529	$::SPELL_PAGE->remove_spell ($spell);
417	}	530	}
418		531
419	sub addme_success {	532	sub addme_success {
420	my ($self) = @_;	533	my ($self) = @_;
421		534
…		…
488	return unless $::CONN;	601	return unless $::CONN;
489		602
490	$::FLOORBOX->clear;	603	$::FLOORBOX->clear;
491		604
492	my $row;	605	my $row;
493	for (@{ $::CONN->{container}{0} }) {	606	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{0} }) {
494	if ($row < 6) {	607	if ($row < 6) {
495	local $_->{face_widget}; # hack to force recreation of widget	608	local $_->{face_widget}; # hack to force recreation of widget
496	local $_->{desc_widget}; # hack to force recreation of widget	609	local $_->{desc_widget}; # hack to force recreation of widget
497	CFClient::Item::update_widgets $_;	610	CFClient::Item::update_widgets $_;
498		611
…		…
501		614
502	$row++;	615	$row++;
503	} else {	616	} else {
504	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	617	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
505	text => "More...",	618	text => "More...",
506	on_activate => sub { $::INV_WINDOW->toggle_visibility },	619	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
507	);	620	);
508	last;	621	last;
509	}	622	}
510	}	623	}
511	});	624	});
…		…
526	tooltip => "Close the currently open container (if one is open)",	639	tooltip => "Close the currently open container (if one is open)",
527	on_activate => sub {	640	on_activate => sub {
528	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	641	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
529	if $tag != 0;	642	if $tag != 0;
530	#if $CONN->{open_container} != 0;	643	#if $CONN->{open_container} != 0;
		644	0
531	},	645	},
532	);	646	);
533	}	647	}
534		648
535	$::INVR->set_items ($conn->{container}{$tag});	649	$::INVR->set_items ($conn->{container}{$tag});
536	}	650	}
537		651
538	sub update_container {	652	sub update_containers {
539	my ($tag) = @_;	653	my ($self) = @_;
540		654
541	$::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})
542	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	});
543	}	669	}
544		670
545	sub container_add {	671	sub container_add {
546	my ($self, $tag, $items) = @_;	672	my ($self, $tag, $items) = @_;
547		673
548	#d# print "container_add: container $tag ($self->{player}{tag})\n";	674	$self->{update_container}{$tag}++;
549		675	$self->update_containers;
550	if ($tag == 0) {
551	update_floorbox;
552	update_container (0);
553	} elsif ($tag == $self->{player}{tag}) {
554	$::INV->set_items ($self->{container}{$self->{player}{tag}})
555	} else {
556	update_container ($tag);
557	}
558
559	# $self-<{player}{tag} => player inv
560	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
561	}	676	}
562		677
563	sub container_clear {	678	sub container_clear {
564	my ($self, $tag) = @_;	679	my ($self, $tag) = @_;
565		680
566	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	681	$self->{update_container}{$tag}++;
567		682	$self->update_containers;
568	if ($tag == 0) {
569	update_floorbox;
570	update_container (0);
571	} elsif ($tag == $self->{player}{tag}) {
572	$::INV->set_items ($self->{container}{$tag})
573	} else {
574	update_container ($tag);
575	}
576
577	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
578	}	683	}
579		684
580	sub item_delete {	685	sub item_delete {
581	my ($self, @items) = @_;	686	my ($self, @items) = @_;
582		687
		688	$self->{update_container}{$_->{container}}++
583	for (@items) {	689	for @items;
584	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
585
586	if ($_->{container} == 0) {
587	update_floorbox;
588	update_container ($_->{tag});
589	} elsif ($_->{container} == $self->{player}{tag}) {
590	$::INV->set_items ($self->{container}{$self->{player}{tag}})
591	} else {
592	update_container ($_->{container});
593	}
594	}	690
		691	$self->update_containers;
595	}	692	}
596		693
597	sub item_update {	694	sub item_update {
598	my ($self, $item) = @_;	695	my ($self, $item) = @_;
599		696
600	#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";
601		698
602	if ($item->{tag} == $self->{player}{tag}) {
603	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
604	return;
605	}
606
607	CFClient::Item::update_widgets $item;	699	CFClient::Item::update_widgets $item;
608		700
609	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	701	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
610	set_opencont ($::CONN, 0, "Floor");	702	set_opencont ($::CONN, 0, "Floor");
611		703
612	} elsif ($item->{flags} & F_OPEN) {	704	} elsif ($item->{flags} & F_OPEN) {
613	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	705	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		706
614	} else {	707	} else {
		708	$self->{update_container}{$item->{container}}++;
		709	$self->update_containers;
615	if ($item->{container} == 0) {	710	# if ($item->{container} == 0) {
616	update_floorbox;	711	# update_floorbox;
617	update_container (0);	712	# update_container (0);
618	} elsif ($item->{container} == $self->{player}{tag}) {	713	# } elsif ($item->{container} == $self->{player}{tag}) {
619	$::INV->set_items ($self->{container}{$item->{container}})	714	# $::INV->set_items ($self->{container}{$item->{container}})
620	}	715	# }
621	}	716	}
622	}	717	}
623		718
624	sub player_update {	719	sub player_update {
625	my ($self, $player) = @_;	720	my ($self, $player) = @_;
626
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
630	sub logged_in {	724	sub update_server_info {
631	my ($self) = @_;	725	my ($self) = @_;
632
633	$self->send_ext_req (cfplus => "version", "1", sub {
634	$self->{cfplus_ext} = $_[0];
635	});
636
637	$self->send_command ("output-sync $::CFG->{output_sync}");
638	$self->send_command ("output-count $::CFG->{output_count}");
639	$self->send_command ("pickup $::CFG->{pickup}");
640		726
641	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");	727	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
642		728
643	$::SERVER_INFO->set_markup (	729	$::SERVER_INFO->set_markup (
644	"server <tt>$self->{host}:$self->{port}</tt>\n"	730	"server <tt>$self->{host}:$self->{port}</tt>\n"
645	. "protocol version <tt>$self->{version}</tt>\n"	731	. "protocol version <tt>$self->{version}</tt>\n"
646	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	732	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
647	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	733	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
648	. "cfplus support $yesno[$self->{cfplus_ext} > 0]\n"	734	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		735	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
649	. "map size $self->{mapw}×$self->{maph}\n"	736	. "map size $self->{mapw}×$self->{maph}\n"
650	);	737	);
651	}	738	}
652		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
653	1;	933	1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs. Revision 1.54 by root, Mon Jul 3 22:58:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.54 by root, Mon Jul 3 22:58:37 2006 UTC