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.102 by root, Wed Apr 18 18:16:16 2007 UTC vs.
Revision 1.137 by root, Sat Jul 28 00:45:28 2007 UTC

… …
20 my ($class, %arg) = @_; 20 my ($class, %arg) = @_;
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1,
26 ywidget => 1,#d#
25 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
26 }, 28 },
27 ); 29 );
28 30
29 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
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 ("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
54 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
55 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
56 $self->{tileset} = $default; 72 $self->{tileset} = $default;
57 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
58 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
59 75
60 my $w = int $self->{mapw} * 32 / $self->{tilesize}; 76 my $w = int $self->{mapw} * 32 / $self->{tilesize};
61 my $h = int $self->{maph} * 32 / $self->{tilesize}; 77 my $h = int $self->{maph} * 32 / $self->{tilesize};
62 78
63 $self->setup_req (mapsize => "${w}x${h}"); 79 $self->setup_req (mapsize => "${w}x${h}");
64 } 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} || {}};
65 } 204 }
66 }); 205 });
67 206
68 $self->{map_widget}->add_command (@$_) 207 $self->{map_widget}->add_command (@$_)
69 for @cmd_help; 208 for @cmd_help;
… …
248 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 387 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
249 $::GAUGES->{food} ->set_value ($fo, $fo_m); 388 $::GAUGES->{food} ->set_value ($fo, $fo_m);
250 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 389 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
251 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 390 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
252 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 391 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
253 my $rng = $stats->{+CS_STAT_RANGE}; 392 $::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}; 393 my $title = $stats->{+CS_STAT_TITLE};
257 $title =~ s/^Player: //; 394 $title =~ s/^Player: //;
258 $::STATWIDS->{title} ->set_text ("Title: " . $title); 395 $::STATWIDS->{title} ->set_text ("Title: " . $title);
259 396
260 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 397 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
280 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
281 418
282 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
283 $sktbl->clear; 420 $sktbl->clear;
284 421
422 my @add;
423
424 push @add,
285 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
286 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
287 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
288 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
289 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
290 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
291 432
292 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>";
293 434
294 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);
295 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);
… …
323 } 464 }
324 465
325 1 466 1
326 }; 467 };
327 468
469 push @add,
328 $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
329 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),
330 $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
331 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),
332 $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,
333 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 ;
334 477
335 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
336 } 479 }
480
481 $sktbl->add_at (@add);
337 } 482 }
338 483
339 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
340 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
341 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
578} 723}
579 724
580sub face_find { 725sub face_find {
581 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
582 727
583 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
584
585 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
586 730
587 $face->{id} = $id; 731 $face->{id} = $id;
588 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
589 733
590 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
591 735
592 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 }
593} 742}
594 743
595sub face_update { 744sub face_update {
596 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
597 746
747 if ($face->{type} == 0) { # FT_FACE
598 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
599 if $changed; 749 if $changed;
600 750
601 $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 if ($changed) { # new data
768 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
769 my $path = CFPlus::DB::path_of_res $face->{name};
770
771 CFPlus::DB::write_file $path, $data, sub {
772 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
773 $face->{meta} = $self->{json_coder}->decode ($meta_json);
774 $face->{path} = $path;
775
776 $cb->();
777 };
778 };
779 } else {
780 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
781 $cb->();
782 }
783 }
602} 784}
603 785
604sub smooth_update { 786sub smooth_update {
605 my ($self, $facenum, $face) = @_; 787 my ($self, $facenum, $face) = @_;
606 788
607 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 789 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
608} 790}
609 791
610sub set_texture { 792sub set_texture {
611 my ($self, $id, $data) = @_; 793 my ($self, $id, $data) = @_;
794
795 return unless $self->{map};
612 796
613 $self->{texture}[$id] = my $tex = 797 $self->{texture}[$id] = my $tex =
614 new_from_image CFPlus::Texture 798 new_from_image CFPlus::Texture
615 $data, minify => 1, mipmap => 1; 799 $data, minify => 1, mipmap => 1;
616 800
617 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 801 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
618 $self->{map_widget}->update; 802 $self->{map_widget}->update;
803
804 $_->() for @{(delete $self->{face_cb}{$id}) || []};
805}
806
807sub connect_face_update {
808 my ($self, $id, $cb) = @_;
809
810 push @{$self->{face_cb}{$id}}, $cb;
811
812 CFPlus::guard {
813 @{$self->{face_cb}{$id}}
814 = grep $_ != $cb,
815 @{$self->{face_cb}{$id}};
816 }
619} 817}
620 818
621sub sound_play { 819sub sound_play {
622 my ($self, $x, $y, $soundnum, $type) = @_; 820 my ($self, $x, $y, $soundnum, $type) = @_;
821 warn "sound play <@_>\n";#d#
623 822
624 $self->{sound_play}->($x, $y, $soundnum, $type); 823 #$self->{sound_play}->($x, $y, $soundnum, $type);
625} 824}
626 825
627my $LAST_QUERY; # server is stupid, stupid, stupid 826my $LAST_QUERY; # server is stupid, stupid, stupid
628 827
629sub query { 828sub query {
… …
633 $LAST_QUERY = $prompt; 832 $LAST_QUERY = $prompt;
634 833
635 $self->{query}-> ($self, $flags, $prompt); 834 $self->{query}-> ($self, $flags, $prompt);
636} 835}
637 836
638sub drawinfo { 837sub sanitise_xml($) {
639 my ($self, $color, $text) = @_; 838 local $_ = shift;
640 839
641 my @color = ( 840 # we now weed out all tags we do not support
841 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
842 # now all entities
843 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
844
845 # handle some elements
846 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
847 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
848
849 $_
850}
851
852our %NAME_TO_COLOR = (
853 black => 0,
854 white => 1,
855 darkblue => 2,
856 red => 3,
857 orange => 4,
858 lightblue => 5,
859 darkorange => 6,
860 green => 7,
861 darkgreen => 8,
862 grey => 9,
863 brown => 10,
864 yellow => 11,
865 tan => 12,
866);
867
868our @CF_COLOR = (
642 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 869 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
643 [1.00, 1.00, 1.00], 870 [1.00, 1.00, 1.00],
644 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 871 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
645 [1.00, 0.00, 0.00], 872 [1.00, 0.00, 0.00],
646 [1.00, 0.54, 0.00], 873 [1.00, 0.54, 0.00],
647 [0.11, 0.56, 1.00], 874 [0.11, 0.56, 1.00],
648 [0.93, 0.46, 0.00], 875 [0.93, 0.46, 0.00],
649 [0.18, 0.54, 0.34], 876 [0.18, 0.54, 0.34],
650 [0.56, 0.73, 0.56], 877 [0.56, 0.73, 0.56],
651 [0.80, 0.80, 0.80], 878 [0.80, 0.80, 0.80],
652 [0.75, 0.61, 0.20], 879 [0.75, 0.61, 0.20],
653 [0.99, 0.77, 0.26], 880 [0.99, 0.77, 0.26],
654 [0.74, 0.65, 0.41], 881 [0.74, 0.65, 0.41],
655 ); 882);
656 883
657 my $fg = $color[$color % @color]; 884sub msg {
885 my ($self, $color, $type, $text, @extra) = @_;
658 886
887 $text = sanitise_xml $text;
888
889 if (my $cb = $self->{cb_msg}{$type}) {
890 $_->($self, $color, $type, $text, @extra) for values %$cb;
891 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
892 $type =~ s/-/_/g;
893 $self->{$type} = $text;
894 } else {
659 $self->logprint ("info: ", $text); 895 $self->logprint ("msg: ", $text);
896 return if $color < 0; # negative color == ignore if not understood
660 897
898 my $fg = $CF_COLOR[$color % @CF_COLOR];
899
661 ## try to create single paragraphs of multiple lines sent by the server 900 ## try to create single paragraphs of multiple lines sent by the server
662 # no longer neecssary with TRT servers 901 # no longer neecssary with TRT servers
663 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 902 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
664 903
665 $text = CFPlus::asxml $text; 904 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
666 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
667 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
668
669 ::message ({ fg => $fg, markup => $_ })
670 for split /\n/, $text; 905 for split /\n/, $text;
671 906
672 $self->{statusbox}->add ($text, 907 $self->{statusbox}->add ($text,
673 group => $text, 908 group => $text,
674 fg => $fg, 909 fg => $fg,
675 timeout => $color >= 2 ? 180 : 10, 910 timeout => $color >= 2 ? 180 : 10,
676 tooltip_font => $::FONT_FIXED, 911 tooltip_font => $::FONT_FIXED,
677 ); 912 );
678} 913 }
679
680sub drawextinfo {
681 my ($self, $color, $type, $subtype, $message) = @_;
682
683 $self->drawinfo ($color, $message);
684} 914}
685 915
686sub spell_add { 916sub spell_add {
687 my ($self, $spell) = @_; 917 my ($self, $spell) = @_;
688 918
… …
776 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1006 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
777 return unless $::CONN; 1007 return unless $::CONN;
778 1008
779 $::FLOORBOX->clear; 1009 $::FLOORBOX->clear;
780 1010
1011 my @add;
1012
781 my $row; 1013 my $row;
782 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1014 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
783 if ($row < 6) { 1015 if ($row < 6) {
784 local $_->{face_widget}; # hack to force recreation of widget 1016 local $_->{face_widget}; # hack to force recreation of widget
785 local $_->{desc_widget}; # hack to force recreation of widget 1017 local $_->{desc_widget}; # hack to force recreation of widget
786 CFPlus::Item::update_widgets $_; 1018 CFPlus::Item::update_widgets $_;
787 1019
1020 push @add,
788 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1021 0, $row, $_->{face_widget},
789 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1022 1, $row, $_->{desc_widget};
790 1023
791 $row++; 1024 $row++;
792 } else { 1025 } else {
793 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1026 push @add, 1, $row, new CFPlus::UI::Button
794 text => "More...", 1027 text => "More...",
795 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1028 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
796 ); 1029 ;
797 last; 1030 last;
798 } 1031 }
799 } 1032 }
800 if ($::CONN->{open_container}) { 1033 if ($::CONN->{open_container}) {
801 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1034 push @add, 1, $row++, new CFPlus::UI::Button
802 text => "Close container", 1035 text => "Close container",
803 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1036 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
804 ); 1037 ;
805 } 1038 }
1039
1040 $::FLOORBOX->add_at (@add);
806 }); 1041 });
807 1042
808 $::WANT_REFRESH++; 1043 $::WANT_REFRESH++;
809} 1044}
810 1045
… …
921 $::SERVER_INFO->set_markup ( 1156 $::SERVER_INFO->set_markup (
922 "server <tt>$self->{host}:$self->{port}</tt>\n" 1157 "server <tt>$self->{host}:$self->{port}</tt>\n"
923 . "protocol version <tt>$self->{version}</tt>\n" 1158 . "protocol version <tt>$self->{version}</tt>\n"
924 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1159 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
925 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1160 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1161 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
926 . "editing support $yesno[!!$self->{editor_support}]\n" 1162 . "editing support $yesno[!!$self->{editor_support}]\n"
927 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1163 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1164 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
928 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1165 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
929 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1166 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
930 . "map size $self->{mapw}×$self->{maph}\n" 1167 . "map size $self->{mapw}×$self->{maph}\n"
931 ); 1168 );
932 1169
933 ::setup_build_button ($self->{editor_support}->{builder_ui});
934} 1170}
935 1171
936sub logged_in { 1172sub logged_in {
937 my ($self) = @_; 1173 my ($self) = @_;
938 1174
939 $self->send_ext_req (cfplus_support => version => 1, sub { 1175 $self->send_ext_req (cfplus_support => version => 2, sub {
1176 my (%msg) = @_;
1177
940 $self->{cfplus_ext} = $_[0]{version}; 1178 $self->{cfplus_ext} = $msg{version};
941 $self->update_server_info; 1179 $self->update_server_info;
942 1180
943 if ($self->{cfplus_ext} >= 2) { 1181 if ($self->{cfplus_ext} >= 2) {
944 $self->send_ext_req ("editor_support", sub { 1182 $self->send_ext_req ("editor_support", sub {
945 $self->{editor_support} = $_[0]; 1183 $self->{editor_support} = { @_ };
946 $self->update_server_info; 1184 $self->update_server_info;
947 1185
948 0 1186 0
949 }); 1187 });
950 } 1188 }
… …
958 $self->send_command ("output-count $::CFG->{output_count}"); 1196 $self->send_command ("output-count $::CFG->{output_count}");
959 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1197 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
960 $self->send_command ("pickup $::CFG->{pickup}"); 1198 $self->send_command ("pickup $::CFG->{pickup}");
961} 1199}
962 1200
963sub buildat {
964 my ($self, $builditem, $x, $y) = @_;
965
966 if ($self->{cfplus_ext}) {
967 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
968 }
969}
970
971sub lookat { 1201sub lookat {
972 my ($self, $x, $y) = @_; 1202 my ($self, $x, $y) = @_;
973 1203
974 if ($self->{cfplus_ext}) { 1204 if ($self->{cfplus_ext}) {
975 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1205 $self->send_ext_req (lookat => $x, $y, sub {
976 my ($msg) = @_; 1206 my (%msg) = @_;
977 1207
978 if (exists $msg->{npc_dialog}) { 1208 if (exists $msg{npc_dialog}) {
979 # start npc chat dialog 1209 # start npc chat dialog
980 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1210 $self->{npc_dialog} = new CFPlus::NPCDialog::
981 dx => $x, 1211 token => $msg{npc_dialog},
982 dy => $y,
983 title => "$msg->{npc_dialog} (NPC)", 1212 title => "$msg{npc_dialog}[0] (NPC)",
984 conn => $self, 1213 conn => $self,
985 ; 1214 ;
986 } 1215 }
987 }); 1216 });
988 } 1217 }
… …
995 1224
996 (delete $self->{npc_dialog})->destroy 1225 (delete $self->{npc_dialog})->destroy
997 if $self->{npc_dialog}; 1226 if $self->{npc_dialog};
998 1227
999 $self->SUPER::destroy; 1228 $self->SUPER::destroy;
1229
1230 %$self = ();
1000} 1231}
1001 1232
1002package CFPlus::NPCDialog; 1233package CFPlus::NPCDialog;
1003 1234
1004our @ISA = 'CFPlus::UI::Toplevel'; 1235our @ISA = 'CFPlus::UI::Toplevel';
… …
1051 on_activate => sub { $this->destroy; 1 }, 1282 on_activate => sub { $this->destroy; 1 },
1052 ; 1283 ;
1053 1284
1054 $self->update_options; 1285 $self->update_options;
1055 1286
1056 $self->{id} = $self->{conn}->send_ext_req ( 1287 $self->{id} = "npc-channel-" . $self->{conn}->token;
1057 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1288 $self->{conn}->connect_ext ($self->{id} => sub {
1058 sub { $this && $this->feed (@_) } 1289 $this->feed (@_) if $this;
1059 ); 1290 });
1291
1292 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1060 1293
1061 $self->{entry}->grab_focus; 1294 $self->{entry}->grab_focus;
1062 1295
1063 $self->{textview}->add_paragraph ({ 1296 $self->{textview}->add_paragraph ({
1064 fg => [1, 1, 0, 1], 1297 fg => [1, 1, 0, 1],
… …
1087 ); 1320 );
1088 } 1321 }
1089} 1322}
1090 1323
1091sub feed { 1324sub feed {
1092 my ($self, $msg) = @_; 1325 my ($self, $type, @arg) = @_;
1093 1326
1094 CFPlus::weaken $self; 1327 CFPlus::weaken $self;
1095 1328
1096 if ($msg->{msgtype} eq "reply") { 1329 if ($type eq "update") {
1330 my (%info) = @arg;
1331
1097 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1332 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1098 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1333 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1099
1100 my $text = "\n" . CFPlus::asxml $msg->{msg};
1101 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1102 my @link;
1103 $text =~ s{
1104 ($match)
1105 }{
1106 my $kw = $1;
1107
1108 push @link, new CFPlus::UI::Label
1109 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1110 can_hover => 1,
1111 can_events => 1,
1112 padding_x => 0,
1113 padding_y => 0,
1114 on_button_up => sub {
1115 $self->send ($kw);
1116 };
1117
1118 "\x{fffc}"
1119 }giex;
1120 1334
1335 if (exists $info{msg}) {
1336 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1337 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1338 my @link;
1339 $text =~ s{
1340 ($match)
1341 }{
1342 my $kw = $1;
1343
1344 push @link, new CFPlus::UI::Label
1345 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1346 can_hover => 1,
1347 can_events => 1,
1348 padding_x => 0,
1349 padding_y => 0,
1350 on_button_up => sub {
1351 $self->send ($kw);
1352 };
1353
1354 "\x{fffc}"
1355 }giex;
1356
1121 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1357 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1122 $self->{textview}->scroll_to_bottom; 1358 $self->{textview}->scroll_to_bottom;
1359 }
1360
1123 $self->update_options; 1361 $self->update_options;
1124 } else { 1362 } else {
1125 $self->destroy; 1363 $self->destroy;
1126 } 1364 }
1127 1365
… …
1132 my ($self, $msg) = @_; 1370 my ($self, $msg) = @_;
1133 1371
1134 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1372 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1135 $self->{textview}->scroll_to_bottom; 1373 $self->{textview}->scroll_to_bottom;
1136 1374
1137 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1375 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1138} 1376}
1139 1377
1140sub destroy { 1378sub destroy {
1141 my ($self) = @_; 1379 my ($self) = @_;
1142 1380
1143 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1381 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1144 1382
1145 if ($self->{conn}) { 1383 if ($self->{conn}) {
1146 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1384 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1147 delete $self->{conn}{npc_dialog}; 1385 delete $self->{conn}{npc_dialog};
1148 $self->{conn}->disconnect_ext ($self->{id}); 1386 $self->{conn}->disconnect_ext ($self->{id});
1149 } 1387 }
1150 1388
1151 $self->SUPER::destroy; 1389 $self->SUPER::destroy;

Diff Legend

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