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

Diff Legend

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