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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.8 by root, Sun May 28 19:25:55 2006 UTC vs. Revision 1.94 by root, Fri Mar 16 02:33:49 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.8 by root, Sun May 28 19:25:55 2006 UTC vs.
Revision 1.94 by root, Fri Mar 16 02:33:49 2007 UTC