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.90 by root, Wed Dec 6 00:15:12 2006 UTC vs.
Revision 1.104 by root, Mon Apr 23 19:22:24 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
11 14
12use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
13 16
14use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
15 18
16sub new { 19sub new {
17 my $class = shift; 20 my ($class, %arg) = @_;
18 21
19 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
20 29
21 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
22 31
23 my @cmd_help = map { 32 my @cmd_help = map {
24 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
35 for @args; 44 for @args;
36 45
37 map ["$cmd$_", $text], 46 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
39 @args 48 @args
40 } sort { $a->{par} <=> $b->{par} } 49 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 50 CFPlus::Pod::find command => "*";
42 51
52 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_;
54
55 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
66 }
67 });
68
43 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 70 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 71
49 { 72 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 76 }
54 77
78 {
79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82 }
83
55 $self->{open_container} = 0; 84 $self->{open_container} = 0;
56 85
57 # "global"
58 $self->{tilecache} = CFPlus::db_table "tilecache"
59 or die "tilecache: unable to open database table";
60 $self->{facemap} = CFPlus::db_table "facemap"
61 or die "facemap: unable to open database table";
62
63 # per server 86 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 88
67 $self 89 $self
68} 90}
69 91
70sub logprint { 92sub logprint {
… …
291 $::CONN->user_send ("use_skill $name"); 313 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 314 } elsif ($ev->{button} == 3) {
293 my $shortname = CFPlus::shorten $name, 14; 315 my $shortname = CFPlus::shorten $name, 14;
294 (new CFPlus::UI::Menu 316 (new CFPlus::UI::Menu
295 items => [ 317 items => [
296 ["bind <i>ready_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 318 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
297 ["bind <i>use_skill $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 319 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
298 ], 320 ],
299 )->popup ($ev); 321 )->popup ($ev);
300 } else { 322 } else {
301 return 0; 323 return 0;
302 } 324 }
… …
319 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
320 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
321 } 343 }
322} 344}
323 345
346sub macro_send {
347 my ($self, $macro) = @_;
348
349 for my $cmd (@{ $macro->{action} }) {
350 $self->send_command ($cmd);
351 }
352}
353
324sub user_send { 354sub user_send {
325 my ($self, $command) = @_; 355 my ($self, $command) = @_;
326 356
327 push @{$self->{record}}, $command 357 $self->{record}->($command)
328 if $self->{record}; 358 if $self->{record};
329 359
330 $self->logprint ("send: ", $command); 360 $self->logprint ("send: ", $command);
331 $self->send_command ($command); 361 $self->send_command ($command);
332 ::status ($command); 362 ::status ($command);
333} 363}
334 364
335sub start_record { 365sub record {
336 my ($self) = @_; 366 my ($self, $cb) = @_;
337 367
338 $self->{record} = []; 368 $self->{record} = $cb;
339}
340
341sub stop_record {
342 my ($self) = @_;
343 return delete $self->{record};
344} 369}
345 370
346sub map_scroll { 371sub map_scroll {
347 my ($self, $dx, $dy) = @_; 372 my ($self, $dx, $dy) = @_;
348 373
… …
369 or return; 394 or return;
370 395
371 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
372 397
373 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
374 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
375 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
376} 401}
377 402
378sub map_clear { 403sub map_clear {
379 my ($self) = @_; 404 my ($self) = @_;
… …
383 408
384 $self->{map}->clear; 409 $self->{map}->clear;
385 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
386} 411}
387 412
413sub bg_fetch {
414 my ($self) = @_;
415
416 my $id;
417
418 do {
419 $id = pop @{$self->{bg_fetch}}
420 or return;
421 } while $self->{texture}[$id];
422
423 CFPlus::DB::get tilecache => $id, sub {
424 my ($data) = @_;
425
426 return unless $self->{map}; # stop when destroyed
427
428 $self->set_texture ($id => $data)
429 if defined $data;
430
431 $self->bg_fetch;
432 };
433}
388 434
389sub load_map($$$) { 435sub load_map($$$) {
390 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
391 437
392 if (defined (my $data = $self->{mapcache}->get ($hash))) { 438 my $gen = $self->{map_change_gen};
439
440 CFPlus::DB::get $self->{mapcache} => $hash, sub {
441 return unless $gen == $self->{map_change_gen};
442
443 my ($data) = @_;
444
445 if (defined $data) {
393 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
394 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 447 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
395 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
396 my $data = $self->{tilecache}->get ($id)
397 or next;
398 448
399 $self->set_texture ($id => $data); 449 my $inprogress = @{ $self->{bg_fetch} || [] };
450 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451 $self->bg_fetch unless $inprogress;
400 } 452 }
401 } 453 };
402} 454}
403 455
404# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
405# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
406# the right fix is to make real tiled maps with an overview file 458# the right fix is to make real tiled maps with an overview file
… …
470 522
471 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
472 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
473 525
474 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
475 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
476 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
477 532
478 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
479 534
480 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
494 549
495sub map_change { 550sub map_change {
496 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
497 552
498 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
499 556
500 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
501 558
502 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
503 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
520 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
521 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
522} 579}
523 580
524sub face_find { 581sub face_find {
525 my ($self, $facenum, $face) = @_; 582 my ($self, $facenum, $face, $cb) = @_;
526 583
527 my $hash = "$face->{chksum},$face->{name}"; 584 my $hash = "$face->{chksum},$face->{name}";
528 585
529 my $id = $self->{facemap}->get ($hash); 586 my $id = CFPlus::DB::get_tile_id_sync $hash;
530 587
531 unless ($id) {
532 # create new id for face
533 # I love transactions
534 for (1..100) {
535 my $txn = $CFPlus::DB_ENV->txn_begin;
536 my $status = $self->{facemap}->db_get (id => $id);
537 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
538 $id = ($id || 64) + 1;
539 if ($self->{facemap}->put (id => $id) == 0
540 && $self->{facemap}->put ($hash => $id) == 0) {
541 $txn->txn_commit;
542
543 goto gotid;
544 }
545 }
546 $txn->txn_abort;
547 }
548
549 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
550 }
551
552gotid:
553 $face->{id} = $id; 588 $face->{id} = $id;
554 $self->{map}->set_face ($facenum => $id);
555 $self->{faceid}[$facenum] = $id;#d# 589 $self->{faceid}[$facenum] = $id;
556 590
557 my $face = $self->{tilecache}->get ($id); 591 $self->{map}->set_tileid ($facenum => $id);
558 592
559 if ($face) { 593 CFPlus::DB::get tilecache => $id, $cb;
560 #$self->face_prefetch;
561 $face
562 } else {
563 my $tex = $self->{noface};
564 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
565 undef
566 };
567} 594}
568 595
569sub face_update { 596sub face_update {
570 my ($self, $facenum, $face, $changed) = @_; 597 my ($self, $facenum, $face, $changed) = @_;
571 598
572 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
600 if $changed;
573 601
574 $self->set_texture ($face->{id} => delete $face->{image}); 602 $self->set_texture ($face->{id} => delete $face->{image});
603}
604
605sub smooth_update {
606 my ($self, $facenum, $face) = @_;
607
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
575} 609}
576 610
577sub set_texture { 611sub set_texture {
578 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
579 613
580 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
581 my $tex =
582 new_from_image CFPlus::Texture 615 new_from_image CFPlus::Texture
583 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
584 617
585 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
586 $self->{map_widget}->update; 619 $self->{map_widget}->update;
587
588 $tex
589 };
590} 620}
591 621
592sub sound_play { 622sub sound_play {
593 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
594 624
… …
604 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
605 635
606 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
607} 637}
608 638
639our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
643 [1.00, 0.00, 0.00],
644 [1.00, 0.54, 0.00],
645 [0.11, 0.56, 1.00],
646 [0.93, 0.46, 0.00],
647 [0.18, 0.54, 0.34],
648 [0.56, 0.73, 0.56],
649 [0.80, 0.80, 0.80],
650 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41],
653);
654
609sub drawinfo { 655sub drawinfo {
610 my ($self, $color, $text) = @_; 656 my ($self, $color, $text) = @_;
611 657
612 my @color = ( 658 my $fg = $CF_COLOR[$color % @CF_COLOR];
613 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
614 [1.00, 1.00, 1.00],
615 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
616 [1.00, 0.00, 0.00],
617 [1.00, 0.54, 0.00],
618 [0.11, 0.56, 1.00],
619 [0.93, 0.46, 0.00],
620 [0.18, 0.54, 0.34],
621 [0.56, 0.73, 0.56],
622 [0.80, 0.80, 0.80],
623 [0.75, 0.61, 0.20],
624 [0.99, 0.77, 0.26],
625 [0.74, 0.65, 0.41],
626 );
627 659
628 $self->logprint ("info: ", $text); 660 $self->logprint ("info: ", $text);
629 661
630 # try to create single paragraphs of multiple lines sent by the server 662 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers
631 $text =~ s/(?<=\S)\n(?=\w)/ /g; 664 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
632 665
633 $text = CFPlus::asxml $text; 666 $text = CFPlus::asxml $text;
634 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
635 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
636 669
637 ::message ({ fg => $color[$color], markup => $_ }) 670 ::message ({ fg => $fg, markup => $_ })
638 for split /\n/, $text; 671 for split /\n/, $text;
639 672
640 $self->{statusbox}->add ($text, 673 $self->{statusbox}->add ($text,
641 group => $text, 674 group => $text,
642 fg => $color[$color], 675 fg => $fg,
643 timeout => $color >= 2 ? 180 : 10, 676 timeout => $color >= 2 ? 180 : 10,
644 tooltip_font => $::FONT_FIXED, 677 tooltip_font => $::FONT_FIXED,
645 ); 678 );
646} 679}
647 680
… …
672} 705}
673 706
674sub setup { 707sub setup {
675 my ($self, $setup) = @_; 708 my ($self, $setup) = @_;
676 709
710 $self->{map_widget}->set_tilesize ($self->{tilesize});
677 $::MAP->resize ($self->{mapw}, $self->{maph}); 711 $::MAP->resize ($self->{mapw}, $self->{maph});
678} 712}
679 713
680sub addme_success { 714sub addme_success {
681 my ($self) = @_; 715 my ($self) = @_;
… …
888 $::SERVER_INFO->set_markup ( 922 $::SERVER_INFO->set_markup (
889 "server <tt>$self->{host}:$self->{port}</tt>\n" 923 "server <tt>$self->{host}:$self->{port}</tt>\n"
890 . "protocol version <tt>$self->{version}</tt>\n" 924 . "protocol version <tt>$self->{version}</tt>\n"
891 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 925 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
892 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 926 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
927 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
893 . "editing support $yesno[!!$self->{editor_support}]\n" 928 . "editing support $yesno[!!$self->{editor_support}]\n"
894 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 929 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
930 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
895 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 931 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
896 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 932 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
897 . "map size $self->{mapw}×$self->{maph}\n" 933 . "map size $self->{mapw}×$self->{maph}\n"
898 ); 934 );
899 935
… …
921 957
922 $self->update_server_info; 958 $self->update_server_info;
923 959
924 $self->send_command ("output-sync $::CFG->{output_sync}"); 960 $self->send_command ("output-sync $::CFG->{output_sync}");
925 $self->send_command ("output-count $::CFG->{output_count}"); 961 $self->send_command ("output-count $::CFG->{output_count}");
962 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
926 $self->send_command ("pickup $::CFG->{pickup}"); 963 $self->send_command ("pickup $::CFG->{pickup}");
927} 964}
928 965
929sub buildat { 966sub buildat {
930 my ($self, $builditem, $x, $y) = @_; 967 my ($self, $builditem, $x, $y) = @_;
… …
982 kw => { hi => 0, yes => 0, no => 0 }, 1019 kw => { hi => 0, yes => 0, no => 0 },
983 has_close_button => 1, 1020 has_close_button => 1,
984 @_, 1021 @_,
985 ); 1022 );
986 1023
987 Scalar::Util::weaken (my $this = $self); 1024 CFPlus::weaken (my $this = $self);
988 1025
989 $self->connect (delete => sub { $this->destroy; 1 }); 1026 $self->connect (delete => sub { $this->destroy; 1 });
990 1027
991 # better use a pane... 1028 # better use a pane...
992 $self->add (my $hbox = new CFPlus::UI::HBox); 1029 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1036}; 1073};
1037 1074
1038sub update_options { 1075sub update_options {
1039 my ($self) = @_; 1076 my ($self) = @_;
1040 1077
1041 Scalar::Util::weaken $self; 1078 CFPlus::weaken $self;
1042 1079
1043 $self->{options}->clear; 1080 $self->{options}->clear;
1044 $self->{options}->add ($self->{bye_button}); 1081 $self->{options}->add ($self->{bye_button});
1045 1082
1046 for my $kw (sort keys %{ $self->{kw} }) { 1083 for my $kw (sort keys %{ $self->{kw} }) {
… …
1055} 1092}
1056 1093
1057sub feed { 1094sub feed {
1058 my ($self, $msg) = @_; 1095 my ($self, $msg) = @_;
1059 1096
1060 Scalar::Util::weaken $self; 1097 CFPlus::weaken $self;
1061 1098
1062 if ($msg->{msgtype} eq "reply") { 1099 if ($msg->{msgtype} eq "reply") {
1063 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1064 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1065 1102

Diff Legend

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