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.73 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.98 by root, Fri Apr 6 19:17:25 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
43 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 44 CFPlus::Pod::find command => "*";
39 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
40 $self->{map_widget}->add_command (@$_) 63 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 64 for @cmd_help;
42 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 {
43 $self->{noface} = new_from_file CFPlus::Texture 73 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 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 }
45 77
46 $self->{open_container} = 0; 78 $self->{open_container} = 0;
47 79
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 80 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 81 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 82
55 $self 83 $self
56} 84}
57 85
58sub logprint { 86sub logprint {
… …
258 286
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 287 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 288
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 289 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
262 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 290 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
263 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
264 291
265 my ($x, $y) = (0, 1); 292 my ($x, $y) = (0, 1);
266 for ( 293 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 294 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 295 map [$_, $self->{skill_info}{$_}],
… …
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 }
… …
294 322
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 323 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
296 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 324 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
297 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 325 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
298 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 326 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
299 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 327 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
328 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 329
301 $x++ and ($x, $y) = (0, $y + 1); 330 $x++ and ($x, $y) = (0, $y + 1);
302 } 331 }
303 } 332 }
304 333
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 335 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 336 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 337 }
309} 338}
310 339
340sub macro_send {
341 my ($self, $macro) = @_;
342
343 for my $cmd (@{ $macro->{action} }) {
344 $self->send_command ($cmd);
345 }
346}
347
311sub user_send { 348sub user_send {
312 my ($self, $command) = @_; 349 my ($self, $command) = @_;
313 350
351 $self->{record}->($command)
314 if ($self->{record}) { 352 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 353
318 $self->logprint ("send: ", $command); 354 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 355 $self->send_command ($command);
320 ::status ($command); 356 ::status ($command);
321} 357}
322 358
323sub start_record { 359sub record {
324 my ($self) = @_; 360 my ($self, $cb) = @_;
325 361
326 $self->{record} = []; 362 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 363}
333 364
334sub map_scroll { 365sub map_scroll {
335 my ($self, $dx, $dy) = @_; 366 my ($self, $dx, $dy) = @_;
336 367
… …
338} 369}
339 370
340sub feed_map1a { 371sub feed_map1a {
341 my ($self, $data) = @_; 372 my ($self, $data) = @_;
342 373
343 $self->{map}->map1a_update ($data); 374 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 375 $self->{map_widget}->update;
345} 376}
346 377
347sub magicmap { 378sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 379 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 388 or return;
358 389
359 my ($hash, $x, $y, $w, $h) = @$map_info; 390 my ($hash, $x, $y, $w, $h) = @$map_info;
360 391
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 392 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 393 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 394 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 395}
365 396
366sub map_clear { 397sub map_clear {
367 my ($self) = @_; 398 my ($self) = @_;
… …
371 402
372 $self->{map}->clear; 403 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 404 delete $self->{map_widget}{magicmap};
374} 405}
375 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 return unless $self->{map}; # stop when destroyed
421
422 $self->set_texture ($id => $data)
423 if defined $data;
424
425 $self->bg_fetch;
426 };
427}
376 428
377sub load_map($$$) { 429sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 430 my ($self, $hash, $x, $y) = @_;
379 431
380 if (defined (my $data = $self->{mapcache}->get ($hash))) { 432 CFPlus::DB::get $self->{mapcache} => $hash, sub {
433 my ($data) = @_;
434
435 if (defined $data) {
381 $data = Compress::LZF::decompress $data; 436 $data = Compress::LZF::decompress $data;
382 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 437 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 438
387 $self->set_texture ($id => $data); 439 my $inprogress = @{ $self->{bg_fetch} || [] };
440 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
441 $self->bg_fetch unless $inprogress;
388 } 442 }
389 } 443 };
390} 444}
391 445
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 446# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 447# (server resource,s latency, bandwidth), so this hack is warranted.
394# the right fix is to make real tiled maps with an overview file 448# the right fix is to make real tiled maps with an overview file
… …
508 $self->load_map ($hash, $x, $y); 562 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 563 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 564}
511 565
512sub face_find { 566sub face_find {
513 my ($self, $facenum, $face) = @_; 567 my ($self, $facenum, $face, $cb) = @_;
514 568
515 my $hash = "$face->{chksum},$face->{name}"; 569 my $hash = "$face->{chksum},$face->{name}";
516 570
517 my $id = $self->{facemap}->get ($hash); 571 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 572
519 unless ($id) {
520 # create new id for face
521 # I love transactions
522 for (1..100) {
523 my $txn = $CFPlus::DB_ENV->txn_begin;
524 my $status = $self->{facemap}->db_get (id => $id);
525 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
526 $id = ($id || 64) + 1;
527 if ($self->{facemap}->put (id => $id) == 0
528 && $self->{facemap}->put ($hash => $id) == 0) {
529 $txn->txn_commit;
530
531 goto gotid;
532 }
533 }
534 $txn->txn_abort;
535 }
536
537 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
538 }
539
540gotid:
541 $face->{id} = $id; 573 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 574 $self->{faceid}[$facenum] = $id;
544 575
545 my $face = $self->{tilecache}->get ($id); 576 $self->{map}->set_tileid ($facenum => $id);
546 577
547 if ($face) { 578 CFPlus::DB::get tilecache => $id, $cb;
548 #$self->face_prefetch;
549 $face
550 } else {
551 my $tex = $self->{noface};
552 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
553 undef
554 };
555} 579}
556 580
557sub face_update { 581sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 582 my ($self, $facenum, $face, $changed) = @_;
559 583
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 584 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
585 if $changed;
561 586
562 $self->set_texture ($face->{id} => delete $face->{image}); 587 $self->set_texture ($face->{id} => delete $face->{image});
563} 588}
564 589
565sub set_texture { 590sub set_texture {
566 my ($self, $id, $data) = @_; 591 my ($self, $id, $data) = @_;
567 592
568 $self->{texture}[$id] ||= do { 593 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 594 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 595 $data, minify => 1, mipmap => 1;
572 596
573 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 597 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
574 $self->{map_widget}->update; 598 $self->{map_widget}->update;
575
576 $tex
577 };
578} 599}
579 600
580sub sound_play { 601sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 602 my ($self, $x, $y, $soundnum, $type) = @_;
582 603
… …
611 [0.75, 0.61, 0.20], 632 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 633 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 634 [0.74, 0.65, 0.41],
614 ); 635 );
615 636
637 my $fg = $color[$color % @color];
638
616 $self->logprint ("info: ", $text); 639 $self->logprint ("info: ", $text);
617
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
619 640
620 # try to create single paragraphs of multiple lines sent by the server 641 # try to create single paragraphs of multiple lines sent by the server
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 642 $text =~ s/(?<=\S)\n(?=\w)/ /g;
622 643
623 $text = CFPlus::asxml $text; 644 $text = CFPlus::asxml $text;
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 645 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 646 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 647
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ }) 648 ::message ({ fg => $fg, markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text; 649 for split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630 650
631 $self->{statusbox}->add ($text, 651 $self->{statusbox}->add ($text,
632 group => $text, 652 group => $text,
633 fg => $color[$color], 653 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 654 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 655 tooltip_font => $::FONT_FIXED,
636 ); 656 );
637} 657}
638 658
… …
648 # try to create single paragraphs out of the multiple lines sent by the server 668 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 669 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 670 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 671 $spell->{message} ||= "Server did not provide a description for this spell.";
652 672
653 $::SPELL_PAGE->add_spell ($spell); 673 $::SPELL_LIST->add_spell ($spell);
654 674
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 675 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
656 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 676 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 677}
658 678
659sub spell_delete { 679sub spell_delete {
660 my ($self, $spell) = @_; 680 my ($self, $spell) = @_;
661 681
662 $::SPELL_PAGE->remove_spell ($spell); 682 $::SPELL_LIST->remove_spell ($spell);
683}
684
685sub setup {
686 my ($self, $setup) = @_;
687
688 $self->{map_widget}->set_tilesize ($self->{tilesize});
689 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 690}
664 691
665sub addme_success { 692sub addme_success {
666 my ($self) = @_; 693 my ($self) = @_;
667 694
… …
873 $::SERVER_INFO->set_markup ( 900 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 901 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 902 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 903 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 904 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
905 . "editing support $yesno[!!$self->{editor_support}]\n"
906 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 907 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 908 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 909 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 910 );
911
912 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 913}
883 914
884sub logged_in { 915sub logged_in {
885 my ($self) = @_; 916 my ($self) = @_;
886 917
887 $self->send_ext_req (cfplus_support => version => 1, sub { 918 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 919 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 920 $self->update_server_info;
890 921
922 if ($self->{cfplus_ext} >= 2) {
923 $self->send_ext_req ("editor_support", sub {
924 $self->{editor_support} = $_[0];
925 $self->update_server_info;
926
927 0
928 });
929 }
930
891 0 931 0
892 }); 932 });
893 933
894 $self->update_server_info; 934 $self->update_server_info;
895 935
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 936 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 937 $self->send_command ("output-count $::CFG->{output_count}");
938 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 939 $self->send_command ("pickup $::CFG->{pickup}");
940}
941
942sub buildat {
943 my ($self, $builditem, $x, $y) = @_;
944
945 if ($self->{cfplus_ext}) {
946 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
947 }
899} 948}
900 949
901sub lookat { 950sub lookat {
902 my ($self, $x, $y) = @_; 951 my ($self, $x, $y) = @_;
903 952
… …
921} 970}
922 971
923sub destroy { 972sub destroy {
924 my ($self) = @_; 973 my ($self) = @_;
925 974
926 $self->{npc_dialog}->destroy 975 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 976 if $self->{npc_dialog};
928 977
929 $self->SUPER::destroy; 978 $self->SUPER::destroy;
930} 979}
931 980
932package CFPlus::NPCDialog; 981package CFPlus::NPCDialog;
933 982
934our @ISA = 'CFPlus::UI::FancyFrame'; 983our @ISA = 'CFPlus::UI::Toplevel';
935 984
936sub new { 985sub new {
937 my $class = shift; 986 my $class = shift;
938 987
939 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 995 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 996 has_close_button => 1,
948 @_, 997 @_,
949 ); 998 );
950 999
951 Scalar::Util::weaken (my $this = $self); 1000 CFPlus::weaken (my $this = $self);
952 1001
953 $self->connect (delete => sub { $this->destroy; 1 }); 1002 $self->connect (delete => sub { $this->destroy; 1 });
954 1003
955 # better use a pane... 1004 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1005 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1000}; 1049};
1001 1050
1002sub update_options { 1051sub update_options {
1003 my ($self) = @_; 1052 my ($self) = @_;
1004 1053
1005 Scalar::Util::weaken $self; 1054 CFPlus::weaken $self;
1006 1055
1007 $self->{options}->clear; 1056 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1057 $self->{options}->add ($self->{bye_button});
1009 1058
1010 for my $kw (sort keys %{ $self->{kw} }) { 1059 for my $kw (sort keys %{ $self->{kw} }) {
… …
1019} 1068}
1020 1069
1021sub feed { 1070sub feed {
1022 my ($self, $msg) = @_; 1071 my ($self, $msg) = @_;
1023 1072
1024 Scalar::Util::weaken $self; 1073 CFPlus::weaken $self;
1025 1074
1026 if ($msg->{msgtype} eq "reply") { 1075 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1076 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1077 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1029 1078
… …
1043 padding_y => 0, 1092 padding_y => 0,
1044 on_button_up => sub { 1093 on_button_up => sub {
1045 $self->send ($kw); 1094 $self->send ($kw);
1046 }; 1095 };
1047 1096
1048 chr 0xfffc 1097 "\x{fffc}"
1049 }giex; 1098 }giex;
1050 1099
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1100 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1101 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1102 $self->update_options;
… …
1080 1129
1081 $self->SUPER::destroy; 1130 $self->SUPER::destroy;
1082} 1131}
1083 1132
10841 11331
1134

Diff Legend

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