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.99 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC

… …
15use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
16 16
17use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (@_, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 smoothing => 1, 25 excmd => 1,
26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
30 32
… …
46 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
47 @args 49 @args
48 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
49 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
50 52
53 $self->connect_ext (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
51 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
52 my ($cap) = @_; 61 my (%cap) = @_;
53 62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
54 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default; 70 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
59 73
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 74 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 75 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 76
63 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
64 } 78 }
79 }
80 });
81
82 $self->{json_coder}
83 ->convert_blessed
84 ->filter_json_single_key_object (__w_ => sub {
85 $self->{widget}{$_[0]}
86 });
87
88 # widgetset new
89 $self->connect_ext (ws_n => sub {
90 my ($id) = @_;
91
92 $self->{widgetset}{$id} = {
93 w => {},
94 };
95 });
96
97 # widgetset destroy
98 $self->connect_ext (ws_d => sub {
99 my ($id) = @_;
100
101 my $ws = delete $self->{widgetset}{$id}
102 or return;
103
104 $_->destroy
105 for values %{$ws->{w}};
106 });
107
108 # widgetset create
109 $self->connect_ext (ws_c => sub {
110 my ($ws, $id, $class, $args) = @_;
111
112 for my $ev (grep /^on_/, keys %$args) {
113 $args->{$ev} = sub {
114 my $id = shift->{s_id};
115 $self->send_exti_msg (w_e => $id, $ev, \@_);
116
117 1
118 };
119 }
120
121 if (my $widget = eval {
122 local $SIG{__DIE__};
123 "CFPlus::UI::$class"->new (
124 %$args,
125 s_ws => $ws,
126 s_id => $id,
127 )
128 }
129 ) {
130 $self->{widget}{$id}
131 = $self->{widgetset}{$ws}{w}{$id}
132 = $widget;
133
134 $widget->connect (on_destroy => sub {
135 my ($widget) = @_;
136
137 delete $self->{widget}{$widget->{s_id}};
138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139 });
140 } else {
141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142 $self->send_exti_msg (w_e => $id, "destroy");
143 }
144 });
145
146 # widget call
147 $self->connect_ext (w_c => sub {
148 my ($id, $rid, $method, $args) = @_;
149
150 my $w = $self->{widget}{$id}
151 or return;
152
153 $args ||= [];
154
155 if ($rid) {
156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
157 } else {
158 $w->$method (@$args);
159 }
160 });
161
162 # widget set
163 $self->connect_ext (w_s => sub {
164 my ($id, $attr) = @_;
165
166 my $w = $self->{widget}{$id}
167 or return;
168
169 for (my $i = 0; $i < $#$attr; $i += 2) {
170 my ($member, $value) = @$attr[$i, $i+1];
171 if (defined $value) {
172 $w->{$member} = $value;
173 } else {
174 delete $w->{$member};
175 }
176 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
177 }
178 });
179
180 # widget get
181 $self->connect_ext (w_g => sub {
182 my ($id, $rid, $attr) = @_;
183
184 my $w = $self->{widget}{$id}
185 or return;
186
187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188 });
189
190 # message window
191 $self->connect_ext (channel_info => sub {
192 my ($info) = @_;
193 $self->{channels}->{$info->{id}} = $info;
194 $::MESSAGE_WINDOW->add_channel ($info);
195 });
196
197 # destroy widgets on logout
198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199 for my $ws (values %{delete $self->{widgetset} || {}}) {
200 $_->destroy
201 for values %{delete $ws->{w} || {}};
65 } 202 }
66 }); 203 });
67 204
68 $self->{map_widget}->add_command (@$_) 205 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 206 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 385 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 386 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 387 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 388 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 389 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 390 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
254 $rng =~ s/^Range: //; # thank you so much dear server
255 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
256 my $title = $stats->{+CS_STAT_TITLE}; 391 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 392 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 393 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 394
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 395 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
281 416
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 418 $sktbl->clear;
284 419
420 my @add;
421
422 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
291 430
292 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 431 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
293 432
294 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 433 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
295 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 434 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
323 } 462 }
324 463
325 1 464 1
326 }; 465 };
327 466
467 push @add,
328 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 468 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
329 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 469 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
330 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 470 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
331 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 471 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
332 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 472 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
333 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 473 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
474 ;
334 475
335 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
336 } 477 }
478
479 $sktbl->add_at (@add);
337 } 480 }
338 481
339 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
432} 575}
433 576
434sub load_map($$$) { 577sub load_map($$$) {
435 my ($self, $hash, $x, $y) = @_; 578 my ($self, $hash, $x, $y) = @_;
436 579
580 my $gen = $self->{map_change_gen};
581
437 CFPlus::DB::get $self->{mapcache} => $hash, sub { 582 CFPlus::DB::get $self->{mapcache} => $hash, sub {
583 return unless $gen == $self->{map_change_gen};
584
438 my ($data) = @_; 585 my ($data) = @_;
439 586
440 if (defined $data) { 587 if (defined $data) {
441 $data = Compress::LZF::decompress $data; 588 $data = Compress::LZF::decompress $data;
442 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 589 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
… …
517 664
518 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 665 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
519 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 666 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
520 667
521 } else { 668 } else {
669 my $gen = $self->{map_change_gen};
522 $self->send_mapinfo ("spatial $path$tile", sub { 670 $self->send_mapinfo ("spatial $path$tile", sub {
671 return unless $gen == $self->{map_change_gen};
672
523 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 673 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
524 674
525 return if $mode ne "spatial"; 675 return if $mode ne "spatial";
526 676
527 $x += $self->{map}->ox; 677 $x += $self->{map}->ox;
… …
541 691
542sub map_change { 692sub map_change {
543 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 693 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
544 694
545 $self->flush_map; 695 $self->flush_map;
696
697 ++$self->{map_change_gen};
546 698
547 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 699 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
548 700
549 my $mapmapw = $self->{mapmap}->{w}; 701 my $mapmapw = $self->{mapmap}->{w};
550 my $mapmaph = $self->{mapmap}->{h}; 702 my $mapmaph = $self->{mapmap}->{h};
… …
569} 721}
570 722
571sub face_find { 723sub face_find {
572 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
573 725
574 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
575
576 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
577 728
578 $face->{id} = $id; 729 $face->{id} = $id;
579 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
580 731
581 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
582 733
583 CFPlus::DB::get tilecache => $id, $cb; 734 CFPlus::DB::get tilecache => $id, $cb;
735
736 } elsif ($face->{type} & 1) { # with metadata
737 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738 CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
739 }
584} 740}
585 741
586sub face_update { 742sub face_update {
587 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
588 744
745 if ($face->{type} == 0) { # FT_FACE
589 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
590 if $changed; 747 if $changed;
591 748
592 $self->set_texture ($face->{id} => delete $face->{image}); 749 $self->set_texture ($face->{id} => delete $face->{data});
750
751 } elsif ($face->{type} & 1) { # split metadata
752 my $cb = sub { };
753
754 if ($face->{type} == 3) { # FT_MUSIC
755 $cb = sub {
756 $self->{music_meta}{$facenum} = $face;
757
758 ::message ({ markup => "downloaded song #$facenum" })
759 if $changed;
760
761 &::audio_music_set ($self->{songs});
762 };
763 }
764
765 if ($changed) { # new data
766 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
767 my $path = CFPlus::DB::path_of_res $face->{name};
768
769 CFPlus::DB::write_file $path, $data, sub {
770 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771 $face->{meta} = $self->{json_coder}->decode ($meta_json);
772 $face->{path} = $path;
773
774 $cb->();
775 };
776 };
777 } else {
778 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779 $cb->();
780 }
781 }
593} 782}
594 783
595sub smooth_update { 784sub smooth_update {
596 my ($self, $facenum, $face) = @_; 785 my ($self, $facenum, $face) = @_;
597 786
598 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 787 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
599} 788}
600 789
601sub set_texture { 790sub set_texture {
602 my ($self, $id, $data) = @_; 791 my ($self, $id, $data) = @_;
792
793 return unless $self->{map};
603 794
604 $self->{texture}[$id] = my $tex = 795 $self->{texture}[$id] = my $tex =
605 new_from_image CFPlus::Texture 796 new_from_image CFPlus::Texture
606 $data, minify => 1, mipmap => 1; 797 $data, minify => 1, mipmap => 1;
607 798
608 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 799 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
609 $self->{map_widget}->update; 800 $self->{map_widget}->update;
801
802 $_->() for @{(delete $self->{face_cb}{$id}) || []};
803}
804
805sub connect_face_update {
806 my ($self, $id, $cb) = @_;
807
808 push @{$self->{face_cb}{$id}}, $cb;
809
810 CFPlus::guard {
811 @{$self->{face_cb}{$id}}
812 = grep $_ != $cb,
813 @{$self->{face_cb}{$id}};
814 }
610} 815}
611 816
612sub sound_play { 817sub sound_play {
613 my ($self, $x, $y, $soundnum, $type) = @_; 818 my ($self, $x, $y, $soundnum, $type) = @_;
614 819
… …
624 $LAST_QUERY = $prompt; 829 $LAST_QUERY = $prompt;
625 830
626 $self->{query}-> ($self, $flags, $prompt); 831 $self->{query}-> ($self, $flags, $prompt);
627} 832}
628 833
629sub drawinfo { 834sub sanitise_xml($) {
630 my ($self, $color, $text) = @_; 835 local $_ = shift;
631 836
632 my @color = ( 837 # we now weed out all tags we do not support
838 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
839 # now all entities
840 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
841
842 # handle some elements
843 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
844 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
845
846 $_
847}
848
849our %NAME_TO_COLOR = (
850 black => 0,
851 white => 1,
852 darkblue => 2,
853 red => 3,
854 orange => 4,
855 lightblue => 5,
856 darkorange => 6,
857 green => 7,
858 darkgreen => 8,
859 grey => 9,
860 brown => 10,
861 yellow => 11,
862 tan => 12,
863);
864
865our @CF_COLOR = (
633 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 866 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
634 [1.00, 1.00, 1.00], 867 [1.00, 1.00, 1.00],
635 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 868 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
636 [1.00, 0.00, 0.00], 869 [1.00, 0.00, 0.00],
637 [1.00, 0.54, 0.00], 870 [1.00, 0.54, 0.00],
638 [0.11, 0.56, 1.00], 871 [0.11, 0.56, 1.00],
639 [0.93, 0.46, 0.00], 872 [0.93, 0.46, 0.00],
640 [0.18, 0.54, 0.34], 873 [0.18, 0.54, 0.34],
641 [0.56, 0.73, 0.56], 874 [0.56, 0.73, 0.56],
642 [0.80, 0.80, 0.80], 875 [0.80, 0.80, 0.80],
643 [0.75, 0.61, 0.20], 876 [0.75, 0.61, 0.20],
644 [0.99, 0.77, 0.26], 877 [0.99, 0.77, 0.26],
645 [0.74, 0.65, 0.41], 878 [0.74, 0.65, 0.41],
646 ); 879);
647 880
648 my $fg = $color[$color % @color]; 881sub msg {
882 my ($self, $color, $type, $text, @extra) = @_;
649 883
884 $text = sanitise_xml $text;
885
886 if (my $cb = $self->{cb_msg}{$type}) {
887 $_->($self, $color, $type, $text, @extra) for values %$cb;
888 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
889 $type =~ s/-/_/g;
890 $self->{$type} = $text;
891 } else {
650 $self->logprint ("info: ", $text); 892 $self->logprint ("msg: ", $text);
893 return if $color < 0; # negative color == ignore if not understood
651 894
895 my $fg = $CF_COLOR[$color % @CF_COLOR];
896
652 # try to create single paragraphs of multiple lines sent by the server 897 ## try to create single paragraphs of multiple lines sent by the server
898 # no longer neecssary with TRT servers
653 $text =~ s/(?<=\S)\n(?=\w)/ /g; 899 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
654 900
655 $text = CFPlus::asxml $text; 901 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
656 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
657 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
658
659 ::message ({ fg => $fg, markup => $_ })
660 for split /\n/, $text; 902 for split /\n/, $text;
661 903
662 $self->{statusbox}->add ($text, 904 $self->{statusbox}->add ($text,
663 group => $text, 905 group => $text,
664 fg => $fg, 906 fg => $fg,
665 timeout => $color >= 2 ? 180 : 10, 907 timeout => $color >= 2 ? 180 : 10,
666 tooltip_font => $::FONT_FIXED, 908 tooltip_font => $::FONT_FIXED,
667 ); 909 );
668} 910 }
669
670sub drawextinfo {
671 my ($self, $color, $type, $subtype, $message) = @_;
672
673 $self->drawinfo ($color, $message);
674} 911}
675 912
676sub spell_add { 913sub spell_add {
677 my ($self, $spell) = @_; 914 my ($self, $spell) = @_;
678 915
… …
766 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1003 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
767 return unless $::CONN; 1004 return unless $::CONN;
768 1005
769 $::FLOORBOX->clear; 1006 $::FLOORBOX->clear;
770 1007
1008 my @add;
1009
771 my $row; 1010 my $row;
772 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1011 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
773 if ($row < 6) { 1012 if ($row < 6) {
774 local $_->{face_widget}; # hack to force recreation of widget 1013 local $_->{face_widget}; # hack to force recreation of widget
775 local $_->{desc_widget}; # hack to force recreation of widget 1014 local $_->{desc_widget}; # hack to force recreation of widget
776 CFPlus::Item::update_widgets $_; 1015 CFPlus::Item::update_widgets $_;
777 1016
1017 push @add,
778 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1018 0, $row, $_->{face_widget},
779 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1019 1, $row, $_->{desc_widget};
780 1020
781 $row++; 1021 $row++;
782 } else { 1022 } else {
783 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1023 push @add, 1, $row, new CFPlus::UI::Button
784 text => "More...", 1024 text => "More...",
785 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1025 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
786 ); 1026 ;
787 last; 1027 last;
788 } 1028 }
789 } 1029 }
790 if ($::CONN->{open_container}) { 1030 if ($::CONN->{open_container}) {
791 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1031 push @add, 1, $row++, new CFPlus::UI::Button
792 text => "Close container", 1032 text => "Close container",
793 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1033 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
794 ); 1034 ;
795 } 1035 }
1036
1037 $::FLOORBOX->add_at (@add);
796 }); 1038 });
797 1039
798 $::WANT_REFRESH++; 1040 $::WANT_REFRESH++;
799} 1041}
800 1042
… …
911 $::SERVER_INFO->set_markup ( 1153 $::SERVER_INFO->set_markup (
912 "server <tt>$self->{host}:$self->{port}</tt>\n" 1154 "server <tt>$self->{host}:$self->{port}</tt>\n"
913 . "protocol version <tt>$self->{version}</tt>\n" 1155 . "protocol version <tt>$self->{version}</tt>\n"
914 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1156 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
915 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1157 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1158 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
916 . "editing support $yesno[!!$self->{editor_support}]\n" 1159 . "editing support $yesno[!!$self->{editor_support}]\n"
917 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1160 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1161 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
918 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1162 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
919 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1163 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
920 . "map size $self->{mapw}×$self->{maph}\n" 1164 . "map size $self->{mapw}×$self->{maph}\n"
921 ); 1165 );
922 1166
923 ::setup_build_button ($self->{editor_support}->{builder_ui});
924} 1167}
925 1168
926sub logged_in { 1169sub logged_in {
927 my ($self) = @_; 1170 my ($self) = @_;
928 1171
929 $self->send_ext_req (cfplus_support => version => 1, sub { 1172 $self->send_ext_req (cfplus_support => version => 2, sub {
1173 my (%msg) = @_;
1174
930 $self->{cfplus_ext} = $_[0]{version}; 1175 $self->{cfplus_ext} = $msg{version};
931 $self->update_server_info; 1176 $self->update_server_info;
932 1177
933 if ($self->{cfplus_ext} >= 2) { 1178 if ($self->{cfplus_ext} >= 2) {
934 $self->send_ext_req ("editor_support", sub { 1179 $self->send_ext_req ("editor_support", sub {
935 $self->{editor_support} = $_[0]; 1180 $self->{editor_support} = { @_ };
936 $self->update_server_info; 1181 $self->update_server_info;
937 1182
938 0 1183 0
939 }); 1184 });
940 } 1185 }
… …
948 $self->send_command ("output-count $::CFG->{output_count}"); 1193 $self->send_command ("output-count $::CFG->{output_count}");
949 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1194 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
950 $self->send_command ("pickup $::CFG->{pickup}"); 1195 $self->send_command ("pickup $::CFG->{pickup}");
951} 1196}
952 1197
953sub buildat {
954 my ($self, $builditem, $x, $y) = @_;
955
956 if ($self->{cfplus_ext}) {
957 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
958 }
959}
960
961sub lookat { 1198sub lookat {
962 my ($self, $x, $y) = @_; 1199 my ($self, $x, $y) = @_;
963 1200
964 if ($self->{cfplus_ext}) { 1201 if ($self->{cfplus_ext}) {
965 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1202 $self->send_ext_req (lookat => $x, $y, sub {
966 my ($msg) = @_; 1203 my (%msg) = @_;
967 1204
968 if (exists $msg->{npc_dialog}) { 1205 if (exists $msg{npc_dialog}) {
969 # start npc chat dialog 1206 # start npc chat dialog
970 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1207 $self->{npc_dialog} = new CFPlus::NPCDialog::
971 dx => $x, 1208 token => $msg{npc_dialog},
972 dy => $y,
973 title => "$msg->{npc_dialog} (NPC)", 1209 title => "$msg{npc_dialog}[0] (NPC)",
974 conn => $self, 1210 conn => $self,
975 ; 1211 ;
976 } 1212 }
977 }); 1213 });
978 } 1214 }
… …
985 1221
986 (delete $self->{npc_dialog})->destroy 1222 (delete $self->{npc_dialog})->destroy
987 if $self->{npc_dialog}; 1223 if $self->{npc_dialog};
988 1224
989 $self->SUPER::destroy; 1225 $self->SUPER::destroy;
1226
1227 %$self = ();
990} 1228}
991 1229
992package CFPlus::NPCDialog; 1230package CFPlus::NPCDialog;
993 1231
994our @ISA = 'CFPlus::UI::Toplevel'; 1232our @ISA = 'CFPlus::UI::Toplevel';
… …
1041 on_activate => sub { $this->destroy; 1 }, 1279 on_activate => sub { $this->destroy; 1 },
1042 ; 1280 ;
1043 1281
1044 $self->update_options; 1282 $self->update_options;
1045 1283
1046 $self->{id} = $self->{conn}->send_ext_req ( 1284 $self->{id} = "npc-channel-" . $self->{conn}->token;
1047 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1285 $self->{conn}->connect_ext ($self->{id} => sub {
1048 sub { $this && $this->feed (@_) } 1286 $this->feed (@_) if $this;
1049 ); 1287 });
1288
1289 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1050 1290
1051 $self->{entry}->grab_focus; 1291 $self->{entry}->grab_focus;
1052 1292
1053 $self->{textview}->add_paragraph ({ 1293 $self->{textview}->add_paragraph ({
1054 fg => [1, 1, 0, 1], 1294 fg => [1, 1, 0, 1],
… …
1077 ); 1317 );
1078 } 1318 }
1079} 1319}
1080 1320
1081sub feed { 1321sub feed {
1082 my ($self, $msg) = @_; 1322 my ($self, $type, @arg) = @_;
1083 1323
1084 CFPlus::weaken $self; 1324 CFPlus::weaken $self;
1085 1325
1086 if ($msg->{msgtype} eq "reply") { 1326 if ($type eq "update") {
1327 my (%info) = @arg;
1328
1087 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1329 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1088 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1330 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1089
1090 my $text = "\n" . CFPlus::asxml $msg->{msg};
1091 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1092 my @link;
1093 $text =~ s{
1094 ($match)
1095 }{
1096 my $kw = $1;
1097
1098 push @link, new CFPlus::UI::Label
1099 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1100 can_hover => 1,
1101 can_events => 1,
1102 padding_x => 0,
1103 padding_y => 0,
1104 on_button_up => sub {
1105 $self->send ($kw);
1106 };
1107
1108 "\x{fffc}"
1109 }giex;
1110 1331
1332 if (exists $info{msg}) {
1333 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1334 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1335 my @link;
1336 $text =~ s{
1337 ($match)
1338 }{
1339 my $kw = $1;
1340
1341 push @link, new CFPlus::UI::Label
1342 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1343 can_hover => 1,
1344 can_events => 1,
1345 padding_x => 0,
1346 padding_y => 0,
1347 on_button_up => sub {
1348 $self->send ($kw);
1349 };
1350
1351 "\x{fffc}"
1352 }giex;
1353
1111 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1354 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1112 $self->{textview}->scroll_to_bottom; 1355 $self->{textview}->scroll_to_bottom;
1356 }
1357
1113 $self->update_options; 1358 $self->update_options;
1114 } else { 1359 } else {
1115 $self->destroy; 1360 $self->destroy;
1116 } 1361 }
1117 1362
… …
1122 my ($self, $msg) = @_; 1367 my ($self, $msg) = @_;
1123 1368
1124 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1369 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1125 $self->{textview}->scroll_to_bottom; 1370 $self->{textview}->scroll_to_bottom;
1126 1371
1127 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1372 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1128} 1373}
1129 1374
1130sub destroy { 1375sub destroy {
1131 my ($self) = @_; 1376 my ($self) = @_;
1132 1377
1133 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1378 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1134 1379
1135 if ($self->{conn}) { 1380 if ($self->{conn}) {
1136 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1381 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1137 delete $self->{conn}{npc_dialog}; 1382 delete $self->{conn}{npc_dialog};
1138 $self->{conn}->disconnect_ext ($self->{id}); 1383 $self->{conn}->disconnect_ext ($self->{id});
1139 } 1384 }
1140 1385
1141 $self->SUPER::destroy; 1386 $self->SUPER::destroy;

Diff Legend

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