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.62 by elmex, Sat Jul 22 12:18:02 2006 UTC vs.
Revision 1.96 by root, Fri Apr 6 07:45:35 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 18
13sub new { 19sub new {
14 my $class = shift; 20 my $class = shift;
15 21
16 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
17 23
18 $self->{map_widget}->clr_commands; 24 $self->{map_widget}->clr_commands;
19 25
20 my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub { 26 my @cmd_help = map {
21 my ($pom) = @_;
22
23 my @cmd_help;
24
25 for my $head2 ($pom->head1->[-2]->head2) {
26 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
27 or next; 28 or die "unparseable command help: $_->{kw}[0]";
28 29
29 my $cmd = $1; 30 my $cmd = $1;
30 my @args = split /\|/, $2; 31 my @args = split /\|/, $2;
31 @args = (".*") unless @args; 32 @args = (".*") unless @args;
32 33
34 my (undef, @par) = CFPlus::Pod::section_of $_;
35 my $text = CFPlus::Pod::as_label @par;
36
33 $_ = $_ eq ".*" ? "" : " $_" 37 $_ = $_ eq ".*" ? "" : " $_"
34 for @args; 38 for @args;
35 39
36 my $text = CFClient::pod_to_pango $head2->content; 40 map ["$cmd$_", $text],
37
38 push @cmd_help, ["$cmd$_", $text]
39 for sort { (length $a) <=> (length $b) } 41 sort { (length $a) <=> (length $b) }
40 @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 }
41 } 60 }
42
43 \@cmd_help
44 }; 61 });
45 62
46 $self->{map_widget}->add_command (@$_) 63 $self->{map_widget}->add_command (@$_)
47 for @$cmd_help; 64 for @cmd_help;
48 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 {
49 $self->{noface} = new_from_file CFClient::Texture 73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
50 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 }
51 77
52 $self->{open_container} = 0; 78 $self->{open_container} = 0;
53 79
54 # "global"
55 $self->{tilecache} = CFClient::db_table "tilecache";
56 $self->{facemap} = CFClient::db_table "facemap";
57
58 # per server 80 # per server
59 $self->{mapcache} = CFClient::db_table "mapcache_$self->{host}_$self->{port}"; 81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
60 82
61 $self 83 $self
62} 84}
63 85
64sub logprint { 86sub logprint {
… …
242 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 264 $::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
243 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS}); 265 $::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
244 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 266 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
245 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 267 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
246 268
247 $::STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 269 $self->update_weight;
248 270
249 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 271 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
250 for keys %RES_TBL; 272 for keys %RES_TBL;
251 273
252 my $sktbl = $::STATWIDS->{skill_tbl}; 274 my $sktbl = $::STATWIDS->{skill_tbl};
253 my @skills = keys %{ $self->{skill_info} }; 275 my @skills = keys %{ $self->{skill_info} };
254 276
255 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 277 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
256 $sktbl->clear; 278 $sktbl->clear;
257 279
258 $sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1); 280 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
259 $sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 281 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
260 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1); 282 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
261 $sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1); 283 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
262 $sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1); 284 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
263 $sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1); 285 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
264 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
265 my ($x, $y) = (1, 0); 292 my ($x, $y) = (0, 1);
266 for ( 293 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 294 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 295 map [$_, $self->{skill_info}{$_}],
269 grep exists $stats->{$_}, 296 grep exists $stats->{$_},
270 @skills 297 @skills
271 ) { 298 ) {
272 my ($idx, $name) = @$_; 299 my ($idx, $name) = @$_;
273 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
274 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label 323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
275 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]); 324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
276 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label 325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
277 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4); 326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
278 $sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name); 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);
279 329
280 $x++ and ($x, $y) = (0, $y + 1); 330 $x++ and ($x, $y) = (0, $y + 1);
281 } 331 }
282 } 332 }
283 333
… …
285 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
286 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
287 } 337 }
288} 338}
289 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
290sub user_send { 348sub user_send {
291 my ($self, $command) = @_; 349 my ($self, $command) = @_;
292 350
351 $self->{record}->($command)
293 if ($self->{record}) { 352 if $self->{record};
294 push @{$self->{record}}, $command;
295 }
296 353
297 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
298 $self->send_command ($command); 355 $self->send_command ($command);
299 ::status ($command); 356 ::status ($command);
300} 357}
301 358
302sub start_record { 359sub record {
303 my ($self) = @_; 360 my ($self, $cb) = @_;
304 361
305 $self->{record} = []; 362 $self->{record} = $cb;
306}
307
308sub stop_record {
309 my ($self) = @_;
310 return delete $self->{record};
311} 363}
312 364
313sub map_scroll { 365sub map_scroll {
314 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
315 367
… …
317} 369}
318 370
319sub feed_map1a { 371sub feed_map1a {
320 my ($self, $data) = @_; 372 my ($self, $data) = @_;
321 373
322 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
323 $self->{map_widget}->update; 375 $self->{map_widget}->update;
324} 376}
325 377
326sub magicmap { 378sub magicmap {
327 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
336 or return; 388 or return;
337 389
338 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
339 391
340 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
341 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
342 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
343} 395}
344 396
345sub map_clear { 397sub map_clear {
346 my ($self) = @_; 398 my ($self) = @_;
… …
354 406
355 407
356sub load_map($$$) { 408sub load_map($$$) {
357 my ($self, $hash, $x, $y) = @_; 409 my ($self, $hash, $x, $y) = @_;
358 410
359 if (defined (my $data = $self->{mapcache}->get ($hash))) { 411 CFPlus::DB::get $self->{mapcache} => $hash, sub {
412 my ($data) = @_;
413
414 if (defined $data) {
360 $data = Compress::LZF::decompress $data; 415 $data = Compress::LZF::decompress $data;
361 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 416 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
362 for my $id ($self->{map}->set_rect ($x, $y, $data)) { 417 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
363 my $data = $self->{tilecache}->get ($id) 418 CFPlus::DB::get tilecache => $id, sub {
364 or next; 419 my ($data) = @_;
365 420
366 $self->set_texture ($id => $data); 421 $self->set_texture ($id => $data)
422 if defined $data;
423 };
424 }
367 } 425 }
368 } 426 };
369} 427}
370 428
371# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 429# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
372# (server resource,s latency, bandwidth), so this hack is warranted. 430# (server resource,s latency, bandwidth), so this hack is warranted.
373# the right fix is to make real tiled maps with an overview file 431# the right fix is to make real tiled maps with an overview file
… …
487 $self->load_map ($hash, $x, $y); 545 $self->load_map ($hash, $x, $y);
488 $self->flood_fill (0, 0, 0, "", $hash, $flags); 546 $self->flood_fill (0, 0, 0, "", $hash, $flags);
489} 547}
490 548
491sub face_find { 549sub face_find {
492 my ($self, $facenum, $face) = @_; 550 my ($self, $facenum, $face, $cb) = @_;
493 551
494 my $hash = "$face->{chksum},$face->{name}"; 552 my $hash = "$face->{chksum},$face->{name}";
495 553
496 my $id = $self->{facemap}->get ($hash); 554 my $id = CFPlus::DB::get_tile_id_sync $hash;
497 555
498 unless ($id) {
499 # create new id for face
500 # I love transactions
501 for (1..100) {
502 my $txn = $CFClient::DB_ENV->txn_begin;
503 my $status = $self->{facemap}->db_get (id => $id);
504 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
505 $id = ($id || 64) + 1;
506 if ($self->{facemap}->put (id => $id) == 0
507 && $self->{facemap}->put ($hash => $id) == 0) {
508 $txn->txn_commit;
509
510 goto gotid;
511 }
512 }
513 $txn->txn_abort;
514 }
515
516 CFClient::fatal "maximum number of transaction retries reached - database problems?";
517 }
518
519gotid:
520 $face->{id} = $id; 556 $face->{id} = $id;
521 $self->{map}->set_face ($facenum => $id);
522 $self->{faceid}[$facenum] = $id;#d# 557 $self->{faceid}[$facenum] = $id;
523 558
524 my $face = $self->{tilecache}->get ($id); 559 $self->{map}->set_tileid ($facenum => $id);
525 560
526 if ($face) { 561 CFPlus::DB::get tilecache => $id, $cb;
527 #$self->face_prefetch;
528 $face
529 } else {
530 my $tex = $self->{noface};
531 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
532 undef
533 };
534} 562}
535 563
536sub face_update { 564sub face_update {
537 my ($self, $facenum, $face, $changed) = @_; 565 my ($self, $facenum, $face, $changed) = @_;
538 566
539 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 567 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
568 if $changed;
540 569
541 $self->set_texture ($face->{id} => delete $face->{image}); 570 $self->set_texture ($face->{id} => delete $face->{image});
542} 571}
543 572
544sub set_texture { 573sub set_texture {
545 my ($self, $id, $data) = @_; 574 my ($self, $id, $data) = @_;
546 575
547 $self->{texture}[$id] ||= do { 576 $self->{texture}[$id] ||= do {
548 my $tex = 577 my $tex =
549 new_from_image CFClient::Texture 578 new_from_image CFPlus::Texture
550 $data, minify => 1, mipmap => 1; 579 $data, minify => 1, mipmap => 1;
551 580
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 581 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 $self->{map_widget}->update; 582 $self->{map_widget}->update;
554 583
… …
590 [0.75, 0.61, 0.20], 619 [0.75, 0.61, 0.20],
591 [0.99, 0.77, 0.26], 620 [0.99, 0.77, 0.26],
592 [0.74, 0.65, 0.41], 621 [0.74, 0.65, 0.41],
593 ); 622 );
594 623
624 my $fg = $color[$color % @color];
625
595 $self->logprint ("info: ", $text); 626 $self->logprint ("info: ", $text);
596
597 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
598 627
599 # 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
600 $text =~ s/(?<=\S)\n(?=\w)/ /g; 629 $text =~ s/(?<=\S)\n(?=\w)/ /g;
601 630
602 $text = CFClient::UI::Label::escape $text; 631 $text = CFPlus::asxml $text;
603 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 632 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
604 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 633 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
605 634
606 $self->{logview}->add_paragraph ($color[$color], $_) 635 ::message ({ fg => $fg, markup => $_ })
607 for map "$time $_", split /\n/, $text; 636 for split /\n/, $text;
608 $self->{logview}->scroll_to_bottom;
609 637
610 $self->{statusbox}->add ($text, 638 $self->{statusbox}->add ($text,
611 group => $text, 639 group => $text,
612 fg => $color[$color], 640 fg => $fg,
613 timeout => $color >= 2 ? 60 : 10, 641 timeout => $color >= 2 ? 180 : 10,
614 tooltip_font => $::FONT_FIXED, 642 tooltip_font => $::FONT_FIXED,
615 ); 643 );
616} 644}
617 645
618sub drawextinfo { 646sub drawextinfo {
… …
622} 650}
623 651
624sub spell_add { 652sub spell_add {
625 my ($self, $spell) = @_; 653 my ($self, $spell) = @_;
626 654
627 # 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
628 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
629 $spell->{message} =~ s/\n+$//; 657 $spell->{message} =~ s/\n+$//;
630 $spell->{message} ||= "Server did not provide a description for this spell."; 658 $spell->{message} ||= "Server did not provide a description for this spell.";
631 659
632 $::SPELL_PAGE->add_spell ($spell); 660 $::SPELL_LIST->add_spell ($spell);
633 661
634 $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});
635 $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});
636} 664}
637 665
638sub spell_delete { 666sub spell_delete {
639 my ($self, $spell) = @_; 667 my ($self, $spell) = @_;
640 668
641 $::SPELL_PAGE->remove_spell ($spell); 669 $::SPELL_LIST->remove_spell ($spell);
670}
671
672sub setup {
673 my ($self, $setup) = @_;
674
675 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph});
642} 677}
643 678
644sub addme_success { 679sub addme_success {
645 my ($self) = @_; 680 my ($self) = @_;
646 681
647 my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
648 my ($pom) = @_;
649
650 my %skill_help; 682 my %skill_help;
651 683
652 for my $head2 ($pom->head1->[3]->head2) { 684 for my $node (CFPlus::Pod::find skill_description => "*") {
653 $skill_help{$head2->title} = CFClient::pod_to_pango $head2->content; 685 my (undef, @par) = CFPlus::Pod::section_of $node;
654 } 686 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
655
656 \%skill_help
657 }; 687 };
658 688
659 for my $skill (values %{$self->{skill_info}}) { 689 for my $skill (values %{$self->{skill_info}}) {
660 $self->{map_widget}->add_command ("ready_skill $skill", 690 $self->{map_widget}->add_command ("ready_skill $skill",
661 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n") 691 (CFPlus::asxml "Ready the skill '$skill'\n\n")
662 . $skill_help->{$skill}); 692 . $skill_help{$skill});
663 $self->{map_widget}->add_command ("use_skill $skill", 693 $self->{map_widget}->add_command ("use_skill $skill",
664 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n") 694 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
665 . $skill_help->{$skill}); 695 . $skill_help{$skill});
666 } 696 }
667} 697}
668 698
669sub eof { 699sub eof {
670 my ($self) = @_; 700 my ($self) = @_;
… …
694 724
695 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, (); 725 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
696 726
697 $self->send ("requestinfo image_sums $face $face"); 727 $self->send ("requestinfo image_sums $face $face");
698 728
699 $self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo", 729 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
700 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 730 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
701 } elsif (!exists $self->{num_faces}) { 731 } elsif (!exists $self->{num_faces}) {
702 $self->send ("requestinfo image_info"); 732 $self->send ("requestinfo image_info");
703 733
704 $self->{num_faces} = 0; 734 $self->{num_faces} = 0;
705 735
706 $self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch", 736 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
707 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]); 737 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
708 } 738 }
709} 739}
710 740
711sub update_floorbox { 741sub update_floorbox {
712 $CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub { 742 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
713 return unless $::CONN; 743 return unless $::CONN;
714 744
715 $::FLOORBOX->clear; 745 $::FLOORBOX->clear;
716 746
717 my $row; 747 my $row;
718 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 748 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
719 if ($row < 6) { 749 if ($row < 6) {
720 local $_->{face_widget}; # hack to force recreation of widget 750 local $_->{face_widget}; # hack to force recreation of widget
721 local $_->{desc_widget}; # hack to force recreation of widget 751 local $_->{desc_widget}; # hack to force recreation of widget
722 CFClient::Item::update_widgets $_; 752 CFPlus::Item::update_widgets $_;
723 753
724 $::FLOORBOX->add (0, $row, $_->{face_widget}); 754 $::FLOORBOX->add (0, $row, $_->{face_widget});
725 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 755 $::FLOORBOX->add (1, $row, $_->{desc_widget});
726 756
727 $row++; 757 $row++;
728 } else { 758 } else {
729 $::FLOORBOX->add (1, $row, new CFClient::UI::Button 759 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
730 text => "More...", 760 text => "More...",
731 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 761 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
732 ); 762 );
733 last; 763 last;
734 } 764 }
735 } 765 }
736 if ($::CONN->{open_container}) { 766 if ($::CONN->{open_container}) {
737 $::FLOORBOX->add (1, $row++, new CFClient::UI::Button 767 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
738 text => "Close container", 768 text => "Close container",
739 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 769 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
740 ); 770 );
741 } 771 }
742 }); 772 });
… …
748 my ($conn, $tag, $name) = @_; 778 my ($conn, $tag, $name) = @_;
749 $conn->{open_container} = $tag; 779 $conn->{open_container} = $tag;
750 update_floorbox; 780 update_floorbox;
751 781
752 $::INV_RIGHT_HB->clear (); 782 $::INV_RIGHT_HB->clear ();
753 $::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name); 783 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
754 784
755 if ($tag != 0) { # Floor isn't closable, is it? 785 if ($tag != 0) { # Floor isn't closable, is it?
756 $::INV_RIGHT_HB->add (new CFClient::UI::Button 786 $::INV_RIGHT_HB->add (new CFPlus::UI::Button
757 text => "Close container", 787 text => "Close container",
758 tooltip => "Close the currently open container (if one is open)", 788 tooltip => "Close the currently open container (if one is open)",
759 on_activate => sub { 789 on_activate => sub {
760 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 790 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
761 if $tag != 0; 791 if $tag != 0;
… …
769} 799}
770 800
771sub update_containers { 801sub update_containers {
772 my ($self) = @_; 802 my ($self) = @_;
773 803
774 $CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub { 804 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub {
775 my $todo = delete $self->{update_container} 805 my $todo = delete $self->{update_container}
776 or return; 806 or return;
777 807
778 for my $tag (keys %$todo) { 808 for my $tag (keys %$todo) {
779 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 809 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
816sub item_update { 846sub item_update {
817 my ($self, $item) = @_; 847 my ($self, $item) = @_;
818 848
819 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
820 850
821 CFClient::Item::update_widgets $item; 851 CFPlus::Item::update_widgets $item;
822 852
823 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 853 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
824 set_opencont ($::CONN, 0, "Floor"); 854 set_opencont ($::CONN, 0, "Floor");
825 855
826 } elsif ($item->{flags} & F_OPEN) { 856 } elsif ($item->{flags} & F_OPEN) {
827 set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item); 857 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item);
828 858
829 } else { 859 } else {
830 $self->{update_container}{$item->{container}}++; 860 $self->{update_container}{$item->{container}}++;
831 $self->update_containers; 861 $self->update_containers;
832 } 862 }
833} 863}
834 864
835sub player_update { 865sub player_update {
836 my ($self, $player) = @_; 866 my ($self, $player) = @_;
867
868 $self->update_weight;
869}
870
871sub update_weight {
872 my ($self) = @_;
873
874 my $weight = .001 * $self->{player}{weight};
875 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
876
837 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000); 877 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
878 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
879 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
838} 880}
839 881
840sub update_server_info { 882sub update_server_info {
841 my ($self) = @_; 883 my ($self) = @_;
842 884
… …
845 $::SERVER_INFO->set_markup ( 887 $::SERVER_INFO->set_markup (
846 "server <tt>$self->{host}:$self->{port}</tt>\n" 888 "server <tt>$self->{host}:$self->{port}</tt>\n"
847 . "protocol version <tt>$self->{version}</tt>\n" 889 . "protocol version <tt>$self->{version}</tt>\n"
848 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 890 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
849 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 891 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
892 . "editing support $yesno[!!$self->{editor_support}]\n"
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
850 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
851 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
852 . "map size $self->{mapw}×$self->{maph}\n" 896 . "map size $self->{mapw}×$self->{maph}\n"
853 ); 897 );
898
899 ::setup_build_button ($self->{editor_support}->{builder_ui});
854} 900}
855 901
856sub logged_in { 902sub logged_in {
857 my ($self) = @_; 903 my ($self) = @_;
858 904
859 $self->send_ext_req (cfplus_support => "1", sub { 905 $self->send_ext_req (cfplus_support => version => 1, sub {
860 $self->{cfplus_ext} = $_[0]; 906 $self->{cfplus_ext} = $_[0]{version};
861 $self->update_server_info; 907 $self->update_server_info;
908
909 if ($self->{cfplus_ext} >= 2) {
910 $self->send_ext_req ("editor_support", sub {
911 $self->{editor_support} = $_[0];
912 $self->update_server_info;
913
914 0
915 });
916 }
917
918 0
862 }); 919 });
863 920
864 $self->update_server_info; 921 $self->update_server_info;
865 922
866 $self->send_command ("output-sync $::CFG->{output_sync}"); 923 $self->send_command ("output-sync $::CFG->{output_sync}");
867 $self->send_command ("output-count $::CFG->{output_count}"); 924 $self->send_command ("output-count $::CFG->{output_count}");
925 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
868 $self->send_command ("pickup $::CFG->{pickup}"); 926 $self->send_command ("pickup $::CFG->{pickup}");
927}
928
929sub buildat {
930 my ($self, $builditem, $x, $y) = @_;
931
932 if ($self->{cfplus_ext}) {
933 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
934 }
869} 935}
870 936
871sub lookat { 937sub lookat {
872 my ($self, $x, $y) = @_; 938 my ($self, $x, $y) = @_;
873 939
874 if ($self->{cfplus_ext}) { 940 if ($self->{cfplus_ext}) {
875 $self->send_ext_req (lookat => "$x $y", sub { 941 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
876 my %res = split /\x00/, $_[0]; 942 my ($msg) = @_;
877 943
878 if (exists $res{npc_dialog}) { 944 if (exists $msg->{npc_dialog}) {
879 # start npc chat dialog 945 # start npc chat dialog
880 $self->{npc_dialog} = new CFClient::NPCDialog:: 946 $self->{npc_dialog} = new CFPlus::NPCDialog::
881 dx => $x, 947 dx => $x,
882 dy => $y, 948 dy => $y,
883 title => "$res{npc_dialog} (NPC)", 949 title => "$msg->{npc_dialog} (NPC)",
884 conn => $self, 950 conn => $self,
885 ; 951 ;
886 } 952 }
887 }); 953 });
888 } 954 }
… …
891} 957}
892 958
893sub destroy { 959sub destroy {
894 my ($self) = @_; 960 my ($self) = @_;
895 961
896 $self->{npc_dialog}->destroy 962 (delete $self->{npc_dialog})->destroy
897 if $self->{npc_dialog}; 963 if $self->{npc_dialog};
898 964
899 $self->SUPER::destroy; 965 $self->SUPER::destroy;
900} 966}
901 967
902package CFClient::NPCDialog; 968package CFPlus::NPCDialog;
903 969
904our @ISA = 'CFClient::UI::FancyFrame'; 970our @ISA = 'CFPlus::UI::Toplevel';
905 971
906sub new { 972sub new {
907 my $class = shift; 973 my $class = shift;
908 974
909 my $self = $class->SUPER::new ( 975 my $self = $class->SUPER::new (
… …
912 name => "npc_dialog", 978 name => "npc_dialog",
913 force_w => $::WIDTH * 0.7, 979 force_w => $::WIDTH * 0.7,
914 force_h => $::HEIGHT * 0.7, 980 force_h => $::HEIGHT * 0.7,
915 title => "NPC Dialog", 981 title => "NPC Dialog",
916 kw => { hi => 0, yes => 0, no => 0 }, 982 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1,
917 @_, 984 @_,
918 ); 985 );
919 986
920 Scalar::Util::weaken (my $this = $self); 987 CFPlus::weaken (my $this = $self);
988
989 $self->connect (delete => sub { $this->destroy; 1 });
921 990
922 # better use a pane... 991 # better use a pane...
923 $self->add (my $hbox = new CFClient::UI::HBox); 992 $self->add (my $hbox = new CFPlus::UI::HBox);
924 $hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1); 993 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1);
925 994
926 $hbox->add (my $vbox = new CFClient::UI::VBox); 995 $hbox->add (my $vbox = new CFPlus::UI::VBox);
927 996
928 $vbox->add (new CFClient::UI::Label text => "Message Entry:"); 997 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
929 $vbox->add ($self->{entry} = new CFClient::UI::Entry 998 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
930 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 999 tooltip => "#npc_message_entry",
931 . "Sometimes you have to tell an NPC something you cannot find out during "
932 . "a normal conversation (such as a password). In those cases you have to use "
933 . "this text entry. You can also enter responses manually instead of using the response "
934 . "buttons below.",
935 on_activate => sub { 1000 on_activate => sub {
936 my ($entry, $text) = @_; 1001 my ($entry, $text) = @_;
937 1002
938 return unless $text =~ /\S/; 1003 return unless $text =~ /\S/;
939 1004
… …
942 1007
943 0 1008 0
944 }, 1009 },
945 ); 1010 );
946 1011
947 $vbox->add ($self->{options} = new CFClient::UI::VBox); 1012 $vbox->add ($self->{options} = new CFPlus::UI::VBox);
948 1013
949 $self->{bye_button} = new CFClient::UI::Button 1014 $self->{bye_button} = new CFPlus::UI::Button
950 text => "Bye (close)", 1015 text => "Bye (close)",
951 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1016 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
952 on_activate => sub { $this->destroy; 0 }, 1017 on_activate => sub { $this->destroy; 1 },
953 ; 1018 ;
954 1019
955 $self->update_options; 1020 $self->update_options;
956 1021
957 $self->{token} = $self->{conn}->ext_token; 1022 $self->{id} = $self->{conn}->send_ext_req (
958 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1023 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
959 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1024 sub { $this && $this->feed (@_) }
1025 );
960 1026
961 $self->{entry}->grab_focus; 1027 $self->{entry}->grab_focus;
962 1028
963 $self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n"); 1029 $self->{textview}->add_paragraph ({
1030 fg => [1, 1, 0, 1],
1031 markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
1032 });
964 1033
965 $self->show; 1034 $self->show;
966 $self 1035 $self
967}; 1036};
968 1037
969sub update_options { 1038sub update_options {
970 my ($self) = @_; 1039 my ($self) = @_;
971 1040
972 Scalar::Util::weaken $self; 1041 CFPlus::weaken $self;
973 1042
974 $self->{options}->clear; 1043 $self->{options}->clear;
975 $self->{options}->add ($self->{bye_button}); 1044 $self->{options}->add ($self->{bye_button});
976 1045
977 for my $kw (sort keys %{ $self->{kw} }) { 1046 for my $kw (sort keys %{ $self->{kw} }) {
978 $self->{options}->add (new CFClient::UI::Button 1047 $self->{options}->add (new CFPlus::UI::Button
979 text => $kw, 1048 text => $kw,
980 on_activate => sub { 1049 on_activate => sub {
981 $self->send ($kw); 1050 $self->send ($kw);
982 0 1051 0
983 }, 1052 },
984 ); 1053 );
985 } 1054 }
986} 1055}
987 1056
988sub feed { 1057sub feed {
989 my ($self, $data) = @_; 1058 my ($self, $msg) = @_;
990 1059
991 Scalar::Util::weaken $self; 1060 CFPlus::weaken $self;
992 1061
993 my ($type, $msg) = split / /, $data, 2; 1062 if ($msg->{msgtype} eq "reply") {
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
994 1065
995 if ($type eq "msg") { 1066 my $text = "\n" . CFPlus::asxml $msg->{msg};
996 my ($msg, @kw) = split /\x00/, $msg;
997
998 utf8::decode $_ for ($msg, @kw);
999
1000 $self->{kw}{$_} = 1 for @kw;
1001
1002 $msg = "\n" . CFClient::UI::Label::escape $msg;
1003 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1067 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1004 my @link; 1068 my @link;
1005 $msg =~ s{ 1069 $text =~ s{
1006 ($match) 1070 ($match)
1007 }{ 1071 }{
1008 my $kw = $1; 1072 my $kw = $1;
1009 1073
1010 push @link, new CFClient::UI::Label 1074 push @link, new CFPlus::UI::Label
1011 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>", 1075 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1012 can_hover => 1, 1076 can_hover => 1,
1013 can_events => 1, 1077 can_events => 1,
1014 padding_x => 0, 1078 padding_x => 0,
1015 padding_y => 0, 1079 padding_y => 0,
1016 on_button_up => sub { 1080 on_button_up => sub {
1017 $self->send ($kw); 1081 $self->send ($kw);
1018 }; 1082 };
1019 1083
1020 chr 0xfffc 1084 "\x{fffc}"
1021 }giex; 1085 }giex;
1022 1086
1023 $self->{textview}->add_paragraph ([1, 1, 1, 1], [$msg, @link]); 1087 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1024 $self->{textview}->scroll_to_bottom; 1088 $self->{textview}->scroll_to_bottom;
1025 $self->update_options; 1089 $self->update_options;
1026 } else { 1090 } else {
1027 $self->destroy; 1091 $self->destroy;
1028 } 1092 }
… …
1031} 1095}
1032 1096
1033sub send { 1097sub send {
1034 my ($self, $msg) = @_; 1098 my ($self, $msg) = @_;
1035 1099
1036 $self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg); 1100 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1037 $self->{textview}->scroll_to_bottom; 1101 $self->{textview}->scroll_to_bottom;
1038 1102
1039 utf8::encode $msg; 1103 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1040 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1041} 1104}
1042 1105
1043sub destroy { 1106sub destroy {
1044 my ($self) = @_; 1107 my ($self) = @_;
1045 1108
1046 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1109 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1047 1110
1111 if ($self->{conn}) {
1048 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1112 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1049 delete $self->{conn}{npc_dialog}; 1113 delete $self->{conn}{npc_dialog};
1050 $self->{conn}->disconnect_ext ($self->{token}); 1114 $self->{conn}->disconnect_ext ($self->{id});
1115 }
1051 1116
1052 $self->SUPER::destroy; 1117 $self->SUPER::destroy;
1053} 1118}
1054 1119
10551; 11201
1121

Diff Legend

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