ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.86 by root, Sun Oct 8 21:22:30 2006 UTC

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

Diff Legend

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