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.88 by root, Sun Nov 19 20:31:29 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;
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
… …
35 for @args; 38 for @args;
36 39
37 map ["$cmd$_", $text], 40 map ["$cmd$_", $text],
38 sort { (length $a) <=> (length $b) } 41 sort { (length $a) <=> (length $b) }
39 @args 42 @args
40 } sort { $a->{par} <=> $b->{par} } 43 } sort { $a->{par} <=> $b->{par} }
41 CFPlus::Pod::find command => "*"; 44 CFPlus::Pod::find command => "*";
42 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
43 $self->{map_widget}->add_command (@$_) 63 $self->{map_widget}->add_command (@$_)
44 for @cmd_help; 64 for @cmd_help;
45
46 $self->{noface} = new_from_file CFPlus::Texture
47 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
48 65
49 { 66 {
50 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 67 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 68 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
52 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 69 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
53 } 70 }
54 71
72 {
73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
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 }
77
55 $self->{open_container} = 0; 78 $self->{open_container} = 0;
56 79
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 80 # per server
64 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
65 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
66 82
67 $self 83 $self
68} 84}
69 85
70sub logprint { 86sub logprint {
… …
288 if ($ev->{button} == 1) { 304 if ($ev->{button} == 1) {
289 $::CONN->user_send ("ready_skill $name"); 305 $::CONN->user_send ("ready_skill $name");
290 } elsif ($ev->{button} == 2) { 306 } elsif ($ev->{button} == 2) {
291 $::CONN->user_send ("use_skill $name"); 307 $::CONN->user_send ("use_skill $name");
292 } elsif ($ev->{button} == 3) { 308 } elsif ($ev->{button} == 3) {
309 my $shortname = CFPlus::shorten $name, 14;
293 (new CFPlus::UI::Menu 310 (new CFPlus::UI::Menu
294 items => [ 311 items => [
295 ["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"] }],
296 ["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"] }],
297 ], 314 ],
298 )->popup ($ev); 315 )->popup ($ev);
299 } else { 316 } else {
300 return 0; 317 return 0;
301 } 318 }
… …
318 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
319 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
320 } 337 }
321} 338}
322 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
323sub user_send { 348sub user_send {
324 my ($self, $command) = @_; 349 my ($self, $command) = @_;
325 350
326 push @{$self->{record}}, $command 351 $self->{record}->($command)
327 if $self->{record}; 352 if $self->{record};
328 353
329 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
330 $self->send_command ($command); 355 $self->send_command ($command);
331 ::status ($command); 356 ::status ($command);
332} 357}
333 358
334sub start_record { 359sub record {
335 my ($self) = @_; 360 my ($self, $cb) = @_;
336 361
337 $self->{record} = []; 362 $self->{record} = $cb;
338}
339
340sub stop_record {
341 my ($self) = @_;
342 return delete $self->{record};
343} 363}
344 364
345sub map_scroll { 365sub map_scroll {
346 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
347 367
… …
368 or return; 388 or return;
369 389
370 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
371 391
372 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
373 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
374 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
375} 395}
376 396
377sub map_clear { 397sub map_clear {
378 my ($self) = @_; 398 my ($self) = @_;
… …
382 402
383 $self->{map}->clear; 403 $self->{map}->clear;
384 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
385} 405}
386 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}
387 426
388sub load_map($$$) { 427sub load_map($$$) {
389 my ($self, $hash, $x, $y) = @_; 428 my ($self, $hash, $x, $y) = @_;
390 429
391 if (defined (my $data = $self->{mapcache}->get ($hash))) { 430 CFPlus::DB::get $self->{mapcache} => $hash, sub {
431 my ($data) = @_;
432
433 if (defined $data) {
392 $data = Compress::LZF::decompress $data; 434 $data = Compress::LZF::decompress $data;
393 #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#
394 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
395 my $data = $self->{tilecache}->get ($id)
396 or next;
397 436
398 $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;
399 } 440 }
400 } 441 };
401} 442}
402 443
403# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 444# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
404# (server resource,s latency, bandwidth), so this hack is warranted. 445# (server resource,s latency, bandwidth), so this hack is warranted.
405# 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
… …
519 $self->load_map ($hash, $x, $y); 560 $self->load_map ($hash, $x, $y);
520 $self->flood_fill (0, 0, 0, "", $hash, $flags); 561 $self->flood_fill (0, 0, 0, "", $hash, $flags);
521} 562}
522 563
523sub face_find { 564sub face_find {
524 my ($self, $facenum, $face) = @_; 565 my ($self, $facenum, $face, $cb) = @_;
525 566
526 my $hash = "$face->{chksum},$face->{name}"; 567 my $hash = "$face->{chksum},$face->{name}";
527 568
528 my $id = $self->{facemap}->get ($hash); 569 my $id = CFPlus::DB::get_tile_id_sync $hash;
529 570
530 unless ($id) {
531 # create new id for face
532 # I love transactions
533 for (1..100) {
534 my $txn = $CFPlus::DB_ENV->txn_begin;
535 my $status = $self->{facemap}->db_get (id => $id);
536 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
537 $id = ($id || 64) + 1;
538 if ($self->{facemap}->put (id => $id) == 0
539 && $self->{facemap}->put ($hash => $id) == 0) {
540 $txn->txn_commit;
541
542 goto gotid;
543 }
544 }
545 $txn->txn_abort;
546 }
547
548 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
549 }
550
551gotid:
552 $face->{id} = $id; 571 $face->{id} = $id;
553 $self->{map}->set_face ($facenum => $id);
554 $self->{faceid}[$facenum] = $id;#d# 572 $self->{faceid}[$facenum] = $id;
555 573
556 my $face = $self->{tilecache}->get ($id); 574 $self->{map}->set_tileid ($facenum => $id);
557 575
558 if ($face) { 576 CFPlus::DB::get tilecache => $id, $cb;
559 #$self->face_prefetch;
560 $face
561 } else {
562 my $tex = $self->{noface};
563 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
564 undef
565 };
566} 577}
567 578
568sub face_update { 579sub face_update {
569 my ($self, $facenum, $face, $changed) = @_; 580 my ($self, $facenum, $face, $changed) = @_;
570 581
571 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 582 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
583 if $changed;
572 584
573 $self->set_texture ($face->{id} => delete $face->{image}); 585 $self->set_texture ($face->{id} => delete $face->{image});
574} 586}
575 587
576sub set_texture { 588sub set_texture {
… …
622 [0.75, 0.61, 0.20], 634 [0.75, 0.61, 0.20],
623 [0.99, 0.77, 0.26], 635 [0.99, 0.77, 0.26],
624 [0.74, 0.65, 0.41], 636 [0.74, 0.65, 0.41],
625 ); 637 );
626 638
639 my $fg = $color[$color % @color];
640
627 $self->logprint ("info: ", $text); 641 $self->logprint ("info: ", $text);
628 642
629 # 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
630 $text =~ s/(?<=\S)\n(?=\w)/ /g; 644 $text =~ s/(?<=\S)\n(?=\w)/ /g;
631 645
632 $text = CFPlus::asxml $text; 646 $text = CFPlus::asxml $text;
633 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 647 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
634 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 648 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
635 649
636 ::message ({ fg => $color[$color], markup => $_ }) 650 ::message ({ fg => $fg, markup => $_ })
637 for split /\n/, $text; 651 for split /\n/, $text;
638 652
639 $self->{statusbox}->add ($text, 653 $self->{statusbox}->add ($text,
640 group => $text, 654 group => $text,
641 fg => $color[$color], 655 fg => $fg,
642 timeout => $color >= 2 ? 180 : 10, 656 timeout => $color >= 2 ? 180 : 10,
643 tooltip_font => $::FONT_FIXED, 657 tooltip_font => $::FONT_FIXED,
644 ); 658 );
645} 659}
646 660
… …
671} 685}
672 686
673sub setup { 687sub setup {
674 my ($self, $setup) = @_; 688 my ($self, $setup) = @_;
675 689
690 $self->{map_widget}->set_tilesize ($self->{tilesize});
676 $::MAP->resize ($self->{mapw}, $self->{maph}); 691 $::MAP->resize ($self->{mapw}, $self->{maph});
677} 692}
678 693
679sub addme_success { 694sub addme_success {
680 my ($self) = @_; 695 my ($self) = @_;
… …
893 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 908 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
894 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 909 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
895 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 910 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
896 . "map size $self->{mapw}×$self->{maph}\n" 911 . "map size $self->{mapw}×$self->{maph}\n"
897 ); 912 );
913
914 ::setup_build_button ($self->{editor_support}->{builder_ui});
898} 915}
899 916
900sub logged_in { 917sub logged_in {
901 my ($self) = @_; 918 my ($self) = @_;
902 919
… …
918 935
919 $self->update_server_info; 936 $self->update_server_info;
920 937
921 $self->send_command ("output-sync $::CFG->{output_sync}"); 938 $self->send_command ("output-sync $::CFG->{output_sync}");
922 $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;
923 $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 }
924} 950}
925 951
926sub lookat { 952sub lookat {
927 my ($self, $x, $y) = @_; 953 my ($self, $x, $y) = @_;
928 954
… …
971 kw => { hi => 0, yes => 0, no => 0 }, 997 kw => { hi => 0, yes => 0, no => 0 },
972 has_close_button => 1, 998 has_close_button => 1,
973 @_, 999 @_,
974 ); 1000 );
975 1001
976 Scalar::Util::weaken (my $this = $self); 1002 CFPlus::weaken (my $this = $self);
977 1003
978 $self->connect (delete => sub { $this->destroy; 1 }); 1004 $self->connect (delete => sub { $this->destroy; 1 });
979 1005
980 # better use a pane... 1006 # better use a pane...
981 $self->add (my $hbox = new CFPlus::UI::HBox); 1007 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1025}; 1051};
1026 1052
1027sub update_options { 1053sub update_options {
1028 my ($self) = @_; 1054 my ($self) = @_;
1029 1055
1030 Scalar::Util::weaken $self; 1056 CFPlus::weaken $self;
1031 1057
1032 $self->{options}->clear; 1058 $self->{options}->clear;
1033 $self->{options}->add ($self->{bye_button}); 1059 $self->{options}->add ($self->{bye_button});
1034 1060
1035 for my $kw (sort keys %{ $self->{kw} }) { 1061 for my $kw (sort keys %{ $self->{kw} }) {
… …
1044} 1070}
1045 1071
1046sub feed { 1072sub feed {
1047 my ($self, $msg) = @_; 1073 my ($self, $msg) = @_;
1048 1074
1049 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1050 1076
1051 if ($msg->{msgtype} eq "reply") { 1077 if ($msg->{msgtype} eq "reply") {
1052 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1078 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1053 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1079 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1054 1080

Diff Legend

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