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.78 by elmex, Mon Aug 14 14:35:31 2006 UTC vs.
Revision 1.97 by root, Fri Apr 6 08:09:43 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;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my $class = shift;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });
18 23
19 $self->{map_widget}->clr_commands; 24 $self->{map_widget}->clr_commands;
20 25
21 my @cmd_help = map { 26 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 27 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 38 for @args;
34 39
35 map ["$cmd$_", $text], 40 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 41 sort { (length $a) <=> (length $b) }
37 @args 42 @args
38 } sort { $a->{par} <=> $b->{par} } 43 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 44 CFPlus::Pod::find command => "*";
40 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 }
60 }
61 });
62
41 $self->{map_widget}->add_command (@$_) 63 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 64 for @cmd_help;
43 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 {
44 $self->{noface} = new_from_file CFPlus::Texture 73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::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 }
46 77
47 $self->{open_container} = 0; 78 $self->{open_container} = 0;
48 79
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache";
51 $self->{facemap} = CFPlus::db_table "facemap";
52
53 # per server 80 # per server
54 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
55 82
56 $self 83 $self
57} 84}
58 85
59sub logprint { 86sub logprint {
60 my ($self, @a) = @_; 87 my ($self, @a) = @_;
61 88
62 return;
63 $self->{log_fh} ||= do { 89 $self->{log_fh} ||= do {
64 my $path = "$Crossfire::VARDIR/log.$self->{host}"; 90 my $path = "$Crossfire::VARDIR/log.$self->{host}";
65 91
66 open my $fh, ">>:utf8", $path 92 open my $fh, ">>:utf8", $path
67 or die "Couldn't open logfile $path: $!"; 93 or die "Couldn't open logfile $path: $!";
… …
278 if ($ev->{button} == 1) { 304 if ($ev->{button} == 1) {
279 $::CONN->user_send ("ready_skill $name"); 305 $::CONN->user_send ("ready_skill $name");
280 } elsif ($ev->{button} == 2) { 306 } elsif ($ev->{button} == 2) {
281 $::CONN->user_send ("use_skill $name"); 307 $::CONN->user_send ("use_skill $name");
282 } elsif ($ev->{button} == 3) { 308 } elsif ($ev->{button} == 3) {
309 my $shortname = CFPlus::shorten $name, 14;
283 (new CFPlus::UI::Menu 310 (new CFPlus::UI::Menu
284 items => [ 311 items => [
285 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 312 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
286 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 313 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
287 ], 314 ],
288 )->popup ($ev); 315 )->popup ($ev);
289 } else { 316 } else {
290 return 0; 317 return 0;
291 } 318 }
… …
308 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
309 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
310 } 337 }
311} 338}
312 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
313sub user_send { 348sub user_send {
314 my ($self, $command) = @_; 349 my ($self, $command) = @_;
315 350
351 $self->{record}->($command)
316 if ($self->{record}) { 352 if $self->{record};
317 push @{$self->{record}}, $command;
318 }
319 353
320 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
321 $self->send_command ($command); 355 $self->send_command ($command);
322 ::status ($command); 356 ::status ($command);
323} 357}
324 358
325sub start_record { 359sub record {
326 my ($self) = @_; 360 my ($self, $cb) = @_;
327 361
328 $self->{record} = []; 362 $self->{record} = $cb;
329}
330
331sub stop_record {
332 my ($self) = @_;
333 return delete $self->{record};
334} 363}
335 364
336sub map_scroll { 365sub map_scroll {
337 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
338 367
… …
340} 369}
341 370
342sub feed_map1a { 371sub feed_map1a {
343 my ($self, $data) = @_; 372 my ($self, $data) = @_;
344 373
345 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
346 $self->{map_widget}->update; 375 $self->{map_widget}->update;
347} 376}
348 377
349sub magicmap { 378sub magicmap {
350 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
359 or return; 388 or return;
360 389
361 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
362 391
363 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
364 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
365 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
366} 395}
367 396
368sub map_clear { 397sub map_clear {
369 my ($self) = @_; 398 my ($self) = @_;
… …
373 402
374 $self->{map}->clear; 403 $self->{map}->clear;
375 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
376} 405}
377 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 $self->set_texture ($id => $data)
421 if defined $data;
422
423 $self->bg_fetch;
424 };
425}
378 426
379sub load_map($$$) { 427sub load_map($$$) {
380 my ($self, $hash, $x, $y) = @_; 428 my ($self, $hash, $x, $y) = @_;
381 429
382 if (defined (my $data = $self->{mapcache}->get ($hash))) { 430 CFPlus::DB::get $self->{mapcache} => $hash, sub {
431 my ($data) = @_;
432
433 if (defined $data) {
383 $data = Compress::LZF::decompress $data; 434 $data = Compress::LZF::decompress $data;
384 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 435 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
385 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
386 my $data = $self->{tilecache}->get ($id)
387 or next;
388 436
389 $self->set_texture ($id => $data); 437 my $inprogress = @{ $self->{bg_fetch} || [] };
438 push @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
439 $self->bg_fetch unless $inprogress;
390 } 440 }
391 } 441 };
392} 442}
393 443
394# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 444# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
395# (server resource,s latency, bandwidth), so this hack is warranted. 445# (server resource,s latency, bandwidth), so this hack is warranted.
396# the right fix is to make real tiled maps with an overview file 446# the right fix is to make real tiled maps with an overview file
… …
510 $self->load_map ($hash, $x, $y); 560 $self->load_map ($hash, $x, $y);
511 $self->flood_fill (0, 0, 0, "", $hash, $flags); 561 $self->flood_fill (0, 0, 0, "", $hash, $flags);
512} 562}
513 563
514sub face_find { 564sub face_find {
515 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $cb) = @_;
516 566
517 my $hash = "$face->{chksum},$face->{name}"; 567 my $hash = "$face->{chksum},$face->{name}";
518 568
519 my $id = $self->{facemap}->get ($hash); 569 my $id = CFPlus::DB::get_tile_id_sync $hash;
520 570
521 unless ($id) {
522 # create new id for face
523 # I love transactions
524 for (1..100) {
525 my $txn = $CFPlus::DB_ENV->txn_begin;
526 my $status = $self->{facemap}->db_get (id => $id);
527 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
528 $id = ($id || 64) + 1;
529 if ($self->{facemap}->put (id => $id) == 0
530 && $self->{facemap}->put ($hash => $id) == 0) {
531 $txn->txn_commit;
532
533 goto gotid;
534 }
535 }
536 $txn->txn_abort;
537 }
538
539 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
540 }
541
542gotid:
543 $face->{id} = $id; 571 $face->{id} = $id;
544 $self->{map}->set_face ($facenum => $id);
545 $self->{faceid}[$facenum] = $id;#d# 572 $self->{faceid}[$facenum] = $id;
546 573
547 my $face = $self->{tilecache}->get ($id); 574 $self->{map}->set_tileid ($facenum => $id);
548 575
549 if ($face) { 576 CFPlus::DB::get tilecache => $id, $cb;
550 #$self->face_prefetch;
551 $face
552 } else {
553 my $tex = $self->{noface};
554 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
555 undef
556 };
557} 577}
558 578
559sub face_update { 579sub face_update {
560 my ($self, $facenum, $face, $changed) = @_; 580 my ($self, $facenum, $face, $changed) = @_;
561 581
562 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 582 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
583 if $changed;
563 584
564 $self->set_texture ($face->{id} => delete $face->{image}); 585 $self->set_texture ($face->{id} => delete $face->{image});
565} 586}
566 587
567sub set_texture { 588sub set_texture {
… …
613 [0.75, 0.61, 0.20], 634 [0.75, 0.61, 0.20],
614 [0.99, 0.77, 0.26], 635 [0.99, 0.77, 0.26],
615 [0.74, 0.65, 0.41], 636 [0.74, 0.65, 0.41],
616 ); 637 );
617 638
639 my $fg = $color[$color % @color];
640
618 $self->logprint ("info: ", $text); 641 $self->logprint ("info: ", $text);
619
620 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
621 642
622 # try to create single paragraphs of multiple lines sent by the server 643 # try to create single paragraphs of multiple lines sent by the server
623 $text =~ s/(?<=\S)\n(?=\w)/ /g; 644 $text =~ s/(?<=\S)\n(?=\w)/ /g;
624 645
625 $text = CFPlus::asxml $text; 646 $text = CFPlus::asxml $text;
626 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
627 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
628 649
629 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 650 ::message ({ fg => $fg, markup => $_ })
630 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 651 for split /\n/, $text;
631 $self->{logview}->scroll_to_bottom;
632 652
633 $self->{statusbox}->add ($text, 653 $self->{statusbox}->add ($text,
634 group => $text, 654 group => $text,
635 fg => $color[$color], 655 fg => $fg,
636 timeout => $color >= 2 ? 180 : 10, 656 timeout => $color >= 2 ? 180 : 10,
637 tooltip_font => $::FONT_FIXED, 657 tooltip_font => $::FONT_FIXED,
638 ); 658 );
639} 659}
640 660
… …
650 # try to create single paragraphs out of the multiple lines sent by the server 670 # try to create single paragraphs out of the multiple lines sent by the server
651 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 671 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
652 $spell->{message} =~ s/\n+$//; 672 $spell->{message} =~ s/\n+$//;
653 $spell->{message} ||= "Server did not provide a description for this spell."; 673 $spell->{message} ||= "Server did not provide a description for this spell.";
654 674
655 $::SPELL_PAGE->add_spell ($spell); 675 $::SPELL_LIST->add_spell ($spell);
656 676
657 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 677 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
658 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 678 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
659} 679}
660 680
661sub spell_delete { 681sub spell_delete {
662 my ($self, $spell) = @_; 682 my ($self, $spell) = @_;
663 683
664 $::SPELL_PAGE->remove_spell ($spell); 684 $::SPELL_LIST->remove_spell ($spell);
685}
686
687sub setup {
688 my ($self, $setup) = @_;
689
690 $self->{map_widget}->set_tilesize ($self->{tilesize});
691 $::MAP->resize ($self->{mapw}, $self->{maph});
665} 692}
666 693
667sub addme_success { 694sub addme_success {
668 my ($self) = @_; 695 my ($self) = @_;
669 696
… …
875 $::SERVER_INFO->set_markup ( 902 $::SERVER_INFO->set_markup (
876 "server <tt>$self->{host}:$self->{port}</tt>\n" 903 "server <tt>$self->{host}:$self->{port}</tt>\n"
877 . "protocol version <tt>$self->{version}</tt>\n" 904 . "protocol version <tt>$self->{version}</tt>\n"
878 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 905 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
879 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 906 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
907 . "editing support $yesno[!!$self->{editor_support}]\n"
908 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
880 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
881 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
882 . "map size $self->{mapw}×$self->{maph}\n" 911 . "map size $self->{mapw}×$self->{maph}\n"
883 ); 912 );
913
914 ::setup_build_button ($self->{editor_support}->{builder_ui});
884} 915}
885 916
886sub logged_in { 917sub logged_in {
887 my ($self) = @_; 918 my ($self) = @_;
888 919
889 $self->send_ext_req (cfplus_support => version => 1, sub { 920 $self->send_ext_req (cfplus_support => version => 1, sub {
890 $self->{cfplus_ext} = $_[0]{version}; 921 $self->{cfplus_ext} = $_[0]{version};
891 $self->update_server_info; 922 $self->update_server_info;
892 923
924 if ($self->{cfplus_ext} >= 2) {
925 $self->send_ext_req ("editor_support", sub {
926 $self->{editor_support} = $_[0];
927 $self->update_server_info;
928
929 0
930 });
931 }
932
893 0 933 0
894 }); 934 });
895 935
896 $self->update_server_info; 936 $self->update_server_info;
897 937
898 $self->send_command ("output-sync $::CFG->{output_sync}"); 938 $self->send_command ("output-sync $::CFG->{output_sync}");
899 $self->send_command ("output-count $::CFG->{output_count}"); 939 $self->send_command ("output-count $::CFG->{output_count}");
940 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
900 $self->send_command ("pickup $::CFG->{pickup}"); 941 $self->send_command ("pickup $::CFG->{pickup}");
942}
943
944sub buildat {
945 my ($self, $builditem, $x, $y) = @_;
946
947 if ($self->{cfplus_ext}) {
948 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
949 }
901} 950}
902 951
903sub lookat { 952sub lookat {
904 my ($self, $x, $y) = @_; 953 my ($self, $x, $y) = @_;
905 954
… …
923} 972}
924 973
925sub destroy { 974sub destroy {
926 my ($self) = @_; 975 my ($self) = @_;
927 976
928 $self->{npc_dialog}->destroy 977 (delete $self->{npc_dialog})->destroy
929 if $self->{npc_dialog}; 978 if $self->{npc_dialog};
930 979
931 $self->SUPER::destroy; 980 $self->SUPER::destroy;
932} 981}
933 982
… …
948 kw => { hi => 0, yes => 0, no => 0 }, 997 kw => { hi => 0, yes => 0, no => 0 },
949 has_close_button => 1, 998 has_close_button => 1,
950 @_, 999 @_,
951 ); 1000 );
952 1001
953 Scalar::Util::weaken (my $this = $self); 1002 CFPlus::weaken (my $this = $self);
954 1003
955 $self->connect (delete => sub { $this->destroy; 1 }); 1004 $self->connect (delete => sub { $this->destroy; 1 });
956 1005
957 # better use a pane... 1006 # better use a pane...
958 $self->add (my $hbox = new CFPlus::UI::HBox); 1007 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1002}; 1051};
1003 1052
1004sub update_options { 1053sub update_options {
1005 my ($self) = @_; 1054 my ($self) = @_;
1006 1055
1007 Scalar::Util::weaken $self; 1056 CFPlus::weaken $self;
1008 1057
1009 $self->{options}->clear; 1058 $self->{options}->clear;
1010 $self->{options}->add ($self->{bye_button}); 1059 $self->{options}->add ($self->{bye_button});
1011 1060
1012 for my $kw (sort keys %{ $self->{kw} }) { 1061 for my $kw (sort keys %{ $self->{kw} }) {
… …
1021} 1070}
1022 1071
1023sub feed { 1072sub feed {
1024 my ($self, $msg) = @_; 1073 my ($self, $msg) = @_;
1025 1074
1026 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1027 1076
1028 if ($msg->{msgtype} eq "reply") { 1077 if ($msg->{msgtype} eq "reply") {
1029 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1030 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1031 1080
… …
1082 1131
1083 $self->SUPER::destroy; 1132 $self->SUPER::destroy;
1084} 1133}
1085 1134
10861 11351
1136

Diff Legend

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