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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs. Revision 1.99 by root, Tue Apr 10 09:39:48 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.30 by root, Sun Jun 11 18:41:30 2006 UTC vs.
Revision 1.99 by root, Tue Apr 10 09:39:48 2007 UTC