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.83 by root, Tue Sep 19 22:02:38 2006 UTC vs.
Revision 1.102 by root, Wed Apr 18 18:16:16 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, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 %{$arg{setup_req} || {}},
26 },
27 );
18 28
19 $self->{map_widget}->clr_commands; 29 $self->{map_widget}->clr_commands;
20 30
21 my @cmd_help = map { 31 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 32 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 43 for @args;
34 44
35 map ["$cmd$_", $text], 45 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 46 sort { (length $a) <=> (length $b) }
37 @args 47 @args
38 } sort { $a->{par} <=> $b->{par} } 48 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 49 CFPlus::Pod::find command => "*";
40 50
51 $self->connect_ext (event_capabilities => sub {
52 my ($cap) = @_;
53
54 if (my $ts = $cap->{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]);
59
60 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize};
62
63 $self->setup_req (mapsize => "${w}x${h}");
64 }
65 }
66 });
67
41 $self->{map_widget}->add_command (@$_) 68 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 69 for @cmd_help;
43
44 $self->{noface} = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
46 70
47 { 71 {
48 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 72 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 73 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
50 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 74 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
51 } 75 }
52 76
77 {
78 $self->{noface} = my $tex = new_from_file CFPlus::Texture
79 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
80 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
81 }
82
53 $self->{open_container} = 0; 83 $self->{open_container} = 0;
54 84
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache"
57 or die "tilecache: unable to open database table";
58 $self->{facemap} = CFPlus::db_table "facemap"
59 or die "facemap: unable to open database table";
60
61 # per server 85 # per server
62 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 86 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
63 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
64 87
65 $self 88 $self
66} 89}
67 90
68sub logprint { 91sub logprint {
… …
286 if ($ev->{button} == 1) { 309 if ($ev->{button} == 1) {
287 $::CONN->user_send ("ready_skill $name"); 310 $::CONN->user_send ("ready_skill $name");
288 } elsif ($ev->{button} == 2) { 311 } elsif ($ev->{button} == 2) {
289 $::CONN->user_send ("use_skill $name"); 312 $::CONN->user_send ("use_skill $name");
290 } elsif ($ev->{button} == 3) { 313 } elsif ($ev->{button} == 3) {
314 my $shortname = CFPlus::shorten $name, 14;
291 (new CFPlus::UI::Menu 315 (new CFPlus::UI::Menu
292 items => [ 316 items => [
293 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 317 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
294 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 318 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
295 ], 319 ],
296 )->popup ($ev); 320 )->popup ($ev);
297 } else { 321 } else {
298 return 0; 322 return 0;
299 } 323 }
… …
316 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
317 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
318 } 342 }
319} 343}
320 344
345sub macro_send {
346 my ($self, $macro) = @_;
347
348 for my $cmd (@{ $macro->{action} }) {
349 $self->send_command ($cmd);
350 }
351}
352
321sub user_send { 353sub user_send {
322 my ($self, $command) = @_; 354 my ($self, $command) = @_;
323 355
356 $self->{record}->($command)
324 if ($self->{record}) { 357 if $self->{record};
325 push @{$self->{record}}, $command;
326 }
327 358
328 $self->logprint ("send: ", $command); 359 $self->logprint ("send: ", $command);
329 $self->send_command ($command); 360 $self->send_command ($command);
330 ::status ($command); 361 ::status ($command);
331} 362}
332 363
333sub start_record { 364sub record {
334 my ($self) = @_; 365 my ($self, $cb) = @_;
335 366
336 $self->{record} = []; 367 $self->{record} = $cb;
337}
338
339sub stop_record {
340 my ($self) = @_;
341 return delete $self->{record};
342} 368}
343 369
344sub map_scroll { 370sub map_scroll {
345 my ($self, $dx, $dy) = @_; 371 my ($self, $dx, $dy) = @_;
346 372
… …
367 or return; 393 or return;
368 394
369 my ($hash, $x, $y, $w, $h) = @$map_info; 395 my ($hash, $x, $y, $w, $h) = @$map_info;
370 396
371 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 397 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
372 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 398 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
373 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 399 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
374} 400}
375 401
376sub map_clear { 402sub map_clear {
377 my ($self) = @_; 403 my ($self) = @_;
… …
381 407
382 $self->{map}->clear; 408 $self->{map}->clear;
383 delete $self->{map_widget}{magicmap}; 409 delete $self->{map_widget}{magicmap};
384} 410}
385 411
412sub bg_fetch {
413 my ($self) = @_;
414
415 my $id;
416
417 do {
418 $id = pop @{$self->{bg_fetch}}
419 or return;
420 } while $self->{texture}[$id];
421
422 CFPlus::DB::get tilecache => $id, sub {
423 my ($data) = @_;
424
425 return unless $self->{map}; # stop when destroyed
426
427 $self->set_texture ($id => $data)
428 if defined $data;
429
430 $self->bg_fetch;
431 };
432}
386 433
387sub load_map($$$) { 434sub load_map($$$) {
388 my ($self, $hash, $x, $y) = @_; 435 my ($self, $hash, $x, $y) = @_;
389 436
390 if (defined (my $data = $self->{mapcache}->get ($hash))) { 437 my $gen = $self->{map_change_gen};
438
439 CFPlus::DB::get $self->{mapcache} => $hash, sub {
440 return unless $gen == $self->{map_change_gen};
441
442 my ($data) = @_;
443
444 if (defined $data) {
391 $data = Compress::LZF::decompress $data; 445 $data = Compress::LZF::decompress $data;
392 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 446 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
393 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
394 my $data = $self->{tilecache}->get ($id)
395 or next;
396 447
397 $self->set_texture ($id => $data); 448 my $inprogress = @{ $self->{bg_fetch} || [] };
449 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
450 $self->bg_fetch unless $inprogress;
398 } 451 }
399 } 452 };
400} 453}
401 454
402# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 455# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
403# (server resource,s latency, bandwidth), so this hack is warranted. 456# (server resource,s latency, bandwidth), so this hack is warranted.
404# the right fix is to make real tiled maps with an overview file 457# the right fix is to make real tiled maps with an overview file
… …
468 521
469 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 522 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
470 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 523 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
471 524
472 } else { 525 } else {
526 my $gen = $self->{map_change_gen};
473 $self->send_mapinfo ("spatial $path$tile", sub { 527 $self->send_mapinfo ("spatial $path$tile", sub {
528 return unless $gen == $self->{map_change_gen};
529
474 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 530 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
475 531
476 return if $mode ne "spatial"; 532 return if $mode ne "spatial";
477 533
478 $x += $self->{map}->ox; 534 $x += $self->{map}->ox;
… …
492 548
493sub map_change { 549sub map_change {
494 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 550 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
495 551
496 $self->flush_map; 552 $self->flush_map;
553
554 ++$self->{map_change_gen};
497 555
498 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 556 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
499 557
500 my $mapmapw = $self->{mapmap}->{w}; 558 my $mapmapw = $self->{mapmap}->{w};
501 my $mapmaph = $self->{mapmap}->{h}; 559 my $mapmaph = $self->{mapmap}->{h};
… …
518 $self->load_map ($hash, $x, $y); 576 $self->load_map ($hash, $x, $y);
519 $self->flood_fill (0, 0, 0, "", $hash, $flags); 577 $self->flood_fill (0, 0, 0, "", $hash, $flags);
520} 578}
521 579
522sub face_find { 580sub face_find {
523 my ($self, $facenum, $face) = @_; 581 my ($self, $facenum, $face, $cb) = @_;
524 582
525 my $hash = "$face->{chksum},$face->{name}"; 583 my $hash = "$face->{chksum},$face->{name}";
526 584
527 my $id = $self->{facemap}->get ($hash); 585 my $id = CFPlus::DB::get_tile_id_sync $hash;
528 586
529 unless ($id) {
530 # create new id for face
531 # I love transactions
532 for (1..100) {
533 my $txn = $CFPlus::DB_ENV->txn_begin;
534 my $status = $self->{facemap}->db_get (id => $id);
535 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
536 $id = ($id || 64) + 1;
537 if ($self->{facemap}->put (id => $id) == 0
538 && $self->{facemap}->put ($hash => $id) == 0) {
539 $txn->txn_commit;
540
541 goto gotid;
542 }
543 }
544 $txn->txn_abort;
545 }
546
547 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
548 }
549
550gotid:
551 $face->{id} = $id; 587 $face->{id} = $id;
552 $self->{map}->set_face ($facenum => $id);
553 $self->{faceid}[$facenum] = $id;#d# 588 $self->{faceid}[$facenum] = $id;
554 589
555 my $face = $self->{tilecache}->get ($id); 590 $self->{map}->set_tileid ($facenum => $id);
556 591
557 if ($face) { 592 CFPlus::DB::get tilecache => $id, $cb;
558 #$self->face_prefetch;
559 $face
560 } else {
561 my $tex = $self->{noface};
562 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
563 undef
564 };
565} 593}
566 594
567sub face_update { 595sub face_update {
568 my ($self, $facenum, $face, $changed) = @_; 596 my ($self, $facenum, $face, $changed) = @_;
569 597
570 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
599 if $changed;
571 600
572 $self->set_texture ($face->{id} => delete $face->{image}); 601 $self->set_texture ($face->{id} => delete $face->{image});
602}
603
604sub smooth_update {
605 my ($self, $facenum, $face) = @_;
606
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
573} 608}
574 609
575sub set_texture { 610sub set_texture {
576 my ($self, $id, $data) = @_; 611 my ($self, $id, $data) = @_;
577 612
578 $self->{texture}[$id] ||= do { 613 $self->{texture}[$id] = my $tex =
579 my $tex =
580 new_from_image CFPlus::Texture 614 new_from_image CFPlus::Texture
581 $data, minify => 1, mipmap => 1; 615 $data, minify => 1, mipmap => 1;
582 616
583 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
584 $self->{map_widget}->update; 618 $self->{map_widget}->update;
585
586 $tex
587 };
588} 619}
589 620
590sub sound_play { 621sub sound_play {
591 my ($self, $x, $y, $soundnum, $type) = @_; 622 my ($self, $x, $y, $soundnum, $type) = @_;
592 623
… …
621 [0.75, 0.61, 0.20], 652 [0.75, 0.61, 0.20],
622 [0.99, 0.77, 0.26], 653 [0.99, 0.77, 0.26],
623 [0.74, 0.65, 0.41], 654 [0.74, 0.65, 0.41],
624 ); 655 );
625 656
657 my $fg = $color[$color % @color];
658
626 $self->logprint ("info: ", $text); 659 $self->logprint ("info: ", $text);
627 660
628 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
629
630 # try to create single paragraphs of multiple lines sent by the server 661 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers
631 $text =~ s/(?<=\S)\n(?=\w)/ /g; 663 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
632 664
633 $text = CFPlus::asxml $text; 665 $text = CFPlus::asxml $text;
634 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
635 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
636 668
637 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 669 ::message ({ fg => $fg, markup => $_ })
638 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 670 for split /\n/, $text;
639 $self->{logview}->scroll_to_bottom;
640 671
641 $self->{statusbox}->add ($text, 672 $self->{statusbox}->add ($text,
642 group => $text, 673 group => $text,
643 fg => $color[$color], 674 fg => $fg,
644 timeout => $color >= 2 ? 180 : 10, 675 timeout => $color >= 2 ? 180 : 10,
645 tooltip_font => $::FONT_FIXED, 676 tooltip_font => $::FONT_FIXED,
646 ); 677 );
647} 678}
648 679
… …
658 # try to create single paragraphs out of the multiple lines sent by the server 689 # try to create single paragraphs out of the multiple lines sent by the server
659 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 690 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
660 $spell->{message} =~ s/\n+$//; 691 $spell->{message} =~ s/\n+$//;
661 $spell->{message} ||= "Server did not provide a description for this spell."; 692 $spell->{message} ||= "Server did not provide a description for this spell.";
662 693
663 $::SPELL_PAGE->add_spell ($spell); 694 $::SPELL_LIST->add_spell ($spell);
664 695
665 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 696 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
666 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
667} 698}
668 699
669sub spell_delete { 700sub spell_delete {
670 my ($self, $spell) = @_; 701 my ($self, $spell) = @_;
671 702
672 $::SPELL_PAGE->remove_spell ($spell); 703 $::SPELL_LIST->remove_spell ($spell);
704}
705
706sub setup {
707 my ($self, $setup) = @_;
708
709 $self->{map_widget}->set_tilesize ($self->{tilesize});
710 $::MAP->resize ($self->{mapw}, $self->{maph});
673} 711}
674 712
675sub addme_success { 713sub addme_success {
676 my ($self) = @_; 714 my ($self) = @_;
677 715
… …
883 $::SERVER_INFO->set_markup ( 921 $::SERVER_INFO->set_markup (
884 "server <tt>$self->{host}:$self->{port}</tt>\n" 922 "server <tt>$self->{host}:$self->{port}</tt>\n"
885 . "protocol version <tt>$self->{version}</tt>\n" 923 . "protocol version <tt>$self->{version}</tt>\n"
886 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
887 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n"
888 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
889 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
890 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
891 . "map size $self->{mapw}×$self->{maph}\n" 930 . "map size $self->{mapw}×$self->{maph}\n"
892 ); 931 );
932
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
893} 934}
894 935
895sub logged_in { 936sub logged_in {
896 my ($self) = @_; 937 my ($self) = @_;
897 938
898 $self->send_ext_req (cfplus_support => version => 1, sub { 939 $self->send_ext_req (cfplus_support => version => 1, sub {
899 $self->{cfplus_ext} = $_[0]{version}; 940 $self->{cfplus_ext} = $_[0]{version};
900 $self->update_server_info; 941 $self->update_server_info;
901 942
943 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0];
946 $self->update_server_info;
947
948 0
949 });
950 }
951
902 0 952 0
903 }); 953 });
904 954
905 $self->update_server_info; 955 $self->update_server_info;
906 956
907 $self->send_command ("output-sync $::CFG->{output_sync}"); 957 $self->send_command ("output-sync $::CFG->{output_sync}");
908 $self->send_command ("output-count $::CFG->{output_count}"); 958 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
909 $self->send_command ("pickup $::CFG->{pickup}"); 960 $self->send_command ("pickup $::CFG->{pickup}");
961}
962
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
910} 969}
911 970
912sub lookat { 971sub lookat {
913 my ($self, $x, $y) = @_; 972 my ($self, $x, $y) = @_;
914 973
… …
957 kw => { hi => 0, yes => 0, no => 0 }, 1016 kw => { hi => 0, yes => 0, no => 0 },
958 has_close_button => 1, 1017 has_close_button => 1,
959 @_, 1018 @_,
960 ); 1019 );
961 1020
962 Scalar::Util::weaken (my $this = $self); 1021 CFPlus::weaken (my $this = $self);
963 1022
964 $self->connect (delete => sub { $this->destroy; 1 }); 1023 $self->connect (delete => sub { $this->destroy; 1 });
965 1024
966 # better use a pane... 1025 # better use a pane...
967 $self->add (my $hbox = new CFPlus::UI::HBox); 1026 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1011}; 1070};
1012 1071
1013sub update_options { 1072sub update_options {
1014 my ($self) = @_; 1073 my ($self) = @_;
1015 1074
1016 Scalar::Util::weaken $self; 1075 CFPlus::weaken $self;
1017 1076
1018 $self->{options}->clear; 1077 $self->{options}->clear;
1019 $self->{options}->add ($self->{bye_button}); 1078 $self->{options}->add ($self->{bye_button});
1020 1079
1021 for my $kw (sort keys %{ $self->{kw} }) { 1080 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030} 1089}
1031 1090
1032sub feed { 1091sub feed {
1033 my ($self, $msg) = @_; 1092 my ($self, $msg) = @_;
1034 1093
1035 Scalar::Util::weaken $self; 1094 CFPlus::weaken $self;
1036 1095
1037 if ($msg->{msgtype} eq "reply") { 1096 if ($msg->{msgtype} eq "reply") {
1038 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1039 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1099
… …
1091 1150
1092 $self->SUPER::destroy; 1151 $self->SUPER::destroy;
1093} 1152}
1094 1153
10951 11541
1155

Diff Legend

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