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.74 by root, Sun Aug 13 18:48:56 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_help => "*"; 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 {
… …
277 if ($ev->{button} == 1) { 304 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 305 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 306 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 307 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 308 } elsif ($ev->{button} == 3) {
309 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 310 (new CFPlus::UI::Menu
283 items => [ 311 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 314 ],
287 )->popup ($ev); 315 )->popup ($ev);
288 } else { 316 } else {
289 return 0; 317 return 0;
290 } 318 }
… …
307 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
308 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
309 } 337 }
310} 338}
311 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
312sub user_send { 348sub user_send {
313 my ($self, $command) = @_; 349 my ($self, $command) = @_;
314 350
351 $self->{record}->($command)
315 if ($self->{record}) { 352 if $self->{record};
316 push @{$self->{record}}, $command;
317 }
318 353
319 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
320 $self->send_command ($command); 355 $self->send_command ($command);
321 ::status ($command); 356 ::status ($command);
322} 357}
323 358
324sub start_record { 359sub record {
325 my ($self) = @_; 360 my ($self, $cb) = @_;
326 361
327 $self->{record} = []; 362 $self->{record} = $cb;
328}
329
330sub stop_record {
331 my ($self) = @_;
332 return delete $self->{record};
333} 363}
334 364
335sub map_scroll { 365sub map_scroll {
336 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
337 367
… …
339} 369}
340 370
341sub feed_map1a { 371sub feed_map1a {
342 my ($self, $data) = @_; 372 my ($self, $data) = @_;
343 373
344 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
345 $self->{map_widget}->update; 375 $self->{map_widget}->update;
346} 376}
347 377
348sub magicmap { 378sub magicmap {
349 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
358 or return; 388 or return;
359 389
360 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
361 391
362 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
363 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
364 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
365} 395}
366 396
367sub map_clear { 397sub map_clear {
368 my ($self) = @_; 398 my ($self) = @_;
… …
372 402
373 $self->{map}->clear; 403 $self->{map}->clear;
374 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
375} 405}
376 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}
377 426
378sub load_map($$$) { 427sub load_map($$$) {
379 my ($self, $hash, $x, $y) = @_; 428 my ($self, $hash, $x, $y) = @_;
380 429
381 if (defined (my $data = $self->{mapcache}->get ($hash))) { 430 CFPlus::DB::get $self->{mapcache} => $hash, sub {
431 my ($data) = @_;
432
433 if (defined $data) {
382 $data = Compress::LZF::decompress $data; 434 $data = Compress::LZF::decompress $data;
383 #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#
384 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
385 my $data = $self->{tilecache}->get ($id)
386 or next;
387 436
388 $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;
389 } 440 }
390 } 441 };
391} 442}
392 443
393# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 444# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
394# (server resource,s latency, bandwidth), so this hack is warranted. 445# (server resource,s latency, bandwidth), so this hack is warranted.
395# 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
… …
509 $self->load_map ($hash, $x, $y); 560 $self->load_map ($hash, $x, $y);
510 $self->flood_fill (0, 0, 0, "", $hash, $flags); 561 $self->flood_fill (0, 0, 0, "", $hash, $flags);
511} 562}
512 563
513sub face_find { 564sub face_find {
514 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $cb) = @_;
515 566
516 my $hash = "$face->{chksum},$face->{name}"; 567 my $hash = "$face->{chksum},$face->{name}";
517 568
518 my $id = $self->{facemap}->get ($hash); 569 my $id = CFPlus::DB::get_tile_id_sync $hash;
519 570
520 unless ($id) {
521 # create new id for face
522 # I love transactions
523 for (1..100) {
524 my $txn = $CFPlus::DB_ENV->txn_begin;
525 my $status = $self->{facemap}->db_get (id => $id);
526 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
527 $id = ($id || 64) + 1;
528 if ($self->{facemap}->put (id => $id) == 0
529 && $self->{facemap}->put ($hash => $id) == 0) {
530 $txn->txn_commit;
531
532 goto gotid;
533 }
534 }
535 $txn->txn_abort;
536 }
537
538 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
539 }
540
541gotid:
542 $face->{id} = $id; 571 $face->{id} = $id;
543 $self->{map}->set_face ($facenum => $id);
544 $self->{faceid}[$facenum] = $id;#d# 572 $self->{faceid}[$facenum] = $id;
545 573
546 my $face = $self->{tilecache}->get ($id); 574 $self->{map}->set_tileid ($facenum => $id);
547 575
548 if ($face) { 576 CFPlus::DB::get tilecache => $id, $cb;
549 #$self->face_prefetch;
550 $face
551 } else {
552 my $tex = $self->{noface};
553 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
554 undef
555 };
556} 577}
557 578
558sub face_update { 579sub face_update {
559 my ($self, $facenum, $face, $changed) = @_; 580 my ($self, $facenum, $face, $changed) = @_;
560 581
561 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 582 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
583 if $changed;
562 584
563 $self->set_texture ($face->{id} => delete $face->{image}); 585 $self->set_texture ($face->{id} => delete $face->{image});
564} 586}
565 587
566sub set_texture { 588sub set_texture {
… …
612 [0.75, 0.61, 0.20], 634 [0.75, 0.61, 0.20],
613 [0.99, 0.77, 0.26], 635 [0.99, 0.77, 0.26],
614 [0.74, 0.65, 0.41], 636 [0.74, 0.65, 0.41],
615 ); 637 );
616 638
639 my $fg = $color[$color % @color];
640
617 $self->logprint ("info: ", $text); 641 $self->logprint ("info: ", $text);
618
619 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
620 642
621 # 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
622 $text =~ s/(?<=\S)\n(?=\w)/ /g; 644 $text =~ s/(?<=\S)\n(?=\w)/ /g;
623 645
624 $text = CFPlus::asxml $text; 646 $text = CFPlus::asxml $text;
625 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
626 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
627 649
628 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 650 ::message ({ fg => $fg, markup => $_ })
629 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 651 for split /\n/, $text;
630 $self->{logview}->scroll_to_bottom;
631 652
632 $self->{statusbox}->add ($text, 653 $self->{statusbox}->add ($text,
633 group => $text, 654 group => $text,
634 fg => $color[$color], 655 fg => $fg,
635 timeout => $color >= 2 ? 180 : 10, 656 timeout => $color >= 2 ? 180 : 10,
636 tooltip_font => $::FONT_FIXED, 657 tooltip_font => $::FONT_FIXED,
637 ); 658 );
638} 659}
639 660
… …
649 # 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
650 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 671 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
651 $spell->{message} =~ s/\n+$//; 672 $spell->{message} =~ s/\n+$//;
652 $spell->{message} ||= "Server did not provide a description for this spell."; 673 $spell->{message} ||= "Server did not provide a description for this spell.";
653 674
654 $::SPELL_PAGE->add_spell ($spell); 675 $::SPELL_LIST->add_spell ($spell);
655 676
656 $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});
657 $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});
658} 679}
659 680
660sub spell_delete { 681sub spell_delete {
661 my ($self, $spell) = @_; 682 my ($self, $spell) = @_;
662 683
663 $::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});
664} 692}
665 693
666sub addme_success { 694sub addme_success {
667 my ($self) = @_; 695 my ($self) = @_;
668 696
… …
874 $::SERVER_INFO->set_markup ( 902 $::SERVER_INFO->set_markup (
875 "server <tt>$self->{host}:$self->{port}</tt>\n" 903 "server <tt>$self->{host}:$self->{port}</tt>\n"
876 . "protocol version <tt>$self->{version}</tt>\n" 904 . "protocol version <tt>$self->{version}</tt>\n"
877 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 905 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
878 . "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"
879 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
880 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
881 . "map size $self->{mapw}×$self->{maph}\n" 911 . "map size $self->{mapw}×$self->{maph}\n"
882 ); 912 );
913
914 ::setup_build_button ($self->{editor_support}->{builder_ui});
883} 915}
884 916
885sub logged_in { 917sub logged_in {
886 my ($self) = @_; 918 my ($self) = @_;
887 919
888 $self->send_ext_req (cfplus_support => version => 1, sub { 920 $self->send_ext_req (cfplus_support => version => 1, sub {
889 $self->{cfplus_ext} = $_[0]{version}; 921 $self->{cfplus_ext} = $_[0]{version};
890 $self->update_server_info; 922 $self->update_server_info;
891 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
892 0 933 0
893 }); 934 });
894 935
895 $self->update_server_info; 936 $self->update_server_info;
896 937
897 $self->send_command ("output-sync $::CFG->{output_sync}"); 938 $self->send_command ("output-sync $::CFG->{output_sync}");
898 $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;
899 $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 }
900} 950}
901 951
902sub lookat { 952sub lookat {
903 my ($self, $x, $y) = @_; 953 my ($self, $x, $y) = @_;
904 954
… …
922} 972}
923 973
924sub destroy { 974sub destroy {
925 my ($self) = @_; 975 my ($self) = @_;
926 976
927 $self->{npc_dialog}->destroy 977 (delete $self->{npc_dialog})->destroy
928 if $self->{npc_dialog}; 978 if $self->{npc_dialog};
929 979
930 $self->SUPER::destroy; 980 $self->SUPER::destroy;
931} 981}
932 982
933package CFPlus::NPCDialog; 983package CFPlus::NPCDialog;
934 984
935our @ISA = 'CFPlus::UI::FancyFrame'; 985our @ISA = 'CFPlus::UI::Toplevel';
936 986
937sub new { 987sub new {
938 my $class = shift; 988 my $class = shift;
939 989
940 my $self = $class->SUPER::new ( 990 my $self = $class->SUPER::new (
… …
947 kw => { hi => 0, yes => 0, no => 0 }, 997 kw => { hi => 0, yes => 0, no => 0 },
948 has_close_button => 1, 998 has_close_button => 1,
949 @_, 999 @_,
950 ); 1000 );
951 1001
952 Scalar::Util::weaken (my $this = $self); 1002 CFPlus::weaken (my $this = $self);
953 1003
954 $self->connect (delete => sub { $this->destroy; 1 }); 1004 $self->connect (delete => sub { $this->destroy; 1 });
955 1005
956 # better use a pane... 1006 # better use a pane...
957 $self->add (my $hbox = new CFPlus::UI::HBox); 1007 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1001}; 1051};
1002 1052
1003sub update_options { 1053sub update_options {
1004 my ($self) = @_; 1054 my ($self) = @_;
1005 1055
1006 Scalar::Util::weaken $self; 1056 CFPlus::weaken $self;
1007 1057
1008 $self->{options}->clear; 1058 $self->{options}->clear;
1009 $self->{options}->add ($self->{bye_button}); 1059 $self->{options}->add ($self->{bye_button});
1010 1060
1011 for my $kw (sort keys %{ $self->{kw} }) { 1061 for my $kw (sort keys %{ $self->{kw} }) {
… …
1020} 1070}
1021 1071
1022sub feed { 1072sub feed {
1023 my ($self, $msg) = @_; 1073 my ($self, $msg) = @_;
1024 1074
1025 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1026 1076
1027 if ($msg->{msgtype} eq "reply") { 1077 if ($msg->{msgtype} eq "reply") {
1028 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1029 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1030 1080
… …
1044 padding_y => 0, 1094 padding_y => 0,
1045 on_button_up => sub { 1095 on_button_up => sub {
1046 $self->send ($kw); 1096 $self->send ($kw);
1047 }; 1097 };
1048 1098
1049 chr 0xfffc 1099 "\x{fffc}"
1050 }giex; 1100 }giex;
1051 1101
1052 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1102 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1053 $self->{textview}->scroll_to_bottom; 1103 $self->{textview}->scroll_to_bottom;
1054 $self->update_options; 1104 $self->update_options;
… …
1081 1131
1082 $self->SUPER::destroy; 1132 $self->SUPER::destroy;
1083} 1133}
1084 1134
10851 11351
1136

Diff Legend

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