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.80 by root, Fri Aug 18 03:20:00 2006 UTC vs.
Revision 1.106 by root, Sun Apr 29 20:03:08 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 {
… …
219 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 249 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
220 $::GAUGES->{food} ->set_value ($fo, $fo_m); 250 $::GAUGES->{food} ->set_value ($fo, $fo_m);
221 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 251 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
222 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
223 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
224 my $rng = $stats->{+CS_STAT_RANGE}; 254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
225 $rng =~ s/^Range: //; # thank you so much dear server
226 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
227 my $title = $stats->{+CS_STAT_TITLE}; 255 my $title = $stats->{+CS_STAT_TITLE};
228 $title =~ s/^Player: //; 256 $title =~ s/^Player: //;
229 $::STATWIDS->{title} ->set_text ("Title: " . $title); 257 $::STATWIDS->{title} ->set_text ("Title: " . $title);
230 258
231 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 259 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 if ($ev->{button} == 1) { 308 if ($ev->{button} == 1) {
281 $::CONN->user_send ("ready_skill $name"); 309 $::CONN->user_send ("ready_skill $name");
282 } elsif ($ev->{button} == 2) { 310 } elsif ($ev->{button} == 2) {
283 $::CONN->user_send ("use_skill $name"); 311 $::CONN->user_send ("use_skill $name");
284 } elsif ($ev->{button} == 3) { 312 } elsif ($ev->{button} == 3) {
313 my $shortname = CFPlus::shorten $name, 14;
285 (new CFPlus::UI::Menu 314 (new CFPlus::UI::Menu
286 items => [ 315 items => [
287 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 316 ["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"]) }], 317 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
289 ], 318 ],
290 )->popup ($ev); 319 )->popup ($ev);
291 } else { 320 } else {
292 return 0; 321 return 0;
293 } 322 }
… …
310 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
311 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
312 } 341 }
313} 342}
314 343
344sub macro_send {
345 my ($self, $macro) = @_;
346
347 for my $cmd (@{ $macro->{action} }) {
348 $self->send_command ($cmd);
349 }
350}
351
315sub user_send { 352sub user_send {
316 my ($self, $command) = @_; 353 my ($self, $command) = @_;
317 354
355 $self->{record}->($command)
318 if ($self->{record}) { 356 if $self->{record};
319 push @{$self->{record}}, $command;
320 }
321 357
322 $self->logprint ("send: ", $command); 358 $self->logprint ("send: ", $command);
323 $self->send_command ($command); 359 $self->send_command ($command);
324 ::status ($command); 360 ::status ($command);
325} 361}
326 362
327sub start_record { 363sub record {
328 my ($self) = @_; 364 my ($self, $cb) = @_;
329 365
330 $self->{record} = []; 366 $self->{record} = $cb;
331}
332
333sub stop_record {
334 my ($self) = @_;
335 return delete $self->{record};
336} 367}
337 368
338sub map_scroll { 369sub map_scroll {
339 my ($self, $dx, $dy) = @_; 370 my ($self, $dx, $dy) = @_;
340 371
… …
361 or return; 392 or return;
362 393
363 my ($hash, $x, $y, $w, $h) = @$map_info; 394 my ($hash, $x, $y, $w, $h) = @$map_info;
364 395
365 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 396 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
366 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
367 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
368} 399}
369 400
370sub map_clear { 401sub map_clear {
371 my ($self) = @_; 402 my ($self) = @_;
… …
375 406
376 $self->{map}->clear; 407 $self->{map}->clear;
377 delete $self->{map_widget}{magicmap}; 408 delete $self->{map_widget}{magicmap};
378} 409}
379 410
411sub bg_fetch {
412 my ($self) = @_;
413
414 my $id;
415
416 do {
417 $id = pop @{$self->{bg_fetch}}
418 or return;
419 } while $self->{texture}[$id];
420
421 CFPlus::DB::get tilecache => $id, sub {
422 my ($data) = @_;
423
424 return unless $self->{map}; # stop when destroyed
425
426 $self->set_texture ($id => $data)
427 if defined $data;
428
429 $self->bg_fetch;
430 };
431}
380 432
381sub load_map($$$) { 433sub load_map($$$) {
382 my ($self, $hash, $x, $y) = @_; 434 my ($self, $hash, $x, $y) = @_;
383 435
384 if (defined (my $data = $self->{mapcache}->get ($hash))) { 436 my $gen = $self->{map_change_gen};
437
438 CFPlus::DB::get $self->{mapcache} => $hash, sub {
439 return unless $gen == $self->{map_change_gen};
440
441 my ($data) = @_;
442
443 if (defined $data) {
385 $data = Compress::LZF::decompress $data; 444 $data = Compress::LZF::decompress $data;
386 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 445 #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 446
391 $self->set_texture ($id => $data); 447 my $inprogress = @{ $self->{bg_fetch} || [] };
448 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
449 $self->bg_fetch unless $inprogress;
392 } 450 }
393 } 451 };
394} 452}
395 453
396# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 454# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
397# (server resource,s latency, bandwidth), so this hack is warranted. 455# (server resource,s latency, bandwidth), so this hack is warranted.
398# the right fix is to make real tiled maps with an overview file 456# the right fix is to make real tiled maps with an overview file
… …
462 520
463 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 521 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
464 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 522 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
465 523
466 } else { 524 } else {
525 my $gen = $self->{map_change_gen};
467 $self->send_mapinfo ("spatial $path$tile", sub { 526 $self->send_mapinfo ("spatial $path$tile", sub {
527 return unless $gen == $self->{map_change_gen};
528
468 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 529 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
469 530
470 return if $mode ne "spatial"; 531 return if $mode ne "spatial";
471 532
472 $x += $self->{map}->ox; 533 $x += $self->{map}->ox;
… …
486 547
487sub map_change { 548sub map_change {
488 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
489 550
490 $self->flush_map; 551 $self->flush_map;
552
553 ++$self->{map_change_gen};
491 554
492 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
493 556
494 my $mapmapw = $self->{mapmap}->{w}; 557 my $mapmapw = $self->{mapmap}->{w};
495 my $mapmaph = $self->{mapmap}->{h}; 558 my $mapmaph = $self->{mapmap}->{h};
… …
512 $self->load_map ($hash, $x, $y); 575 $self->load_map ($hash, $x, $y);
513 $self->flood_fill (0, 0, 0, "", $hash, $flags); 576 $self->flood_fill (0, 0, 0, "", $hash, $flags);
514} 577}
515 578
516sub face_find { 579sub face_find {
517 my ($self, $facenum, $face) = @_; 580 my ($self, $facenum, $face, $cb) = @_;
518 581
519 my $hash = "$face->{chksum},$face->{name}"; 582 my $hash = "$face->{chksum},$face->{name}";
520 583
521 my $id = $self->{facemap}->get ($hash); 584 my $id = CFPlus::DB::get_tile_id_sync $hash;
522 585
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; 586 $face->{id} = $id;
546 $self->{map}->set_face ($facenum => $id);
547 $self->{faceid}[$facenum] = $id;#d# 587 $self->{faceid}[$facenum] = $id;
548 588
549 my $face = $self->{tilecache}->get ($id); 589 $self->{map}->set_tileid ($facenum => $id);
550 590
551 if ($face) { 591 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} 592}
560 593
561sub face_update { 594sub face_update {
562 my ($self, $facenum, $face, $changed) = @_; 595 my ($self, $facenum, $face, $changed) = @_;
563 596
564 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
598 if $changed;
565 599
566 $self->set_texture ($face->{id} => delete $face->{image}); 600 $self->set_texture ($face->{id} => delete $face->{image});
601}
602
603sub smooth_update {
604 my ($self, $facenum, $face) = @_;
605
606 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
567} 607}
568 608
569sub set_texture { 609sub set_texture {
570 my ($self, $id, $data) = @_; 610 my ($self, $id, $data) = @_;
571 611
572 $self->{texture}[$id] ||= do { 612 $self->{texture}[$id] = my $tex =
573 my $tex =
574 new_from_image CFPlus::Texture 613 new_from_image CFPlus::Texture
575 $data, minify => 1, mipmap => 1; 614 $data, minify => 1, mipmap => 1;
576 615
577 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 616 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
578 $self->{map_widget}->update; 617 $self->{map_widget}->update;
579
580 $tex
581 };
582} 618}
583 619
584sub sound_play { 620sub sound_play {
585 my ($self, $x, $y, $soundnum, $type) = @_; 621 my ($self, $x, $y, $soundnum, $type) = @_;
586 622
… …
596 $LAST_QUERY = $prompt; 632 $LAST_QUERY = $prompt;
597 633
598 $self->{query}-> ($self, $flags, $prompt); 634 $self->{query}-> ($self, $flags, $prompt);
599} 635}
600 636
601sub drawinfo { 637our %NAME_TO_COLOR = (
602 my ($self, $color, $text) = @_; 638 black => 0,
639 white => 1,
640 darkblue => 2,
641 red => 3,
642 orange => 4,
643 lightblue => 5,
644 darkorange => 6,
645 green => 7,
646 darkgreen => 8,
647 grey => 9,
648 brown => 10,
649 yellow => 11,
650 tan => 12,
651);
603 652
604 my @color = ( 653our @CF_COLOR = (
605 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 654 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
606 [1.00, 1.00, 1.00], 655 [1.00, 1.00, 1.00],
607 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 656 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
608 [1.00, 0.00, 0.00], 657 [1.00, 0.00, 0.00],
609 [1.00, 0.54, 0.00], 658 [1.00, 0.54, 0.00],
610 [0.11, 0.56, 1.00], 659 [0.11, 0.56, 1.00],
611 [0.93, 0.46, 0.00], 660 [0.93, 0.46, 0.00],
612 [0.18, 0.54, 0.34], 661 [0.18, 0.54, 0.34],
613 [0.56, 0.73, 0.56], 662 [0.56, 0.73, 0.56],
614 [0.80, 0.80, 0.80], 663 [0.80, 0.80, 0.80],
615 [0.75, 0.61, 0.20], 664 [0.75, 0.61, 0.20],
616 [0.99, 0.77, 0.26], 665 [0.99, 0.77, 0.26],
617 [0.74, 0.65, 0.41], 666 [0.74, 0.65, 0.41],
618 ); 667);
619 668
669sub msg {
670 my ($self, $color, $type, $text, @extra) = @_;
671
672 if (my $cb = $self->{cb_msg}{$type}) {
673 $_->($self, $color, $type, $text, @extra) for values %$cb;
674 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
675 $type =~ s/-/_/g;
676 $self->{$type} = $text;
677 } else {
620 $self->logprint ("info: ", $text); 678 $self->logprint ("msg: ", $text);
679 return if $color < 0; # negative color == ignore if not understood
621 680
622 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 681 my $fg = $CF_COLOR[$color % @CF_COLOR];
623 682
624 # try to create single paragraphs of multiple lines sent by the server 683 ## try to create single paragraphs of multiple lines sent by the server
684 # no longer neecssary with TRT servers
625 $text =~ s/(?<=\S)\n(?=\w)/ /g; 685 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
626 686
627 $text = CFPlus::asxml $text; 687 ::message ({ fg => $fg, markup => $_ })
628 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 688 for split /\n/, $text;
629 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
630 689
631 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
632 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
633 $self->{logview}->scroll_to_bottom;
634
635 $self->{statusbox}->add ($text, 690 $self->{statusbox}->add ($text,
636 group => $text, 691 group => $text,
637 fg => $color[$color], 692 fg => $fg,
638 timeout => $color >= 2 ? 180 : 10, 693 timeout => $color >= 2 ? 180 : 10,
639 tooltip_font => $::FONT_FIXED, 694 tooltip_font => $::FONT_FIXED,
640 ); 695 );
641} 696 }
642
643sub drawextinfo {
644 my ($self, $color, $type, $subtype, $message) = @_;
645
646 $self->drawinfo ($color, $message);
647} 697}
648 698
649sub spell_add { 699sub spell_add {
650 my ($self, $spell) = @_; 700 my ($self, $spell) = @_;
651 701
652 # try to create single paragraphs out of the multiple lines sent by the server 702 # try to create single paragraphs out of the multiple lines sent by the server
653 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 703 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
654 $spell->{message} =~ s/\n+$//; 704 $spell->{message} =~ s/\n+$//;
655 $spell->{message} ||= "Server did not provide a description for this spell."; 705 $spell->{message} ||= "Server did not provide a description for this spell.";
656 706
657 $::SPELL_PAGE->add_spell ($spell); 707 $::SPELL_LIST->add_spell ($spell);
658 708
659 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 709 $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}); 710 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
661} 711}
662 712
663sub spell_delete { 713sub spell_delete {
664 my ($self, $spell) = @_; 714 my ($self, $spell) = @_;
665 715
666 $::SPELL_PAGE->remove_spell ($spell); 716 $::SPELL_LIST->remove_spell ($spell);
717}
718
719sub setup {
720 my ($self, $setup) = @_;
721
722 $self->{map_widget}->set_tilesize ($self->{tilesize});
723 $::MAP->resize ($self->{mapw}, $self->{maph});
667} 724}
668 725
669sub addme_success { 726sub addme_success {
670 my ($self) = @_; 727 my ($self) = @_;
671 728
… …
877 $::SERVER_INFO->set_markup ( 934 $::SERVER_INFO->set_markup (
878 "server <tt>$self->{host}:$self->{port}</tt>\n" 935 "server <tt>$self->{host}:$self->{port}</tt>\n"
879 . "protocol version <tt>$self->{version}</tt>\n" 936 . "protocol version <tt>$self->{version}</tt>\n"
880 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 937 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
881 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 938 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
939 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
940 . "editing support $yesno[!!$self->{editor_support}]\n"
882 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 941 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
942 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
883 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 943 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
884 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 944 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
885 . "map size $self->{mapw}×$self->{maph}\n" 945 . "map size $self->{mapw}×$self->{maph}\n"
886 ); 946 );
947
948 ::setup_build_button ($self->{editor_support}->{builder_ui});
887} 949}
888 950
889sub logged_in { 951sub logged_in {
890 my ($self) = @_; 952 my ($self) = @_;
891 953
892 $self->send_ext_req (cfplus_support => version => 1, sub { 954 $self->send_ext_req (cfplus_support => version => 1, sub {
893 $self->{cfplus_ext} = $_[0]{version}; 955 $self->{cfplus_ext} = $_[0]{version};
894 $self->update_server_info; 956 $self->update_server_info;
895 957
958 if ($self->{cfplus_ext} >= 2) {
959 $self->send_ext_req ("editor_support", sub {
960 $self->{editor_support} = $_[0];
961 $self->update_server_info;
962
963 0
964 });
965 }
966
896 0 967 0
897 }); 968 });
898 969
899 $self->update_server_info; 970 $self->update_server_info;
900 971
901 $self->send_command ("output-sync $::CFG->{output_sync}"); 972 $self->send_command ("output-sync $::CFG->{output_sync}");
902 $self->send_command ("output-count $::CFG->{output_count}"); 973 $self->send_command ("output-count $::CFG->{output_count}");
974 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
903 $self->send_command ("pickup $::CFG->{pickup}"); 975 $self->send_command ("pickup $::CFG->{pickup}");
976}
977
978sub buildat {
979 my ($self, $builditem, $x, $y) = @_;
980
981 if ($self->{cfplus_ext}) {
982 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
983 }
904} 984}
905 985
906sub lookat { 986sub lookat {
907 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
908 988
… …
951 kw => { hi => 0, yes => 0, no => 0 }, 1031 kw => { hi => 0, yes => 0, no => 0 },
952 has_close_button => 1, 1032 has_close_button => 1,
953 @_, 1033 @_,
954 ); 1034 );
955 1035
956 Scalar::Util::weaken (my $this = $self); 1036 CFPlus::weaken (my $this = $self);
957 1037
958 $self->connect (delete => sub { $this->destroy; 1 }); 1038 $self->connect (delete => sub { $this->destroy; 1 });
959 1039
960 # better use a pane... 1040 # better use a pane...
961 $self->add (my $hbox = new CFPlus::UI::HBox); 1041 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1005}; 1085};
1006 1086
1007sub update_options { 1087sub update_options {
1008 my ($self) = @_; 1088 my ($self) = @_;
1009 1089
1010 Scalar::Util::weaken $self; 1090 CFPlus::weaken $self;
1011 1091
1012 $self->{options}->clear; 1092 $self->{options}->clear;
1013 $self->{options}->add ($self->{bye_button}); 1093 $self->{options}->add ($self->{bye_button});
1014 1094
1015 for my $kw (sort keys %{ $self->{kw} }) { 1095 for my $kw (sort keys %{ $self->{kw} }) {
… …
1024} 1104}
1025 1105
1026sub feed { 1106sub feed {
1027 my ($self, $msg) = @_; 1107 my ($self, $msg) = @_;
1028 1108
1029 Scalar::Util::weaken $self; 1109 CFPlus::weaken $self;
1030 1110
1031 if ($msg->{msgtype} eq "reply") { 1111 if ($msg->{msgtype} eq "reply") {
1032 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1112 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1033 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1113 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1034 1114
… …
1085 1165
1086 $self->SUPER::destroy; 1166 $self->SUPER::destroy;
1087} 1167}
1088 1168
10891 11691
1170

Diff Legend

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