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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.13 by root, Wed May 31 07:40:33 2006 UTC vs.
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC

…		…
1	package CFClient::Protocol;	1	package CFPlus::Protocol;
2		2
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 CFPlus;
8	use CFClient::UI;	9	use CFPlus::UI;
		10	use CFPlus::Pod;
9		11
10	use base 'Crossfire::Protocol::Base';	12	use base 'Crossfire::Protocol::Base';
11		13
12	sub new {	14	sub new {
13	my $class = shift;	15	my $class = shift;
14		16
15	my $self = $class->SUPER::new (@_);	17	my $self = $class->SUPER::new (@_);
16		18
17	$self->{map_widget}->clr_commands;	19	$self->{map_widget}->clr_commands;
18		20
19	my $parser = new Pod::POM;	21	my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub {
20	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");	22	my ($pom) = @_;
21		23
		24	my @cmd_help;
		25
22	for my $head2 ($pod->head1->[-2]->head2) {	26	for my $head2 ($pom->head1->[-2]->head2) {
23	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	27	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
24	or next;	28	or next;
25		29
26	my $cmd = $1;	30	my $cmd = $1;
27	my @args = split /\\|/, $2;	31	my @args = split /\\|/, $2;
28	@args = (".*") unless @args;	32	@args = (".*") unless @args;
29		33
30	$_ = $_ eq ".*" ? "" : " $_"	34	$_ = $_ eq ".*" ? "" : " $_"
31	for @args;	35	for @args;
32		36
33	my $text = CFClient::pod_to_pango $head2->content;	37	my $text = CFPlus::Pod::as_markup $head2->content;
34		38
35	$self->{map_widget}->add_command ("$cmd$_", $text)	39	push @cmd_help, ["$cmd$_", $text]
36	for sort { (length $a) <=> (length $b) }	40	for sort { (length $a) <=> (length $b) }
37	@args;	41	@args;
		42	}
		43
		44	\@cmd_help
38	}	45	};
39		46
		47	$self->{map_widget}->add_command (@$_)
		48	for @$cmd_help;
		49
40	$self->{noface} = new_from_file CFClient::Texture	50	$self->{noface} = new_from_file CFPlus::Texture
41	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;	51	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
42		52
43	$self->{open_container} = 0;	53	$self->{open_container} = 0;
44		54
45	# "global"	55	# "global"
46	$self->{tilecache} = CFClient::db_table "tilecache";	56	$self->{tilecache} = CFPlus::db_table "tilecache";
47	$self->{facemap} = CFClient::db_table "facemap";	57	$self->{facemap} = CFPlus::db_table "facemap";
48		58
49	# per server	59	# per server
50	$self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}";	60	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}";
51		61
52	$self	62	$self
53	}	63	}
		64
		65	sub logprint {
		66	my ($self, @a) = @_;
		67
		68	$self->{log_fh} \|\|= do {
		69	my $path = "$Crossfire::VARDIR/log.$self->{host}";
		70
		71	open my $fh, ">>:utf8", $path
		72	or die "Couldn't open logfile $path: $!";
		73
		74	$fh->autoflush (1);
		75
		76	$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 {$self->{log_fh}} "$ts ", @a, "\n";
		85	}
		86
		87	sub _stat_numdiff {
		88	my ($self, $name, $old, $new) = @_;
		89
		90	my $diff = $new - $old;
		91
		92	$diff = 0.01 * int $diff * 100;
		93
		94	0.1 >= abs $diff ? ()
		95	: $diff < 0 ? "$name$diff" : "$name+$diff"
		96	}
		97
		98	sub _stat_skillmaskdiff {
		99	my ($self, $name, $old, $new) = @_;
		100
		101	my $diff = $old ^ $new
		102	or return;
		103
		104	my @diff = map
		105	{
		106	$diff & $_
		107	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		108	: ()
		109	}
		110	sort { $a <=> $b } keys %{$self->{spell_paths}};
		111
		112	join "", @diff
		113	}
		114
		115	# all stats that are chacked against changes
		116	my @statchange = (
		117	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		118	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		119	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		120	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		121	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		122	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		123	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		124	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		125	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		126	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		127	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		128	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		129	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		130	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		131	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		132	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		133	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		134	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		135	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		136	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		137	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		138	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		139	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		140	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		141	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		142	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		143	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		144	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		145	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		146	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		147	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		148	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		149	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		150	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		151	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		152	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		153	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		154	);
54		155
55	sub stats_update {	156	sub stats_update {
56	my ($self, $stats) = @_;	157	my ($self, $stats) = @_;
57		158
58	if (my $exp = $stats->{+CS_STAT_EXP64}) {	159	my $prev = $self->{prev_stats} \|\| { };
59	my $diff = $exp - $self->{prev_exp};	160
		161	if (my @diffs =
		162	(
		163	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		164	map {
		165	$stats->{$_} && $prev->{$_}
		166	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		167	} sort { $a <=> $b } keys %{$self->{skill_info}}
		168	)
		169	) {
		170	my $msg = join " ", @diffs;
60	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	171	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
61	if exists $self->{prev_exp} && $diff;
62	$self->{prev_exp} = $exp;
63	}	172	}
64		173
		174	if (
		175	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		176	) {
		177	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		178	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		179	}
		180
65	::update_stats_window ($stats);	181	$self->update_stats_window ($stats, $prev);
		182
		183	$self->{prev_stats} = { %$stats };
		184	}
		185
		186	my %RES_TBL = (
		187	phys => CS_STAT_RES_PHYS,
		188	magic => CS_STAT_RES_MAG,
		189	fire => CS_STAT_RES_FIRE,
		190	elec => CS_STAT_RES_ELEC,
		191	cold => CS_STAT_RES_COLD,
		192	conf => CS_STAT_RES_CONF,
		193	acid => CS_STAT_RES_ACID,
		194	drain => CS_STAT_RES_DRAIN,
		195	ghit => CS_STAT_RES_GHOSTHIT,
		196	pois => CS_STAT_RES_POISON,
		197	slow => CS_STAT_RES_SLOW,
		198	para => CS_STAT_RES_PARA,
		199	tund => CS_STAT_TURN_UNDEAD,
		200	fear => CS_STAT_RES_FEAR,
		201	depl => CS_STAT_RES_DEPLETE,
		202	deat => CS_STAT_RES_DEATH,
		203	holyw => CS_STAT_RES_HOLYWORD,
		204	blind => CS_STAT_RES_BLIND,
		205	);
		206
		207	sub update_stats_window {
		208	my ($self, $stats, $prev) = @_;
		209
		210	# I love text protocols...
		211
		212	my $hp = $stats->{+CS_STAT_HP} * 1;
		213	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		214	my $sp = $stats->{+CS_STAT_SP} * 1;
		215	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		216	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		217	my $fo_m = 999;
		218	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		219	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		220
		221	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		222	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		223	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		224	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		225	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		226	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		227	my $rng = $stats->{+CS_STAT_RANGE};
		228	$rng =~ s/^Range: //; # thank you so much dear server
		229	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		230	my $title = $stats->{+CS_STAT_TITLE};
		231	$title =~ s/^Player: //;
		232	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		233
		234	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		235	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		236	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		237	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		238	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		239	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		240	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		241	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		242	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		243	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		244	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		245	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		246	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		247
		248	$self->update_weight;
		249
		250	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		251	for keys %RES_TBL;
		252
		253	my $sktbl = $::STATWIDS->{skill_tbl};
		254	my @skills = keys %{ $self->{skill_info} };
		255
		256	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		257	$sktbl->clear;
		258
		259	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		260	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		261	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		262	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
		263	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
		264	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
		265
		266	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
		267
		268	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		269	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		270	my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
		271
		272	my ($x, $y) = (0, 1);
		273	for (
		274	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		275	map [$_, $self->{skill_info}{$_}],
		276	grep exists $stats->{$_},
		277	@skills
		278	) {
		279	my ($idx, $name) = @$_;
		280
		281	my $spell_cb = sub {
		282	my ($widget, $ev) = @_;
		283
		284	if ($ev->{button} == 1) {
		285	$::CONN->user_send ("ready_skill $name");
		286	} elsif ($ev->{button} == 2) {
		287	$::CONN->user_send ("use_skill $name");
		288	} elsif ($ev->{button} == 3) {
		289	(new CFPlus::UI::Menu
		290	items => [
		291	["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }],
		292	["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }],
		293	],
		294	)->popup ($ev);
		295	} else {
		296	return 0;
		297	}
		298
		299	1
		300	};
		301
		302	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
		303	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
		304	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
		305	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
		306	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME);
		307
		308	$x++ and ($x, $y) = (0, $y + 1);
		309	}
		310	}
		311
		312	for (grep exists $stats->{$_}, @skills) {
		313	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		314	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		315	}
66	}	316	}
67		317
68	sub user_send {	318	sub user_send {
69	my ($self, $command) = @_;	319	my ($self, $command) = @_;
70		320
71	if ($self->{record}) {	321	if ($self->{record}) {
72	push @{$self->{record}}, $command;	322	push @{$self->{record}}, $command;
73	}	323	}
74		324
		325	$self->logprint ("send: ", $command);
75	$self->send_command ($command);	326	$self->send_command ($command);
76	::status $command;	327	::status ($command);
77	}	328	}
78		329
79	sub start_record {	330	sub start_record {
80	my ($self) = @_;	331	my ($self) = @_;
81		332
96	sub feed_map1a {	347	sub feed_map1a {
97	my ($self, $data) = @_;	348	my ($self, $data) = @_;
98		349
99	$self->{map}->map1a_update ($data);	350	$self->{map}->map1a_update ($data);
100	$self->{map_widget}->update;	351	$self->{map_widget}->update;
		352	}
		353
		354	sub magicmap {
		355	my ($self, $w, $h, $x, $y, $data) = @_;
		356
		357	$self->{map_widget}->set_magicmap ($w, $h, $x, $y, $data);
101	}	358	}
102		359
103	sub flush_map {	360	sub flush_map {
104	my ($self) = @_;	361	my ($self) = @_;
105		362
…		…
118		375
119	$self->flush_map;	376	$self->flush_map;
120	delete $self->{neigh_map};	377	delete $self->{neigh_map};
121		378
122	$self->{map}->clear;	379	$self->{map}->clear;
		380	delete $self->{map_widget}{magicmap};
123	}	381	}
124		382
125		383
126	sub load_map($$$) {	384	sub load_map($$$) {
127	my ($self, $hash, $x, $y) = @_;	385	my ($self, $hash, $x, $y) = @_;
…		…
267		525
268	unless ($id) {	526	unless ($id) {
269	# create new id for face	527	# create new id for face
270	# I love transactions	528	# I love transactions
271	for (1..100) {	529	for (1..100) {
272	my $txn = $CFClient::DB_ENV->txn_begin;	530	my $txn = $CFPlus::DB_ENV->txn_begin;
273	my $status = $self->{facemap}->db_get (id => $id, BerkeleyDB::DB_RMW);	531	my $status = $self->{facemap}->db_get (id => $id);
274	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	532	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
275	$id = ($id \|\| 16) + 1;	533	$id = ($id \|\| 64) + 1;
276	if ($self->{facemap}->put (id => $id) == 0	534	if ($self->{facemap}->put (id => $id) == 0
277	&& $self->{facemap}->put ($hash => $id) == 0) {	535	&& $self->{facemap}->put ($hash => $id) == 0) {
278	$txn->txn_commit;	536	$txn->txn_commit;
279		537
280	goto gotid;	538	goto gotid;
281	}	539	}
282	}	540	}
283	$txn->abort;	541	$txn->txn_abort;
284	}	542	}
285		543
286	CFClient::fatal "maximum number of transaction retries reached - database problems?";	544	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
287	}	545	}
288		546
289	gotid:	547	gotid:
290	$face->{id} = $id;	548	$face->{id} = $id;
291	$self->{map}->set_face ($facenum => $id);	549	$self->{map}->set_face ($facenum => $id);
…		…
302	undef	560	undef
303	};	561	};
304	}	562	}
305		563
306	sub face_update {	564	sub face_update {
307	my ($self, $facenum, $face) = @_;	565	my ($self, $facenum, $face, $changed) = @_;
308		566
309	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	567	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
310		568
311	$self->set_texture ($face->{id} => delete $face->{image});	569	$self->set_texture ($face->{id} => delete $face->{image});
312	}	570	}
313		571
314	sub set_texture {	572	sub set_texture {
315	my ($self, $id, $data) = @_;	573	my ($self, $id, $data) = @_;
316		574
317	$self->{texture}[$id] \|\|= do {	575	$self->{texture}[$id] \|\|= do {
318	my $tex =	576	my $tex =
319	new_from_image CFClient::Texture	577	new_from_image CFPlus::Texture
320	$data, minify => 1, mipmap => 1;	578	$data, minify => 1, mipmap => 1;
321		579
322	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	580	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
323	$self->{map_widget}->update;	581	$self->{map_widget}->update;
324		582
…		…
338	my ($self, $flags, $prompt) = @_;	596	my ($self, $flags, $prompt) = @_;
339		597
340	$prompt = $LAST_QUERY unless length $prompt;	598	$prompt = $LAST_QUERY unless length $prompt;
341	$LAST_QUERY = $prompt;	599	$LAST_QUERY = $prompt;
342		600
343	my $dialog = new CFClient::UI::FancyFrame	601	$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	}	602	}
402		603
403	sub drawinfo {	604	sub drawinfo {
404	my ($self, $color, $text) = @_;	605	my ($self, $color, $text) = @_;
405		606
…		…
412	[0.11, 0.56, 1.00],	613	[0.11, 0.56, 1.00],
413	[0.93, 0.46, 0.00],	614	[0.93, 0.46, 0.00],
414	[0.18, 0.54, 0.34],	615	[0.18, 0.54, 0.34],
415	[0.56, 0.73, 0.56],	616	[0.56, 0.73, 0.56],
416	[0.80, 0.80, 0.80],	617	[0.80, 0.80, 0.80],
417	[0.55, 0.41, 0.13],	618	[0.75, 0.61, 0.20],
418	[0.99, 0.77, 0.26],	619	[0.99, 0.77, 0.26],
419	[0.74, 0.65, 0.41],	620	[0.74, 0.65, 0.41],
420	);	621	);
421		622
		623	$self->logprint ("info: ", $text);
		624
422	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	625	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
423		626
424	$text = CFClient::UI::Label::escape $text;	627	# try to create single paragraphs of multiple lines sent by the server
		628	$text =~ s/(?<=\S)\n(?=\w)/ /g;
		629
		630	$text = CFPlus::asxml $text;
425	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	631	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
426	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	632	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
427		633
428	$self->{logview}->add_paragraph ($color[$color],	634	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
429	join "\n", map "$time $_", split /\n/, $text);	635	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
		636	$self->{logview}->scroll_to_bottom;
430		637
431	$self->{statusbox}->add ($text,	638	$self->{statusbox}->add ($text,
432	group => $text,	639	group => $text,
433	fg => $color[$color],	640	fg => $color[$color],
434	timeout => 10,	641	timeout => $color >= 2 ? 60 : 10,
435	tooltip_font => $::FONT_FIXED,	642	tooltip_font => $::FONT_FIXED,
436	);	643	);
437	}	644	}
438		645
439	sub drawextinfo {	646	sub drawextinfo {
…		…
443	}	650	}
444		651
445	sub spell_add {	652	sub spell_add {
446	my ($self, $spell) = @_;	653	my ($self, $spell) = @_;
447		654
448	# TODO	655	# try to create single paragraphs out of the multiple lines sent by the server
449	# create a widget dynamically, using spell face (CF::Protocol downloads them)	656	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
		657	$spell->{message} =~ s/\n+$//;
		658	$spell->{message} \|\|= "Server did not provide a description for this spell.";
		659
		660	$::SPELL_PAGE->add_spell ($spell);
		661
450	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	662	$self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
451	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	663	$self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
452	}	664	}
453		665
454	sub spell_delete {	666	sub spell_delete {
455	my ($self, $spell) = @_;	667	my ($self, $spell) = @_;
		668
		669	$::SPELL_PAGE->remove_spell ($spell);
456	}	670	}
457		671
458	sub addme_success {	672	sub addme_success {
459	my ($self) = @_;	673	my ($self) = @_;
460		674
461	my $parser = new Pod::POM;	675	my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
462	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");	676	my ($pom) = @_;
463		677
464	my %skill_tooltip;	678	my %skill_help;
465		679
466	for my $head2 ($pod->head1->[-2]->head2) {	680	for my $head2 ($pom->head1->[3]->head2) {
467	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;	681	$skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content;
		682	}
		683
		684	\%skill_help
468	}	685	};
469		686
470	for my $skill (values %{$self->{skill_info}}) {	687	for my $skill (values %{$self->{skill_info}}) {
471	$self->{map_widget}->add_command ("ready_skill $skill",	688	$self->{map_widget}->add_command ("ready_skill $skill",
472	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	689	(CFPlus::asxml "Ready the skill '$skill'\n\n")
473	. $skill_tooltip{$skill});	690	. $skill_help->{$skill});
474	$self->{map_widget}->add_command ("use_skill $skill",	691	$self->{map_widget}->add_command ("use_skill $skill",
475	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	692	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
476	. $skill_tooltip{$skill});	693	. $skill_help->{$skill});
477	}	694	}
478	}	695	}
479		696
480	sub eof {	697	sub eof {
481	my ($self) = @_;	698	my ($self) = @_;
…		…
505		722
506	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	723	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
507		724
508	$self->send ("requestinfo image_sums $face $face");	725	$self->send ("requestinfo image_sums $face $face");
509		726
510	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	727	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
511	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	728	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
512	} elsif (!exists $self->{num_faces}) {	729	} elsif (!exists $self->{num_faces}) {
513	$self->send ("requestinfo image_info");	730	$self->send ("requestinfo image_info");
514		731
515	$self->{num_faces} = 0;	732	$self->{num_faces} = 0;
516		733
517	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	734	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
518	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);	735	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
519	}	736	}
520	}	737	}
521		738
522	sub update_floorbox {	739	sub update_floorbox {
523	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	740	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
524	return unless $::CONN;	741	return unless $::CONN;
525		742
526	$::FLOORBOX->clear;	743	$::FLOORBOX->clear;
527		744
528	my $row;	745	my $row;
529	for (@{ $::CONN->{container}{0} }) {	746	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
530	if ($row < 7) {	747	if ($row < 6) {
531	local $_->{face_widget}; # hack to force recreation of widget	748	local $_->{face_widget}; # hack to force recreation of widget
532	local $_->{desc_widget}; # hack to force recreation of widget	749	local $_->{desc_widget}; # hack to force recreation of widget
533	CFClient::Item::update_widgets $_;	750	CFPlus::Item::update_widgets $_;
534		751
535	$::FLOORBOX->add (0, $row, $_->{face_widget});	752	$::FLOORBOX->add (0, $row, $_->{face_widget});
536	$::FLOORBOX->add (1, $row, $_->{desc_widget});	753	$::FLOORBOX->add (1, $row, $_->{desc_widget});
537		754
538	$row++;	755	$row++;
539	} else {	756	} else {
540	$::FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");	757	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
		758	text => "More...",
		759	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
		760	);
541	last;	761	last;
542	}	762	}
543	}	763	}
		764	if ($::CONN->{open_container}) {
		765	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
		766	text => "Close container",
		767	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		768	);
		769	}
544	});	770	});
545		771
546	$::WANT_REFRESH++;	772	$::WANT_REFRESH++;
547	}	773	}
548		774
549	sub set_opencont {	775	sub set_opencont {
550	my ($conn, $tag, $name) = @_;	776	my ($conn, $tag, $name) = @_;
551	$conn->{open_container} = $tag;	777	$conn->{open_container} = $tag;
		778	update_floorbox;
552		779
553	$::INV_RIGHT_HB->clear ();	780	$::INV_RIGHT_HB->clear ();
554	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	781	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
555		782
556	if ($tag != 0) { # Floor isn't closable, is it?	783	if ($tag != 0) { # Floor isn't closable, is it?
557	$::INV_RIGHT_HB->add (new CFClient::UI::Button	784	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
558	text => "Close container",	785	text => "Close container",
559	tooltip => "Close the currently open container (if one is open)",	786	tooltip => "Close the currently open container (if one is open)",
560	on_activate => sub {	787	on_activate => sub {
561	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	788	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
562	if $tag != 0;	789	if $tag != 0;
563	#if $CONN->{open_container} != 0;	790	#if $CONN->{open_container} != 0;
		791	0
564	},	792	},
565	);	793	);
566	}	794	}
567		795
568	$::INVR->set_items ($conn->{container}{$tag});	796	$::INVR->set_items ($conn->{container}{$tag});
569	}	797	}
570		798
571	sub update_container {	799	sub update_containers {
572	my ($tag) = @_;	800	my ($self) = @_;
573		801
574	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	802	$CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		803	my $todo = delete $self->{update_container}
		804	or return;
		805
		806	for my $tag (keys %$todo) {
		807	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		808	if ($tag == 0) {
		809	$::INVR->set_items ($self->{container}{0})
575	if $tag == $::CONN->{open_container};	810	if $tag == $self->{open_container};
		811	} elsif ($tag == $self->{player}{tag}) {
		812	$::INV->set_items ($self->{container}{$tag})
		813	} else {
		814	$::INVR->set_items ($self->{container}{$tag})
		815	if $tag == $self->{open_container};
		816	}
		817	}
		818	});
576	}	819	}
577		820
578	sub container_add {	821	sub container_add {
579	my ($self, $tag, $items) = @_;	822	my ($self, $tag, $items) = @_;
580		823
581	#d# print "container_add: container $tag ($self->{player}{tag})\n";	824	$self->{update_container}{$tag}++;
582		825	$self->update_containers;
583	if ($tag == 0) {
584	update_floorbox;
585	update_container (0);
586	} elsif ($tag == $self->{player}{tag}) {
587	$::INV->set_items ($self->{container}{$self->{player}{tag}})
588	} else {
589	update_container ($tag);
590	}
591
592	# $self-<{player}{tag} => player inv
593	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
594	}	826	}
595		827
596	sub container_clear {	828	sub container_clear {
597	my ($self, $tag) = @_;	829	my ($self, $tag) = @_;
598		830
599	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	831	$self->{update_container}{$tag}++;
600		832	$self->update_containers;
601	if ($tag == 0) {
602	update_floorbox;
603	update_container (0);
604	} elsif ($tag == $self->{player}{tag}) {
605	$::INV->set_items ($self->{container}{$tag})
606	} else {
607	update_container ($tag);
608	}
609
610	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
611	}	833	}
612		834
613	sub item_delete {	835	sub item_delete {
614	my ($self, @items) = @_;	836	my ($self, @items) = @_;
615		837
		838	$self->{update_container}{$_->{container}}++
616	for (@items) {	839	for @items;
617	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
618
619	if ($_->{container} == 0) {
620	update_floorbox;
621	update_container ($_->{tag});
622	} elsif ($_->{container} == $self->{player}{tag}) {
623	$::INV->set_items ($self->{container}{$self->{player}{tag}})
624	} else {
625	update_container ($_->{container});
626	}
627	}	840
		841	$self->update_containers;
628	}	842	}
629		843
630	sub item_update {	844	sub item_update {
631	my ($self, $item) = @_;	845	my ($self, $item) = @_;
632		846
633	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	847	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
634		848
635	if ($item->{tag} == $self->{player}{tag}) {
636	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
637	return;
638	}
639
640	CFClient::Item::update_widgets $item;	849	CFPlus::Item::update_widgets $item;
641		850
642	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	851	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
643	set_opencont ($::CONN, 0, "Floor");	852	set_opencont ($::CONN, 0, "Floor");
644		853
645	} elsif ($item->{flags} & F_OPEN) {	854	} elsif ($item->{flags} & F_OPEN) {
646	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	855	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		856
647	} else {	857	} else {
648	if ($item->{container} == 0) {	858	$self->{update_container}{$item->{container}}++;
649	update_floorbox;
650	update_container (0);	859	$self->update_containers;
651	} elsif ($item->{container} == $self->{player}{tag}) {
652	$::INV->set_items ($self->{container}{$item->{container}})
653	}
654	}	860	}
655	}	861	}
656		862
657	sub player_update {	863	sub player_update {
658	my ($self, $player) = @_;	864	my ($self, $player) = @_;
		865
		866	$self->update_weight;
		867	}
		868
		869	sub update_weight {
		870	my ($self) = @_;
		871
		872	my $weight = .001 * $self->{player}{weight};
		873	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		874
659	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	875	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		876	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		877	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
		878	}
660		879
661	# do it here because it is ignored earlier, and there is no "login" event	880	sub update_server_info {
		881	my ($self) = @_;
		882
		883	my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
		884
		885	$::SERVER_INFO->set_markup (
		886	"server <tt>$self->{host}:$self->{port}</tt>\n"
		887	. "protocol version <tt>$self->{version}</tt>\n"
		888	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
		889	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		890	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
		891	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
		892	. "map size $self->{mapw}×$self->{maph}\n"
		893	);
		894	}
		895
		896	sub logged_in {
		897	my ($self) = @_;
		898
		899	$self->send_ext_req (cfplus_support => "1", sub {
		900	$self->{cfplus_ext} = $_[0];
		901	$self->update_server_info;
		902	});
		903
		904	$self->update_server_info;
		905
662	$self->send_command ("output-sync $::CFG->{output_sync}");	906	$self->send_command ("output-sync $::CFG->{output_sync}");
663	$self->send_command ("output-count $::CFG->{output_count}");	907	$self->send_command ("output-count $::CFG->{output_count}");
		908	$self->send_command ("pickup $::CFG->{pickup}");
664	}	909	}
665		910
666	1;	911	sub lookat {
		912	my ($self, $x, $y) = @_;
		913
		914	if ($self->{cfplus_ext}) {
		915	$self->send_ext_req (lookat => "$x $y", sub {
		916	my %res = split /\x00/, $_[0];
		917
		918	if (exists $res{npc_dialog}) {
		919	# start npc chat dialog
		920	$self->{npc_dialog} = new CFPlus::NPCDialog::
		921	dx => $x,
		922	dy => $y,
		923	title => "$res{npc_dialog} (NPC)",
		924	conn => $self,
		925	;
		926	}
		927	});
		928	}
		929
		930	$self->send ("lookat $x $y");
		931	}
		932
		933	sub destroy {
		934	my ($self) = @_;
		935
		936	$self->{npc_dialog}->destroy
		937	if $self->{npc_dialog};
		938
		939	$self->SUPER::destroy;
		940	}
		941
		942	package CFPlus::NPCDialog;
		943
		944	our @ISA = 'CFPlus::UI::FancyFrame';
		945
		946	sub new {
		947	my $class = shift;
		948
		949	my $self = $class->SUPER::new (
		950	x => 'center',
		951	y => 'center',
		952	name => "npc_dialog",
		953	force_w => $::WIDTH * 0.7,
		954	force_h => $::HEIGHT * 0.7,
		955	title => "NPC Dialog",
		956	kw => { hi => 0, yes => 0, no => 0 },
		957	has_close_button => 1,
		958	@_,
		959	);
		960
		961	Scalar::Util::weaken (my $this = $self);
		962
		963	$self->connect (delete => sub { $this->destroy; 1 });
		964
		965	# better use a pane...
		966	$self->add (my $hbox = new CFPlus::UI::HBox);
		967	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
		968
		969	$hbox->add (my $vbox = new CFPlus::UI::VBox);
		970
		971	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
		972	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
		973	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"
		974	. "Sometimes you have to tell an NPC something you cannot find out during "
		975	. "a normal conversation (such as a password). In those cases you have to use "
		976	. "this text entry. You can also enter responses manually instead of using the response "
		977	. "buttons below.",
		978	on_activate => sub {
		979	my ($entry, $text) = @_;
		980
		981	return unless $text =~ /\S/;
		982
		983	$entry->set_text ("");
		984	$this->send ($text);
		985
		986	0
		987	},
		988	);
		989
		990	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
		991
		992	$self->{bye_button} = new CFPlus::UI::Button
		993	text => "Bye (close)",
		994	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
		995	on_activate => sub { $this->destroy; 1 },
		996	;
		997
		998	$self->update_options;
		999
		1000	$self->{token} = $self->{conn}->ext_token;
		1001	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
		1002	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
		1003
		1004	$self->{entry}->grab_focus;
		1005
		1006	$self->{textview}->add_paragraph ({
		1007	fg => [1, 1, 0, 1],
		1008	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1009	});
		1010
		1011	$self->show;
		1012	$self
		1013	};
		1014
		1015	sub update_options {
		1016	my ($self) = @_;
		1017
		1018	Scalar::Util::weaken $self;
		1019
		1020	$self->{options}->clear;
		1021	$self->{options}->add ($self->{bye_button});
		1022
		1023	for my $kw (sort keys %{ $self->{kw} }) {
		1024	$self->{options}->add (new CFPlus::UI::Button
		1025	text => $kw,
		1026	on_activate => sub {
		1027	$self->send ($kw);
		1028	0
		1029	},
		1030	);
		1031	}
		1032	}
		1033
		1034	sub feed {
		1035	my ($self, $data) = @_;
		1036
		1037	Scalar::Util::weaken $self;
		1038
		1039	my ($type, $msg) = split / /, $data, 2;
		1040
		1041	if ($type eq "msg") {
		1042	my ($msg, @kw) = split /\x00/, $msg;
		1043
		1044	utf8::decode $_ for ($msg, @kw);
		1045
		1046	$self->{kw}{$_} = 1 for @kw;
		1047
		1048	$msg = "\n" . CFPlus::UI::asxml $msg;
		1049	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1050	my @link;
		1051	$msg =~ s{
		1052	($match)
		1053	}{
		1054	my $kw = $1;
		1055
		1056	push @link, new CFPlus::UI::Label
		1057	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1058	can_hover => 1,
		1059	can_events => 1,
		1060	padding_x => 0,
		1061	padding_y => 0,
		1062	on_button_up => sub {
		1063	$self->send ($kw);
		1064	};
		1065
		1066	chr 0xfffc
		1067	}giex;
		1068
		1069	$self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
		1070	$self->{textview}->scroll_to_bottom;
		1071	$self->update_options;
		1072	} else {
		1073	$self->destroy;
		1074	}
		1075
		1076	1
		1077	}
		1078
		1079	sub send {
		1080	my ($self, $msg) = @_;
		1081
		1082	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
		1083	$self->{textview}->scroll_to_bottom;
		1084
		1085	utf8::encode $msg;
		1086	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
		1087	}
		1088
		1089	sub destroy {
		1090	my ($self) = @_;
		1091
		1092	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
		1093
		1094	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
		1095	delete $self->{conn}{npc_dialog};
		1096	$self->{conn}->disconnect_ext ($self->{token});
		1097
		1098	$self->SUPER::destroy;
		1099	}
		1100
		1101	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.13 by root, Wed May 31 07:40:33 2006 UTC vs. Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.13 by root, Wed May 31 07:40:33 2006 UTC vs.
Revision 1.69 by root, Sun Jul 30 13:16:44 2006 UTC