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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.38 by root, Sun Jun 18 17:13:11 2006 UTC vs.
Revision 1.93 by root, Fri Dec 22 03:43:05 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	use CFPlus::Macro;
		12	use CFPlus::Item;
		13
		14	use Crossfire::Protocol::Base 0.95;
10		15
11	use base 'Crossfire::Protocol::Base';	16	use base 'Crossfire::Protocol::Base';
12
13	our %open_logs;
14		17
15	sub new {	18	sub new {
16	my $class = shift;	19	my $class = shift;
17		20
18	my $self = $class->SUPER::new (@_);	21	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
19		22
20	$self->{map_widget}->clr_commands;	23	$self->{map_widget}->clr_commands;
21		24
22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	25	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	26	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
29	or next;	27	or die "unparseable command help: $_->{kw}[0]";
30		28
31	my $cmd = $1;	29	my $cmd = $1;
32	my @args = split /\\|/, $2;	30	my @args = split /\\|/, $2;
33	@args = (".*") unless @args;	31	@args = (".*") unless @args;
34		32
		33	my (undef, @par) = CFPlus::Pod::section_of $_;
		34	my $text = CFPlus::Pod::as_label @par;
		35
35	$_ = $_ eq ".*" ? "" : " $_"	36	$_ = $_ eq ".*" ? "" : " $_"
36	for @args;	37	for @args;
37		38
38	my $text = CFClient::pod_to_pango $head2->content;	39	map ["$cmd$_", $text],
39
40	push @cmd_help, ["$cmd$_", $text]
41	for sort { (length $a) <=> (length $b) }	40	sort { (length $a) <=> (length $b) }
42	@args;	41	@args
43	}	42	} sort { $a->{par} <=> $b->{par} }
		43	CFPlus::Pod::find command => "*";
44		44
45	\@cmd_help
46	};
47
48	$self->{map_widget}->add_command (@$_)	45	$self->{map_widget}->add_command (@$_)
49	for @$cmd_help;	46	for @cmd_help;
50		47
51	$self->{noface} = new_from_file CFClient::Texture	48	$self->{noface} = new_from_file CFPlus::Texture
52	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	}
53		56
54	$self->{open_container} = 0;	57	$self->{open_container} = 0;
55		58
56	# "global"	59	# "global"
57	$self->{tilecache} = CFClient::db_table "tilecache";	60	$self->{tilecache} = CFPlus::db_table "tilecache"
		61	or die "tilecache: unable to open database table";
58	$self->{facemap} = CFClient::db_table "facemap";	62	$self->{facemap} = CFPlus::db_table "facemap"
		63	or die "facemap: unable to open database table";
59		64
60	# per server	65	# per server
61	$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";
62		68
63	$self	69	$self
64	}	70	}
65		71
66	sub logprint {	72	sub logprint {
67	my ($self, @a) = @_;	73	my ($self, @a) = @_;
		74
		75	$self->{log_fh} \|\|= do {
68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";	76	my $path = "$Crossfire::VARDIR/log.$self->{host}";
69		77
70	my $fh = $open_logs{$filename};	78	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}: $!";	79	or die "Couldn't open logfile $path: $!";
75		80
76	$open_logs{$filename} = $fh;	81	$fh->autoflush (1);
		82
		83	$fh;
77	}	84	};
78		85
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);	86	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80		87
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",	88	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;	89	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83		90
84	print $fh "$ts ", @a, "\n";	91	print {$self->{log_fh}} "$ts ", @a, "\n";
85	$fh->flush;
86	}	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	);
87		162
88	sub stats_update {	163	sub stats_update {
89	my ($self, $stats) = @_;	164	my ($self, $stats) = @_;
90		165
91	if (my $exp = $stats->{+CS_STAT_EXP64}) {	166	my $prev = $self->{prev_stats} \|\| { };
92	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;
93	$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);
94	if exists $self->{prev_exp} && $diff;
95	$self->{prev_exp} = $exp;
96	}	179	}
97		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
98	::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	}
99	}	332	}
100		333
101	sub user_send {	334	sub user_send {
102	my ($self, $command) = @_;	335	my ($self, $command) = @_;
103		336
		337	$self->{record}->($command)
104	if ($self->{record}) {	338	if $self->{record};
105	push @{$self->{record}}, $command;
106	}
107		339
108	$self->logprint ("send: ", $command);	340	$self->logprint ("send: ", $command);
109	$self->send_command ($command);	341	$self->send_command ($command);
110	::status $command;	342	::status ($command);
111	}	343	}
112		344
113	sub start_record {	345	sub record {
114	my ($self) = @_;	346	my ($self, $cb) = @_;
115		347
116	$self->{record} = [];	348	$self->{record} = $cb;
117	}
118
119	sub stop_record {
120	my ($self) = @_;
121	return delete $self->{record};
122	}	349	}
123		350
124	sub map_scroll {	351	sub map_scroll {
125	my ($self, $dx, $dy) = @_;	352	my ($self, $dx, $dy) = @_;
126		353
128	}	355	}
129		356
130	sub feed_map1a {	357	sub feed_map1a {
131	my ($self, $data) = @_;	358	my ($self, $data) = @_;
132		359
133	$self->{map}->map1a_update ($data);	360	$self->{map}->map1a_update ($data, $self->{setup}{extmap});
134	$self->{map_widget}->update;	361	$self->{map_widget}->update;
135	}	362	}
136		363
137	sub magicmap {	364	sub magicmap {
138	my ($self, $w, $h, $x, $y, $data) = @_;	365	my ($self, $w, $h, $x, $y, $data) = @_;
…		…
308		535
309	unless ($id) {	536	unless ($id) {
310	# create new id for face	537	# create new id for face
311	# I love transactions	538	# I love transactions
312	for (1..100) {	539	for (1..100) {
313	my $txn = $CFClient::DB_ENV->txn_begin;	540	my $txn = $CFPlus::DB_ENV->txn_begin;
314	my $status = $self->{facemap}->db_get (id => $id);	541	my $status = $self->{facemap}->db_get (id => $id);
315	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {	542	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
316	$id = ($id \|\| 64) + 1;	543	$id = ($id \|\| 64) + 1;
317	if ($self->{facemap}->put (id => $id) == 0	544	if ($self->{facemap}->put (id => $id) == 0
318	&& $self->{facemap}->put ($hash => $id) == 0) {	545	&& $self->{facemap}->put ($hash => $id) == 0) {
…		…
322	}	549	}
323	}	550	}
324	$txn->txn_abort;	551	$txn->txn_abort;
325	}	552	}
326		553
327	CFClient::fatal "maximum number of transaction retries reached - database problems?";	554	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
328	}	555	}
329		556
330	gotid:	557	gotid:
331	$face->{id} = $id;	558	$face->{id} = $id;
332	$self->{map}->set_face ($facenum => $id);	559	$self->{map}->set_face ($facenum => $id);
…		…
343	undef	570	undef
344	};	571	};
345	}	572	}
346		573
347	sub face_update {	574	sub face_update {
348	my ($self, $facenum, $face) = @_;	575	my ($self, $facenum, $face, $changed) = @_;
349		576
350	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	577	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
351		578
352	$self->set_texture ($face->{id} => delete $face->{image});	579	$self->set_texture ($face->{id} => delete $face->{image});
353	}	580	}
354		581
355	sub set_texture {	582	sub set_texture {
356	my ($self, $id, $data) = @_;	583	my ($self, $id, $data) = @_;
357		584
358	$self->{texture}[$id] \|\|= do {	585	$self->{texture}[$id] \|\|= do {
359	my $tex =	586	my $tex =
360	new_from_image CFClient::Texture	587	new_from_image CFPlus::Texture
361	$data, minify => 1, mipmap => 1;	588	$data, minify => 1, mipmap => 1;
362		589
363	$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}});
364	$self->{map_widget}->update;	591	$self->{map_widget}->update;
365		592
…		…
396	[0.11, 0.56, 1.00],	623	[0.11, 0.56, 1.00],
397	[0.93, 0.46, 0.00],	624	[0.93, 0.46, 0.00],
398	[0.18, 0.54, 0.34],	625	[0.18, 0.54, 0.34],
399	[0.56, 0.73, 0.56],	626	[0.56, 0.73, 0.56],
400	[0.80, 0.80, 0.80],	627	[0.80, 0.80, 0.80],
401	[0.55, 0.41, 0.13],	628	[0.75, 0.61, 0.20],
402	[0.99, 0.77, 0.26],	629	[0.99, 0.77, 0.26],
403	[0.74, 0.65, 0.41],	630	[0.74, 0.65, 0.41],
404	);	631	);
405		632
		633	my $fg = $color[$color % @color];
		634
406	$self->logprint ("info: ", $text);	635	$self->logprint ("info: ", $text);
407
408	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
409		636
410	# try to create single paragraphs of multiple lines sent by the server	637	# try to create single paragraphs of multiple lines sent by the server
411	$text =~ s/(?<=\S)\n(?=\w)/ /g;	638	$text =~ s/(?<=\S)\n(?=\w)/ /g;
412		639
413	$text = CFClient::UI::Label::escape $text;	640	$text = CFPlus::asxml $text;
414	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	641	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
415	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	642	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
416		643
417	$self->{logview}->add_paragraph ($color[$color],	644	::message ({ fg => $fg, markup => $_ })
418	join "\n", map "$time $_", split /\n/, $text);	645	for split /\n/, $text;
419		646
420	$self->{statusbox}->add ($text,	647	$self->{statusbox}->add ($text,
421	group => $text,	648	group => $text,
422	fg => $color[$color],	649	fg => $fg,
423	timeout => $color >= 2 ? 60 : 10,	650	timeout => $color >= 2 ? 180 : 10,
424	tooltip_font => $::FONT_FIXED,	651	tooltip_font => $::FONT_FIXED,
425	);	652	);
426	}	653	}
427		654
428	sub drawextinfo {	655	sub drawextinfo {
…		…
432	}	659	}
433		660
434	sub spell_add {	661	sub spell_add {
435	my ($self, $spell) = @_;	662	my ($self, $spell) = @_;
436		663
437	# try to create single paragraphs of multiple lines sent by the server	664	# try to create single paragraphs out of the multiple lines sent by the server
438	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	665	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
439	$spell->{message} =~ s/\n+$//;	666	$spell->{message} =~ s/\n+$//;
440	$spell->{message} \|\|= "Server did not provide a description for this spell.";	667	$spell->{message} \|\|= "Server did not provide a description for this spell.";
441		668
442	$::SETUP_SPELLS->add_spell ($spell);	669	$::SPELL_LIST->add_spell ($spell);
443		670
444	$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});
445	$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});
446	}	673	}
447		674
448	sub spell_delete {	675	sub spell_delete {
449	my ($self, $spell) = @_;	676	my ($self, $spell) = @_;
		677
450	$::SETUP_SPELLS->remove_spell ($spell);	678	$::SPELL_LIST->remove_spell ($spell);
		679	}
		680
		681	sub setup {
		682	my ($self, $setup) = @_;
		683
		684	$::MAP->resize ($self->{mapw}, $self->{maph});
451	}	685	}
452		686
453	sub addme_success {	687	sub addme_success {
454	my ($self) = @_;	688	my ($self) = @_;
455		689
456	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
457	my ($pom) = @_;
458
459	my %skill_help;	690	my %skill_help;
460		691
461	for my $head2 ($pom->head1->[3]->head2) {	692	for my $node (CFPlus::Pod::find skill_description => "*") {
462	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	693	my (undef, @par) = CFPlus::Pod::section_of $node;
463	}	694	$skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
464
465	\%skill_help
466	};	695	};
467		696
468	for my $skill (values %{$self->{skill_info}}) {	697	for my $skill (values %{$self->{skill_info}}) {
469	$self->{map_widget}->add_command ("ready_skill $skill",	698	$self->{map_widget}->add_command ("ready_skill $skill",
470	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	699	(CFPlus::asxml "Ready the skill '$skill'\n\n")
471	. $skill_help->{$skill});	700	. $skill_help{$skill});
472	$self->{map_widget}->add_command ("use_skill $skill",	701	$self->{map_widget}->add_command ("use_skill $skill",
473	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	702	(CFPlus::asxml "Immediately use the skill '$skill'\n\n")
474	. $skill_help->{$skill});	703	. $skill_help{$skill});
475	}	704	}
476	}	705	}
477		706
478	sub eof {	707	sub eof {
479	my ($self) = @_;	708	my ($self) = @_;
…		…
503		732
504	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	733	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
505		734
506	$self->send ("requestinfo image_sums $face $face");	735	$self->send ("requestinfo image_sums $face $face");
507		736
508	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	737	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
509	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	738	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
510	} elsif (!exists $self->{num_faces}) {	739	} elsif (!exists $self->{num_faces}) {
511	$self->send ("requestinfo image_info");	740	$self->send ("requestinfo image_info");
512		741
513	$self->{num_faces} = 0;	742	$self->{num_faces} = 0;
514		743
515	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	744	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
516	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	745	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
517	}	746	}
518	}	747	}
519		748
520	sub update_floorbox {	749	sub update_floorbox {
521	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	750	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
522	return unless $::CONN;	751	return unless $::CONN;
523		752
524	$::FLOORBOX->clear;	753	$::FLOORBOX->clear;
525		754
526	my $row;	755	my $row;
527	for (@{ $::CONN->{container}{0} }) {	756	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
528	if ($row < 6) {	757	if ($row < 6) {
529	local $_->{face_widget}; # hack to force recreation of widget	758	local $_->{face_widget}; # hack to force recreation of widget
530	local $_->{desc_widget}; # hack to force recreation of widget	759	local $_->{desc_widget}; # hack to force recreation of widget
531	CFClient::Item::update_widgets $_;	760	CFPlus::Item::update_widgets $_;
532		761
533	$::FLOORBOX->add (0, $row, $_->{face_widget});	762	$::FLOORBOX->add (0, $row, $_->{face_widget});
534	$::FLOORBOX->add (1, $row, $_->{desc_widget});	763	$::FLOORBOX->add (1, $row, $_->{desc_widget});
535		764
536	$row++;	765	$row++;
537	} else {	766	} else {
538	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	767	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button
539	text => "More...",	768	text => "More...",
540	on_activate => sub { $::INV_WINDOW->toggle_visibility; 0 },	769	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
541	);	770	);
542	last;	771	last;
543	}	772	}
544	}	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	}
545	});	780	});
546		781
547	$::WANT_REFRESH++;	782	$::WANT_REFRESH++;
548	}	783	}
549		784
550	sub set_opencont {	785	sub set_opencont {
551	my ($conn, $tag, $name) = @_;	786	my ($conn, $tag, $name) = @_;
552	$conn->{open_container} = $tag;	787	$conn->{open_container} = $tag;
		788	update_floorbox;
553		789
554	$::INV_RIGHT_HB->clear ();	790	$::INV_RIGHT_HB->clear ();
555	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	791	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
556		792
557	if ($tag != 0) { # Floor isn't closable, is it?	793	if ($tag != 0) { # Floor isn't closable, is it?
558	$::INV_RIGHT_HB->add (new CFClient::UI::Button	794	$::INV_RIGHT_HB->add (new CFPlus::UI::Button
559	text => "Close container",	795	text => "Close container",
560	tooltip => "Close the currently open container (if one is open)",	796	tooltip => "Close the currently open container (if one is open)",
561	on_activate => sub {	797	on_activate => sub {
562	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	798	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
563	if $tag != 0;	799	if $tag != 0;
…		…
568	}	804	}
569		805
570	$::INVR->set_items ($conn->{container}{$tag});	806	$::INVR->set_items ($conn->{container}{$tag});
571	}	807	}
572		808
573	sub update_container {	809	sub update_containers {
574	my ($tag) = @_;	810	my ($self) = @_;
575		811
576	$::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})
577	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	});
578	}	829	}
579		830
580	sub container_add {	831	sub container_add {
581	my ($self, $tag, $items) = @_;	832	my ($self, $tag, $items) = @_;
582		833
583	#d# print "container_add: container $tag ($self->{player}{tag})\n";	834	$self->{update_container}{$tag}++;
584		835	$self->update_containers;
585	if ($tag == 0) {
586	update_floorbox;
587	update_container (0);
588	} elsif ($tag == $self->{player}{tag}) {
589	$::INV->set_items ($self->{container}{$self->{player}{tag}})
590	} else {
591	update_container ($tag);
592	}
593
594	# $self-<{player}{tag} => player inv
595	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596	}	836	}
597		837
598	sub container_clear {	838	sub container_clear {
599	my ($self, $tag) = @_;	839	my ($self, $tag) = @_;
600		840
601	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	841	$self->{update_container}{$tag}++;
602		842	$self->update_containers;
603	if ($tag == 0) {
604	update_floorbox;
605	update_container (0);
606	} elsif ($tag == $self->{player}{tag}) {
607	$::INV->set_items ($self->{container}{$tag})
608	} else {
609	update_container ($tag);
610	}
611
612	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613	}	843	}
614		844
615	sub item_delete {	845	sub item_delete {
616	my ($self, @items) = @_;	846	my ($self, @items) = @_;
617		847
		848	$self->{update_container}{$_->{container}}++
618	for (@items) {	849	for @items;
619	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621	if ($_->{container} == 0) {
622	update_floorbox;
623	update_container ($_->{tag});
624	} elsif ($_->{container} == $self->{player}{tag}) {
625	$::INV->set_items ($self->{container}{$self->{player}{tag}})
626	} else {
627	update_container ($_->{container});
628	}
629	}	850
		851	$self->update_containers;
630	}	852	}
631		853
632	sub item_update {	854	sub item_update {
633	my ($self, $item) = @_;	855	my ($self, $item) = @_;
634		856
635	#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";
636		858
637	if ($item->{tag} == $self->{player}{tag}) {
638	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
639	return;
640	}
641
642	CFClient::Item::update_widgets $item;	859	CFPlus::Item::update_widgets $item;
643		860
644	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	861	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645	set_opencont ($::CONN, 0, "Floor");	862	set_opencont ($::CONN, 0, "Floor");
646		863
647	} elsif ($item->{flags} & F_OPEN) {	864	} elsif ($item->{flags} & F_OPEN) {
648	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	865	set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
		866
649	} else {	867	} else {
650	if ($item->{container} == 0) {	868	$self->{update_container}{$item->{container}}++;
651	update_floorbox;
652	update_container (0);	869	$self->update_containers;
653	} elsif ($item->{container} == $self->{player}{tag}) {
654	$::INV->set_items ($self->{container}{$item->{container}})
655	}
656	}	870	}
657	}	871	}
658		872
659	sub player_update {	873	sub player_update {
660	my ($self, $player) = @_;	874	my ($self, $player) = @_;
661		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
662	$::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);
663	}	888	}
664		889
665	sub update_server_info {	890	sub update_server_info {
666	my ($self) = @_;	891	my ($self) = @_;
667		892
…		…
670	$::SERVER_INFO->set_markup (	895	$::SERVER_INFO->set_markup (
671	"server <tt>$self->{host}:$self->{port}</tt>\n"	896	"server <tt>$self->{host}:$self->{port}</tt>\n"
672	. "protocol version <tt>$self->{version}</tt>\n"	897	. "protocol version <tt>$self->{version}</tt>\n"
673	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	898	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
674	. "extended command support $yesno[$self->{setup}{extcmd} > 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"
675	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	902	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
676	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	903	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
677	. "map size $self->{mapw}×$self->{maph}\n"	904	. "map size $self->{mapw}×$self->{maph}\n"
678	);	905	);
		906
		907	::setup_build_button ($self->{editor_support}->{builder_ui});
679	}	908	}
680		909
681	sub logged_in {	910	sub logged_in {
682	my ($self) = @_;	911	my ($self) = @_;
683		912
684	$self->send_ext_req (cfplus_support => "1", sub {	913	$self->send_ext_req (cfplus_support => version => 1, sub {
685	$self->{cfplus_ext} = $_[0];	914	$self->{cfplus_ext} = $_[0]{version};
686	$self->update_server_info;	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
687	});	927	});
688		928
689	$self->update_server_info;	929	$self->update_server_info;
690		930
691	$self->send_command ("output-sync $::CFG->{output_sync}");	931	$self->send_command ("output-sync $::CFG->{output_sync}");
692	$self->send_command ("output-count $::CFG->{output_count}");	932	$self->send_command ("output-count $::CFG->{output_count}");
693	$self->send_command ("pickup $::CFG->{pickup}");	933	$self->send_command ("pickup $::CFG->{pickup}");
694	}	934	}
695		935
		936	sub buildat {
		937	my ($self, $builditem, $x, $y) = @_;
		938
		939	if ($self->{cfplus_ext}) {
		940	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
		941	}
		942	}
		943
696	sub lookat {	944	sub lookat {
697	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
698		946
699	if ($self->{cfplus_ext}) {	947	if ($self->{cfplus_ext}) {
700	$self->send_ext_req (lookat => "$x $y", sub {	948	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {
701	my %res = split /\x00/, $_[0];	949	my ($msg) = @_;
702		950
703	if (exists $res{npc_dialog}) {	951	if (exists $msg->{npc_dialog}) {
704	# start npc chat dialog	952	# start npc chat dialog
705	$self->{npc_dialog} = new CFClient::NPCDialog::	953	$self->{npc_dialog} = new CFPlus::NPCDialog::
706	dx => $x,	954	dx => $x,
707	dy => $y,	955	dy => $y,
708	title => "$res{npc_dialog} (NPC)",	956	title => "$msg->{npc_dialog} (NPC)",
709	conn => $self,	957	conn => $self,
710	;	958	;
711	}	959	}
712	});	960	});
713	}	961	}
…		…
716	}	964	}
717		965
718	sub destroy {	966	sub destroy {
719	my ($self) = @_;	967	my ($self) = @_;
720		968
721	$self->{npc_dialog}->destroy	969	(delete $self->{npc_dialog})->destroy
722	if $self->{npc_dialog};	970	if $self->{npc_dialog};
723		971
724	$self->SUPER::destroy;	972	$self->SUPER::destroy;
725	}	973	}
726		974
727	package CFClient::NPCDialog;	975	package CFPlus::NPCDialog;
728		976
729	our @ISA = 'CFClient::UI::FancyFrame';	977	our @ISA = 'CFPlus::UI::Toplevel';
730		978
731	sub new {	979	sub new {
732	my $class = shift;	980	my $class = shift;
733		981
734	my $self = $class->SUPER::new (	982	my $self = $class->SUPER::new (
…		…
737	name => "npc_dialog",	985	name => "npc_dialog",
738	force_w => $::WIDTH * 0.7,	986	force_w => $::WIDTH * 0.7,
739	force_h => $::HEIGHT * 0.7,	987	force_h => $::HEIGHT * 0.7,
740	title => "NPC Dialog",	988	title => "NPC Dialog",
741	kw => { hi => 0, yes => 0, no => 0 },	989	kw => { hi => 0, yes => 0, no => 0 },
		990	has_close_button => 1,
742	@_,	991	@_,
743	);	992	);
744		993
745	Scalar::Util::weaken (my $this = $self);	994	CFPlus::weaken (my $this = $self);
		995
		996	$self->connect (delete => sub { $this->destroy; 1 });
746		997
747	# better use a pane...	998	# better use a pane...
748	$self->add (my $hbox = new CFClient::UI::HBox);	999	$self->add (my $hbox = new CFPlus::UI::HBox);
749	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	1000	$hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
750		1001
751	$hbox->add (my $vbox = new CFClient::UI::VBox);	1002	$hbox->add (my $vbox = new CFPlus::UI::VBox);
752		1003
753	$vbox->add (new CFClient::UI::Label text => "Message Entry:");	1004	$vbox->add (new CFPlus::UI::Label text => "Message Entry:");
754	$vbox->add ($self->{entry} = new CFClient::UI::Entry	1005	$vbox->add ($self->{entry} = new CFPlus::UI::Entry
755	tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n"	1006	tooltip => "#npc_message_entry",
756	. "Sometimes you have to tell an NPC something you cannot find out during "
757	. "a normal conversation (such as a password). In those cases you have to use "
758	. "this text entry. You can also enter responses manually instead of using the response "
759	. "buttons below.",
760	on_activate => sub {	1007	on_activate => sub {
761	my ($entry, $text) = @_;	1008	my ($entry, $text) = @_;
762		1009
763	return unless $text =~ /\S/;	1010	return unless $text =~ /\S/;
764		1011
…		…
767		1014
768	0	1015	0
769	},	1016	},
770	);	1017	);
771		1018
772	$vbox->add ($self->{options} = new CFClient::UI::VBox);	1019	$vbox->add ($self->{options} = new CFPlus::UI::VBox);
773		1020
774	$self->{close_button} = new CFClient::UI::Button	1021	$self->{bye_button} = new CFPlus::UI::Button
775	text => "Bye (close)",	1022	text => "Bye (close)",
776	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	1023	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
777	on_activate => sub { $this->destroy; 0 },	1024	on_activate => sub { $this->destroy; 1 },
778	;	1025	;
779		1026
780	$self->update_options;	1027	$self->update_options;
781		1028
782	$self->{token} = $self->{conn}->ext_token;	1029	$self->{id} = $self->{conn}->send_ext_req (
783	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	1030	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
784	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	1031	sub { $this && $this->feed (@_) }
		1032	);
785		1033
786	$self->{entry}->grab_focus;	1034	$self->{entry}->grab_focus;
787		1035
788	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	1036	$self->{textview}->add_paragraph ({
		1037	fg => [1, 1, 0, 1],
		1038	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		1039	});
789		1040
790	$self->show;	1041	$self->show;
791	$self	1042	$self
792	};	1043	};
793		1044
794	sub update_options {	1045	sub update_options {
795	my ($self) = @_;	1046	my ($self) = @_;
796		1047
797	Scalar::Util::weaken $self;	1048	CFPlus::weaken $self;
798		1049
799	$self->{options}->clear;	1050	$self->{options}->clear;
800	$self->{options}->add ($self->{close_button});	1051	$self->{options}->add ($self->{bye_button});
801		1052
802	for my $kw (sort keys %{ $self->{kw} }) {	1053	for my $kw (sort keys %{ $self->{kw} }) {
803	$self->{options}->add (new CFClient::UI::Button	1054	$self->{options}->add (new CFPlus::UI::Button
804	text => $kw,	1055	text => $kw,
805	on_activate => sub {	1056	on_activate => sub {
806	$self->send ($kw);	1057	$self->send ($kw);
807	0	1058	0
808	},	1059	},
809	);	1060	);
810	}	1061	}
811	}	1062	}
812		1063
813	sub feed {	1064	sub feed {
814	my ($self, $data) = @_;	1065	my ($self, $msg) = @_;
815		1066
816	my ($type, $msg) = split / /, $data, 2;	1067	CFPlus::weaken $self;
817		1068
818	if ($type eq "msg") {	1069	if ($msg->{msgtype} eq "reply") {
819	my ($msg, @kw) = split /\x00/, $msg;	1070	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};
820	$self->{kw}{$_} = 1 for @kw;	1071	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};
821		1072
822	$msg = CFClient::UI::Label::escape $msg;	1073	my $text = "\n" . CFPlus::asxml $msg->{msg};
823	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1074	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
824	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.	1075	my @link;
		1076	$text =~ s{
		1077	($match)
		1078	}{
		1079	my $kw = $1;
		1080
		1081	push @link, new CFPlus::UI::Label
		1082	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1083	can_hover => 1,
		1084	can_events => 1,
		1085	padding_x => 0,
		1086	padding_y => 0,
		1087	on_button_up => sub {
		1088	$self->send ($kw);
		1089	};
		1090
		1091	"\x{fffc}"
		1092	}giex;
825		1093
826	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");	1094	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
		1095	$self->{textview}->scroll_to_bottom;
827	$self->update_options;	1096	$self->update_options;
828	} else {	1097	} else {
829	$self->destroy;	1098	$self->destroy;
830	}	1099	}
831		1100
…		…
833	}	1102	}
834		1103
835	sub send {	1104	sub send {
836	my ($self, $msg) = @_;	1105	my ($self, $msg) = @_;
837		1106
838	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1107	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
839	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);	1108	$self->{textview}->scroll_to_bottom;
		1109
		1110	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
840	}	1111	}
841		1112
842	sub destroy {	1113	sub destroy {
843	my ($self) = @_;	1114	my ($self) = @_;
844		1115
845	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1	1116	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
846		1117
		1118	if ($self->{conn}) {
		1119	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
847	delete $self->{conn}{npc_dialog};	1120	delete $self->{conn}{npc_dialog};
848	$self->{conn}->disconnect_ext ($self->{token});	1121	$self->{conn}->disconnect_ext ($self->{id});
		1122	}
849		1123
850	$self->SUPER::destroy;	1124	$self->SUPER::destroy;
851	}	1125	}
852		1126
853	1;	1127	1
		1128

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.38 by root, Sun Jun 18 17:13:11 2006 UTC vs. Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.38 by root, Sun Jun 18 17:13:11 2006 UTC vs.
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC