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.79 by root, Fri Aug 18 01:01:01 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;
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 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
18 29
19 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
20 31
21 my @cmd_help = map { 32 my @cmd_help = map {
22 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
33 for @args; 44 for @args;
34 45
35 map ["$cmd$_", $text], 46 map ["$cmd$_", $text],
36 sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
37 @args 48 @args
38 } sort { $a->{par} <=> $b->{par} } 49 } sort { $a->{par} <=> $b->{par} }
39 CFPlus::Pod::find command => "*"; 50 CFPlus::Pod::find command => "*";
40 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
41 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
42 for @cmd_help; 70 for @cmd_help;
43 71
72 {
73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
76 }
77
78 {
44 $self->{noface} = new_from_file CFPlus::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
45 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 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 }
46 83
47 $self->{open_container} = 0; 84 $self->{open_container} = 0;
48 85
49 # "global"
50 $self->{tilecache} = CFPlus::db_table "tilecache"
51 or die "tilecache: unable to open database table";
52 $self->{facemap} = CFPlus::db_table "facemap"
53 or die "facemap: unable to open database table";
54
55 # per server 86 # per server
56 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
57 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
58 88
59 $self 89 $self
60} 90}
61 91
62sub logprint { 92sub logprint {
… …
280 if ($ev->{button} == 1) { 310 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name"); 311 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) { 312 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name"); 313 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) { 314 } elsif ($ev->{button} == 3) {
315 my $shortname = CFPlus::shorten $name, 14;
285 (new CFPlus::UI::Menu 316 (new CFPlus::UI::Menu
286 items => [ 317 items => [
287 ["bind <i>ready_skill $name</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"] }],
288 ["bind <i>use_skill $name</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"] }],
289 ], 320 ],
290 )->popup ($ev); 321 )->popup ($ev);
291 } else { 322 } else {
292 return 0; 323 return 0;
293 } 324 }
… …
310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 341 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 342 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 } 343 }
313} 344}
314 345
346sub macro_send {
347 my ($self, $macro) = @_;
348
349 for my $cmd (@{ $macro->{action} }) {
350 $self->send_command ($cmd);
351 }
352}
353
315sub user_send { 354sub user_send {
316 my ($self, $command) = @_; 355 my ($self, $command) = @_;
317 356
357 $self->{record}->($command)
318 if ($self->{record}) { 358 if $self->{record};
319 push @{$self->{record}}, $command;
320 }
321 359
322 $self->logprint ("send: ", $command); 360 $self->logprint ("send: ", $command);
323 $self->send_command ($command); 361 $self->send_command ($command);
324 ::status ($command); 362 ::status ($command);
325} 363}
326 364
327sub start_record { 365sub record {
328 my ($self) = @_; 366 my ($self, $cb) = @_;
329 367
330 $self->{record} = []; 368 $self->{record} = $cb;
331}
332
333sub stop_record {
334 my ($self) = @_;
335 return delete $self->{record};
336} 369}
337 370
338sub map_scroll { 371sub map_scroll {
339 my ($self, $dx, $dy) = @_; 372 my ($self, $dx, $dy) = @_;
340 373
… …
361 or return; 394 or return;
362 395
363 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
364 397
365 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368} 401}
369 402
370sub map_clear { 403sub map_clear {
371 my ($self) = @_; 404 my ($self) = @_;
… …
375 408
376 $self->{map}->clear; 409 $self->{map}->clear;
377 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
378} 411}
379 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}
380 434
381sub load_map($$$) { 435sub load_map($$$) {
382 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
383 437
384 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) {
385 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
386 #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#
387 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
388 my $data = $self->{tilecache}->get ($id)
389 or next;
390 448
391 $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;
392 } 452 }
393 } 453 };
394} 454}
395 455
396# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
398# 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
… …
462 522
463 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465 525
466 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
467 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
468 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469 532
470 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
471 534
472 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
486 549
487sub map_change { 550sub map_change {
488 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489 552
490 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
491 556
492 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493 558
494 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
495 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
512 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
513 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
514} 579}
515 580
516sub face_find { 581sub face_find {
517 my ($self, $facenum, $face) = @_; 582 my ($self, $facenum, $face, $cb) = @_;
518 583
519 my $hash = "$face->{chksum},$face->{name}"; 584 my $hash = "$face->{chksum},$face->{name}";
520 585
521 my $id = $self->{facemap}->get ($hash); 586 my $id = CFPlus::DB::get_tile_id_sync $hash;
522 587
523 unless ($id) {
524 # create new id for face
525 # I love transactions
526 for (1..100) {
527 my $txn = $CFPlus::DB_ENV->txn_begin;
528 my $status = $self->{facemap}->db_get (id => $id);
529 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
530 $id = ($id || 64) + 1;
531 if ($self->{facemap}->put (id => $id) == 0
532 && $self->{facemap}->put ($hash => $id) == 0) {
533 $txn->txn_commit;
534
535 goto gotid;
536 }
537 }
538 $txn->txn_abort;
539 }
540
541 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
542 }
543
544gotid:
545 $face->{id} = $id; 588 $face->{id} = $id;
546 $self->{map}->set_face ($facenum => $id);
547 $self->{faceid}[$facenum] = $id;#d# 589 $self->{faceid}[$facenum] = $id;
548 590
549 my $face = $self->{tilecache}->get ($id); 591 $self->{map}->set_tileid ($facenum => $id);
550 592
551 if ($face) { 593 CFPlus::DB::get tilecache => $id, $cb;
552 #$self->face_prefetch;
553 $face
554 } else {
555 my $tex = $self->{noface};
556 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
557 undef
558 };
559} 594}
560 595
561sub face_update { 596sub face_update {
562 my ($self, $facenum, $face, $changed) = @_; 597 my ($self, $facenum, $face, $changed) = @_;
563 598
564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
600 if $changed;
565 601
566 $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});
567} 609}
568 610
569sub set_texture { 611sub set_texture {
570 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
571 613
572 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
573 my $tex =
574 new_from_image CFPlus::Texture 615 new_from_image CFPlus::Texture
575 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
576 617
577 $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}});
578 $self->{map_widget}->update; 619 $self->{map_widget}->update;
579
580 $tex
581 };
582} 620}
583 621
584sub sound_play { 622sub sound_play {
585 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
586 624
… …
596 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
597 635
598 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
599} 637}
600 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
601sub drawinfo { 655sub drawinfo {
602 my ($self, $color, $text) = @_; 656 my ($self, $color, $text) = @_;
603 657
604 my @color = ( 658 my $fg = $CF_COLOR[$color % @CF_COLOR];
605 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
606 [1.00, 1.00, 1.00],
607 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
608 [1.00, 0.00, 0.00],
609 [1.00, 0.54, 0.00],
610 [0.11, 0.56, 1.00],
611 [0.93, 0.46, 0.00],
612 [0.18, 0.54, 0.34],
613 [0.56, 0.73, 0.56],
614 [0.80, 0.80, 0.80],
615 [0.75, 0.61, 0.20],
616 [0.99, 0.77, 0.26],
617 [0.74, 0.65, 0.41],
618 );
619 659
620 $self->logprint ("info: ", $text); 660 $self->logprint ("info: ", $text);
621 661
622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
623
624 # 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
625 $text =~ s/(?<=\S)\n(?=\w)/ /g; 664 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
626 665
627 $text = CFPlus::asxml $text; 666 $text = CFPlus::asxml $text;
628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630 669
631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 670 ::message ({ fg => $fg, markup => $_ })
632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 671 for split /\n/, $text;
633 $self->{logview}->scroll_to_bottom;
634 672
635 $self->{statusbox}->add ($text, 673 $self->{statusbox}->add ($text,
636 group => $text, 674 group => $text,
637 fg => $color[$color], 675 fg => $fg,
638 timeout => $color >= 2 ? 180 : 10, 676 timeout => $color >= 2 ? 180 : 10,
639 tooltip_font => $::FONT_FIXED, 677 tooltip_font => $::FONT_FIXED,
640 ); 678 );
641} 679}
642 680
… …
652 # try to create single paragraphs out of the multiple lines sent by the server 690 # try to create single paragraphs out of the multiple lines sent by the server
653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 691 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654 $spell->{message} =~ s/\n+$//; 692 $spell->{message} =~ s/\n+$//;
655 $spell->{message} ||= "Server did not provide a description for this spell."; 693 $spell->{message} ||= "Server did not provide a description for this spell.";
656 694
657 $::SPELL_PAGE->add_spell ($spell); 695 $::SPELL_LIST->add_spell ($spell);
658 696
659 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 697 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
660 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 698 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661} 699}
662 700
663sub spell_delete { 701sub spell_delete {
664 my ($self, $spell) = @_; 702 my ($self, $spell) = @_;
665 703
666 $::SPELL_PAGE->remove_spell ($spell); 704 $::SPELL_LIST->remove_spell ($spell);
705}
706
707sub setup {
708 my ($self, $setup) = @_;
709
710 $self->{map_widget}->set_tilesize ($self->{tilesize});
711 $::MAP->resize ($self->{mapw}, $self->{maph});
667} 712}
668 713
669sub addme_success { 714sub addme_success {
670 my ($self) = @_; 715 my ($self) = @_;
671 716
… …
877 $::SERVER_INFO->set_markup ( 922 $::SERVER_INFO->set_markup (
878 "server <tt>$self->{host}:$self->{port}</tt>\n" 923 "server <tt>$self->{host}:$self->{port}</tt>\n"
879 . "protocol version <tt>$self->{version}</tt>\n" 924 . "protocol version <tt>$self->{version}</tt>\n"
880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 925 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881 . "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"
928 . "editing support $yesno[!!$self->{editor_support}]\n"
929 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
930 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
882 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 931 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
883 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 932 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
884 . "map size $self->{mapw}×$self->{maph}\n" 933 . "map size $self->{mapw}×$self->{maph}\n"
885 ); 934 );
935
936 ::setup_build_button ($self->{editor_support}->{builder_ui});
886} 937}
887 938
888sub logged_in { 939sub logged_in {
889 my ($self) = @_; 940 my ($self) = @_;
890 941
891 $self->send_ext_req (cfplus_support => version => 1, sub { 942 $self->send_ext_req (cfplus_support => version => 1, sub {
892 $self->{cfplus_ext} = $_[0]{version}; 943 $self->{cfplus_ext} = $_[0]{version};
893 $self->update_server_info; 944 $self->update_server_info;
894 945
946 if ($self->{cfplus_ext} >= 2) {
947 $self->send_ext_req ("editor_support", sub {
948 $self->{editor_support} = $_[0];
949 $self->update_server_info;
950
951 0
952 });
953 }
954
895 0 955 0
896 }); 956 });
897 957
898 $self->update_server_info; 958 $self->update_server_info;
899 959
900 $self->send_command ("output-sync $::CFG->{output_sync}"); 960 $self->send_command ("output-sync $::CFG->{output_sync}");
901 $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;
902 $self->send_command ("pickup $::CFG->{pickup}"); 963 $self->send_command ("pickup $::CFG->{pickup}");
964}
965
966sub buildat {
967 my ($self, $builditem, $x, $y) = @_;
968
969 if ($self->{cfplus_ext}) {
970 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
971 }
903} 972}
904 973
905sub lookat { 974sub lookat {
906 my ($self, $x, $y) = @_; 975 my ($self, $x, $y) = @_;
907 976
… …
950 kw => { hi => 0, yes => 0, no => 0 }, 1019 kw => { hi => 0, yes => 0, no => 0 },
951 has_close_button => 1, 1020 has_close_button => 1,
952 @_, 1021 @_,
953 ); 1022 );
954 1023
955 Scalar::Util::weaken (my $this = $self); 1024 CFPlus::weaken (my $this = $self);
956 1025
957 $self->connect (delete => sub { $this->destroy; 1 }); 1026 $self->connect (delete => sub { $this->destroy; 1 });
958 1027
959 # better use a pane... 1028 # better use a pane...
960 $self->add (my $hbox = new CFPlus::UI::HBox); 1029 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1004}; 1073};
1005 1074
1006sub update_options { 1075sub update_options {
1007 my ($self) = @_; 1076 my ($self) = @_;
1008 1077
1009 Scalar::Util::weaken $self; 1078 CFPlus::weaken $self;
1010 1079
1011 $self->{options}->clear; 1080 $self->{options}->clear;
1012 $self->{options}->add ($self->{bye_button}); 1081 $self->{options}->add ($self->{bye_button});
1013 1082
1014 for my $kw (sort keys %{ $self->{kw} }) { 1083 for my $kw (sort keys %{ $self->{kw} }) {
… …
1023} 1092}
1024 1093
1025sub feed { 1094sub feed {
1026 my ($self, $msg) = @_; 1095 my ($self, $msg) = @_;
1027 1096
1028 Scalar::Util::weaken $self; 1097 CFPlus::weaken $self;
1029 1098
1030 if ($msg->{msgtype} eq "reply") { 1099 if ($msg->{msgtype} eq "reply") {
1031 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1100 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1032 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1101 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1033 1102
… …
1084 1153
1085 $self->SUPER::destroy; 1154 $self->SUPER::destroy;
1086} 1155}
1087 1156
10881 11571
1158

Diff Legend

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