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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs. Revision 1.90 by root, Wed Dec 6 00:15:12 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.37 by root, Thu Jun 15 15:47:36 2006 UTC vs.
Revision 1.90 by root, Wed Dec 6 00:15:12 2006 UTC