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.108 by root, Sun Jun 24 04:11:22 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 (@_); 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
49 } sort { $a->{par} <=> $b->{par} }
38 } CFPlus::Pod::find command_help => "*"; 50 CFPlus::Pod::find command => "*";
39 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
40 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
41 for @cmd_help; 70 for @cmd_help;
42 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 {
43 $self->{noface} = new_from_file CFPlus::Texture 79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
44 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 }
45 83
46 $self->{open_container} = 0; 84 $self->{open_container} = 0;
47 85
48 # "global"
49 $self->{tilecache} = CFPlus::db_table "tilecache";
50 $self->{facemap} = CFPlus::db_table "facemap";
51
52 # per server 86 # per server
53 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
54 88
55 $self 89 $self
56} 90}
57 91
58sub logprint { 92sub logprint {
… …
215 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 249 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
216 $::GAUGES->{food} ->set_value ($fo, $fo_m); 250 $::GAUGES->{food} ->set_value ($fo, $fo_m);
217 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 251 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
218 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 252 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
219 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 253 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
220 my $rng = $stats->{+CS_STAT_RANGE}; 254 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
221 $rng =~ s/^Range: //; # thank you so much dear server
222 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
223 my $title = $stats->{+CS_STAT_TITLE}; 255 my $title = $stats->{+CS_STAT_TITLE};
224 $title =~ s/^Player: //; 256 $title =~ s/^Player: //;
225 $::STATWIDS->{title} ->set_text ("Title: " . $title); 257 $::STATWIDS->{title} ->set_text ("Title: " . $title);
226 258
227 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 259 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
258 290
259 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 291 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
260 292
261 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 293 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); 294 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 295
265 my ($x, $y) = (0, 1); 296 my ($x, $y) = (0, 1);
266 for ( 297 for (
267 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 298 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
268 map [$_, $self->{skill_info}{$_}], 299 map [$_, $self->{skill_info}{$_}],
… …
277 if ($ev->{button} == 1) { 308 if ($ev->{button} == 1) {
278 $::CONN->user_send ("ready_skill $name"); 309 $::CONN->user_send ("ready_skill $name");
279 } elsif ($ev->{button} == 2) { 310 } elsif ($ev->{button} == 2) {
280 $::CONN->user_send ("use_skill $name"); 311 $::CONN->user_send ("use_skill $name");
281 } elsif ($ev->{button} == 3) { 312 } elsif ($ev->{button} == 3) {
313 my $shortname = CFPlus::shorten $name, 14;
282 (new CFPlus::UI::Menu 314 (new CFPlus::UI::Menu
283 items => [ 315 items => [
284 ["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"] }],
285 ["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"] }],
286 ], 318 ],
287 )->popup ($ev); 319 )->popup ($ev);
288 } else { 320 } else {
289 return 0; 321 return 0;
290 } 322 }
… …
294 326
295 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 327 $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); 328 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 329 $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); 330 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); 331 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
332 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
300 333
301 $x++ and ($x, $y) = (0, $y + 1); 334 $x++ and ($x, $y) = (0, $y + 1);
302 } 335 }
303 } 336 }
304 337
… …
306 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 339 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
307 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 340 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
308 } 341 }
309} 342}
310 343
344sub macro_send {
345 my ($self, $macro) = @_;
346
347 for my $cmd (@{ $macro->{action} }) {
348 $self->send_command ($cmd);
349 }
350}
351
311sub user_send { 352sub user_send {
312 my ($self, $command) = @_; 353 my ($self, $command) = @_;
313 354
355 $self->{record}->($command)
314 if ($self->{record}) { 356 if $self->{record};
315 push @{$self->{record}}, $command;
316 }
317 357
318 $self->logprint ("send: ", $command); 358 $self->logprint ("send: ", $command);
319 $self->send_command ($command); 359 $self->send_command ($command);
320 ::status ($command); 360 ::status ($command);
321} 361}
322 362
323sub start_record { 363sub record {
324 my ($self) = @_; 364 my ($self, $cb) = @_;
325 365
326 $self->{record} = []; 366 $self->{record} = $cb;
327}
328
329sub stop_record {
330 my ($self) = @_;
331 return delete $self->{record};
332} 367}
333 368
334sub map_scroll { 369sub map_scroll {
335 my ($self, $dx, $dy) = @_; 370 my ($self, $dx, $dy) = @_;
336 371
… …
338} 373}
339 374
340sub feed_map1a { 375sub feed_map1a {
341 my ($self, $data) = @_; 376 my ($self, $data) = @_;
342 377
343 $self->{map}->map1a_update ($data); 378 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
344 $self->{map_widget}->update; 379 $self->{map_widget}->update;
345} 380}
346 381
347sub magicmap { 382sub magicmap {
348 my ($self, $w, $h, $x, $y, $data) = @_; 383 my ($self, $w, $h, $x, $y, $data) = @_;
… …
357 or return; 392 or return;
358 393
359 my ($hash, $x, $y, $w, $h) = @$map_info; 394 my ($hash, $x, $y, $w, $h) = @$map_info;
360 395
361 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 396 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
362 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 397 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
363 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 398 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
364} 399}
365 400
366sub map_clear { 401sub map_clear {
367 my ($self) = @_; 402 my ($self) = @_;
… …
371 406
372 $self->{map}->clear; 407 $self->{map}->clear;
373 delete $self->{map_widget}{magicmap}; 408 delete $self->{map_widget}{magicmap};
374} 409}
375 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}
376 432
377sub load_map($$$) { 433sub load_map($$$) {
378 my ($self, $hash, $x, $y) = @_; 434 my ($self, $hash, $x, $y) = @_;
379 435
380 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) {
381 $data = Compress::LZF::decompress $data; 444 $data = Compress::LZF::decompress $data;
382 #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#
383 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
384 my $data = $self->{tilecache}->get ($id)
385 or next;
386 446
387 $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;
388 } 450 }
389 } 451 };
390} 452}
391 453
392# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 454# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
393# (server resource,s latency, bandwidth), so this hack is warranted. 455# (server resource,s latency, bandwidth), so this hack is warranted.
394# 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
… …
458 520
459 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 521 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
460 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 522 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
461 523
462 } else { 524 } else {
525 my $gen = $self->{map_change_gen};
463 $self->send_mapinfo ("spatial $path$tile", sub { 526 $self->send_mapinfo ("spatial $path$tile", sub {
527 return unless $gen == $self->{map_change_gen};
528
464 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 529 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
465 530
466 return if $mode ne "spatial"; 531 return if $mode ne "spatial";
467 532
468 $x += $self->{map}->ox; 533 $x += $self->{map}->ox;
… …
482 547
483sub map_change { 548sub map_change {
484 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 549 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
485 550
486 $self->flush_map; 551 $self->flush_map;
552
553 ++$self->{map_change_gen};
487 554
488 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 555 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
489 556
490 my $mapmapw = $self->{mapmap}->{w}; 557 my $mapmapw = $self->{mapmap}->{w};
491 my $mapmaph = $self->{mapmap}->{h}; 558 my $mapmaph = $self->{mapmap}->{h};
… …
508 $self->load_map ($hash, $x, $y); 575 $self->load_map ($hash, $x, $y);
509 $self->flood_fill (0, 0, 0, "", $hash, $flags); 576 $self->flood_fill (0, 0, 0, "", $hash, $flags);
510} 577}
511 578
512sub face_find { 579sub face_find {
513 my ($self, $facenum, $face) = @_; 580 my ($self, $facenum, $face, $cb) = @_;
514 581
515 my $hash = "$face->{chksum},$face->{name}"; 582 my $hash = "$face->{chksum},$face->{name}";
516 583
517 my $id = $self->{facemap}->get ($hash); 584 my $id = CFPlus::DB::get_tile_id_sync $hash;
518 585
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; 586 $face->{id} = $id;
542 $self->{map}->set_face ($facenum => $id);
543 $self->{faceid}[$facenum] = $id;#d# 587 $self->{faceid}[$facenum] = $id;
544 588
545 my $face = $self->{tilecache}->get ($id); 589 $self->{map}->set_tileid ($facenum => $id);
546 590
547 if ($face) { 591 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} 592}
556 593
557sub face_update { 594sub face_update {
558 my ($self, $facenum, $face, $changed) = @_; 595 my ($self, $facenum, $face, $changed) = @_;
559 596
560 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 597 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
598 if $changed;
561 599
562 $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});
563} 607}
564 608
565sub set_texture { 609sub set_texture {
566 my ($self, $id, $data) = @_; 610 my ($self, $id, $data) = @_;
567 611
568 $self->{texture}[$id] ||= do { 612 $self->{texture}[$id] = my $tex =
569 my $tex =
570 new_from_image CFPlus::Texture 613 new_from_image CFPlus::Texture
571 $data, minify => 1, mipmap => 1; 614 $data, minify => 1, mipmap => 1;
572 615
573 $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}});
574 $self->{map_widget}->update; 617 $self->{map_widget}->update;
575
576 $tex
577 };
578} 618}
579 619
580sub sound_play { 620sub sound_play {
581 my ($self, $x, $y, $soundnum, $type) = @_; 621 my ($self, $x, $y, $soundnum, $type) = @_;
582 622
… …
592 $LAST_QUERY = $prompt; 632 $LAST_QUERY = $prompt;
593 633
594 $self->{query}-> ($self, $flags, $prompt); 634 $self->{query}-> ($self, $flags, $prompt);
595} 635}
596 636
597sub drawinfo { 637sub sanitise_xml($) {
598 my ($self, $color, $text) = @_; 638 local $_ = shift;
599 639
600 my @color = ( 640 # we now weed out all tags we do not support
641 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
642 # now all entities
643 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
644
645 # handle some elements
646 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
647 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
648
649 $_
650}
651
652our %NAME_TO_COLOR = (
653 black => 0,
654 white => 1,
655 darkblue => 2,
656 red => 3,
657 orange => 4,
658 lightblue => 5,
659 darkorange => 6,
660 green => 7,
661 darkgreen => 8,
662 grey => 9,
663 brown => 10,
664 yellow => 11,
665 tan => 12,
666);
667
668our @CF_COLOR = (
601 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 669 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
602 [1.00, 1.00, 1.00], 670 [1.00, 1.00, 1.00],
603 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 671 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
604 [1.00, 0.00, 0.00], 672 [1.00, 0.00, 0.00],
605 [1.00, 0.54, 0.00], 673 [1.00, 0.54, 0.00],
606 [0.11, 0.56, 1.00], 674 [0.11, 0.56, 1.00],
607 [0.93, 0.46, 0.00], 675 [0.93, 0.46, 0.00],
608 [0.18, 0.54, 0.34], 676 [0.18, 0.54, 0.34],
609 [0.56, 0.73, 0.56], 677 [0.56, 0.73, 0.56],
610 [0.80, 0.80, 0.80], 678 [0.80, 0.80, 0.80],
611 [0.75, 0.61, 0.20], 679 [0.75, 0.61, 0.20],
612 [0.99, 0.77, 0.26], 680 [0.99, 0.77, 0.26],
613 [0.74, 0.65, 0.41], 681 [0.74, 0.65, 0.41],
614 ); 682);
615 683
684sub msg {
685 my ($self, $color, $type, $text, @extra) = @_;
686
687 $text = sanitise_xml $text;
688
689 if (my $cb = $self->{cb_msg}{$type}) {
690 $_->($self, $color, $type, $text, @extra) for values %$cb;
691 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
692 $type =~ s/-/_/g;
693 $self->{$type} = $text;
694 } else {
616 $self->logprint ("info: ", $text); 695 $self->logprint ("msg: ", $text);
696 return if $color < 0; # negative color == ignore if not understood
617 697
618 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 698 my $fg = $CF_COLOR[$color % @CF_COLOR];
619 699
620 # try to create single paragraphs of multiple lines sent by the server 700 ## try to create single paragraphs of multiple lines sent by the server
701 # no longer neecssary with TRT servers
621 $text =~ s/(?<=\S)\n(?=\w)/ /g; 702 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
622 703
623 $text = CFPlus::asxml $text; 704 ::message ({ fg => $fg, markup => $_ })
624 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 705 for split /\n/, $text;
625 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
626 706
627 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
628 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
629 $self->{logview}->scroll_to_bottom;
630
631 $self->{statusbox}->add ($text, 707 $self->{statusbox}->add ($text,
632 group => $text, 708 group => $text,
633 fg => $color[$color], 709 fg => $fg,
634 timeout => $color >= 2 ? 180 : 10, 710 timeout => $color >= 2 ? 180 : 10,
635 tooltip_font => $::FONT_FIXED, 711 tooltip_font => $::FONT_FIXED,
636 ); 712 );
637} 713 }
638
639sub drawextinfo {
640 my ($self, $color, $type, $subtype, $message) = @_;
641
642 $self->drawinfo ($color, $message);
643} 714}
644 715
645sub spell_add { 716sub spell_add {
646 my ($self, $spell) = @_; 717 my ($self, $spell) = @_;
647 718
648 # try to create single paragraphs out of the multiple lines sent by the server 719 # try to create single paragraphs out of the multiple lines sent by the server
649 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 720 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
650 $spell->{message} =~ s/\n+$//; 721 $spell->{message} =~ s/\n+$//;
651 $spell->{message} ||= "Server did not provide a description for this spell."; 722 $spell->{message} ||= "Server did not provide a description for this spell.";
652 723
653 $::SPELL_PAGE->add_spell ($spell); 724 $::SPELL_LIST->add_spell ($spell);
654 725
655 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 726 $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}); 727 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
657} 728}
658 729
659sub spell_delete { 730sub spell_delete {
660 my ($self, $spell) = @_; 731 my ($self, $spell) = @_;
661 732
662 $::SPELL_PAGE->remove_spell ($spell); 733 $::SPELL_LIST->remove_spell ($spell);
734}
735
736sub setup {
737 my ($self, $setup) = @_;
738
739 $self->{map_widget}->set_tilesize ($self->{tilesize});
740 $::MAP->resize ($self->{mapw}, $self->{maph});
663} 741}
664 742
665sub addme_success { 743sub addme_success {
666 my ($self) = @_; 744 my ($self) = @_;
667 745
… …
873 $::SERVER_INFO->set_markup ( 951 $::SERVER_INFO->set_markup (
874 "server <tt>$self->{host}:$self->{port}</tt>\n" 952 "server <tt>$self->{host}:$self->{port}</tt>\n"
875 . "protocol version <tt>$self->{version}</tt>\n" 953 . "protocol version <tt>$self->{version}</tt>\n"
876 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 954 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
877 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 955 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
956 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
957 . "editing support $yesno[!!$self->{editor_support}]\n"
958 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
959 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
878 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 960 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
879 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 961 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
880 . "map size $self->{mapw}×$self->{maph}\n" 962 . "map size $self->{mapw}×$self->{maph}\n"
881 ); 963 );
964
965 ::setup_build_button ($self->{editor_support}->{builder_ui});
882} 966}
883 967
884sub logged_in { 968sub logged_in {
885 my ($self) = @_; 969 my ($self) = @_;
886 970
887 $self->send_ext_req (cfplus_support => version => 1, sub { 971 $self->send_ext_req (cfplus_support => version => 1, sub {
888 $self->{cfplus_ext} = $_[0]{version}; 972 $self->{cfplus_ext} = $_[0]{version};
889 $self->update_server_info; 973 $self->update_server_info;
890 974
975 if ($self->{cfplus_ext} >= 2) {
976 $self->send_ext_req ("editor_support", sub {
977 $self->{editor_support} = $_[0];
978 $self->update_server_info;
979
980 0
981 });
982 }
983
891 0 984 0
892 }); 985 });
893 986
894 $self->update_server_info; 987 $self->update_server_info;
895 988
896 $self->send_command ("output-sync $::CFG->{output_sync}"); 989 $self->send_command ("output-sync $::CFG->{output_sync}");
897 $self->send_command ("output-count $::CFG->{output_count}"); 990 $self->send_command ("output-count $::CFG->{output_count}");
991 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
898 $self->send_command ("pickup $::CFG->{pickup}"); 992 $self->send_command ("pickup $::CFG->{pickup}");
993}
994
995sub buildat {
996 my ($self, $builditem, $x, $y) = @_;
997
998 if ($self->{cfplus_ext}) {
999 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1000 }
899} 1001}
900 1002
901sub lookat { 1003sub lookat {
902 my ($self, $x, $y) = @_; 1004 my ($self, $x, $y) = @_;
903 1005
… …
921} 1023}
922 1024
923sub destroy { 1025sub destroy {
924 my ($self) = @_; 1026 my ($self) = @_;
925 1027
926 $self->{npc_dialog}->destroy 1028 (delete $self->{npc_dialog})->destroy
927 if $self->{npc_dialog}; 1029 if $self->{npc_dialog};
928 1030
929 $self->SUPER::destroy; 1031 $self->SUPER::destroy;
930} 1032}
931 1033
932package CFPlus::NPCDialog; 1034package CFPlus::NPCDialog;
933 1035
934our @ISA = 'CFPlus::UI::FancyFrame'; 1036our @ISA = 'CFPlus::UI::Toplevel';
935 1037
936sub new { 1038sub new {
937 my $class = shift; 1039 my $class = shift;
938 1040
939 my $self = $class->SUPER::new ( 1041 my $self = $class->SUPER::new (
… …
946 kw => { hi => 0, yes => 0, no => 0 }, 1048 kw => { hi => 0, yes => 0, no => 0 },
947 has_close_button => 1, 1049 has_close_button => 1,
948 @_, 1050 @_,
949 ); 1051 );
950 1052
951 Scalar::Util::weaken (my $this = $self); 1053 CFPlus::weaken (my $this = $self);
952 1054
953 $self->connect (delete => sub { $this->destroy; 1 }); 1055 $self->connect (delete => sub { $this->destroy; 1 });
954 1056
955 # better use a pane... 1057 # better use a pane...
956 $self->add (my $hbox = new CFPlus::UI::HBox); 1058 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
1000}; 1102};
1001 1103
1002sub update_options { 1104sub update_options {
1003 my ($self) = @_; 1105 my ($self) = @_;
1004 1106
1005 Scalar::Util::weaken $self; 1107 CFPlus::weaken $self;
1006 1108
1007 $self->{options}->clear; 1109 $self->{options}->clear;
1008 $self->{options}->add ($self->{bye_button}); 1110 $self->{options}->add ($self->{bye_button});
1009 1111
1010 for my $kw (sort keys %{ $self->{kw} }) { 1112 for my $kw (sort keys %{ $self->{kw} }) {
… …
1019} 1121}
1020 1122
1021sub feed { 1123sub feed {
1022 my ($self, $msg) = @_; 1124 my ($self, $msg) = @_;
1023 1125
1024 Scalar::Util::weaken $self; 1126 CFPlus::weaken $self;
1025 1127
1026 if ($msg->{msgtype} eq "reply") { 1128 if ($msg->{msgtype} eq "reply") {
1027 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1129 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1028 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1130 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1029 1131
1030 my $text = "\n" . CFPlus::asxml $msg->{msg}; 1132 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1031 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1133 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1032 my @link; 1134 my @link;
1033 $text =~ s{ 1135 $text =~ s{
1034 ($match) 1136 ($match)
1035 }{ 1137 }{
… …
1043 padding_y => 0, 1145 padding_y => 0,
1044 on_button_up => sub { 1146 on_button_up => sub {
1045 $self->send ($kw); 1147 $self->send ($kw);
1046 }; 1148 };
1047 1149
1048 chr 0xfffc 1150 "\x{fffc}"
1049 }giex; 1151 }giex;
1050 1152
1051 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1153 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1052 $self->{textview}->scroll_to_bottom; 1154 $self->{textview}->scroll_to_bottom;
1053 $self->update_options; 1155 $self->update_options;
… …
1080 1182
1081 $self->SUPER::destroy; 1183 $self->SUPER::destroy;
1082} 1184}
1083 1185
10841 11861
1187

Diff Legend

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