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

Diff Legend

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