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.109 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.143 by root, Tue Jul 31 02:03:13 2007 UTC

… …
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, 25 excmd => 1,
26 xwidget => 1, 26 ywidget => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
48 sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
49 @args 49 @args
50 } sort { $a->{par} <=> $b->{par} } 50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*"; 51 CFPlus::Pod::find command => "*";
52 52
53 $self->connect_ext (ambient_music => sub {
54 my ($songs) = @_;
55 &::audio_music_set_ambient ($songs);
56 });
57
53 $self->connect_ext (event_capabilities => sub { 58 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 59 my (%cap) = @_;
55 60
61 #$self->send ("setup sound 0"); # we use a different protocol
62
63 $self->send_exti_msg (fx_want => {
64 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65 5 => !!$::CFG->{audio_enable}, # FT_SOUND
66 });
67
56 if (my $ts = $cap->{tileset}) { 68 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 69 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 70 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 71 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 72 $self->setup_req (tileset => $default->[0]);
61 73
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 77 $self->setup_req (mapsize => "${w}x${h}");
66 } 78 }
67 } 79 }
68 }); 80 });
69 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
70 $self->connect_ext (ws_n => sub { 89 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 90 my ($id) = @_;
72 91
73 $self->{widgetset}{$arg{id}} = { 92 $self->{widgetset}{$id} = {
74 w => {}, 93 w => {},
75 }; 94 };
76 }); 95 });
77 96
97 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 98 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 99 my ($id) = @_;
80 100
81 my $ws = delete $self->{widgetset}{$arg{id}} 101 my $ws = delete $self->{widgetset}{$id}
82 or return; 102 or return;
83 103
84 $_->destroy 104 $_->destroy
85 for values %{$ws->{w}}; 105 for values %{$ws->{w}};
86 }); 106 });
87 107
108 # widgetset create
88 $self->connect_ext (ws_c => sub { 109 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 110 my ($ws, $id, $class, $args) = @_;
90
91 my $args = $arg->{args} || {};
92 111
93 for my $ev (grep /^on_/, keys %$args) { 112 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub { 113 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 114 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 115 $self->send_exti_msg (w_e => $id, $ev, \@_);
97 116
98 1 117 1
99 }; 118 };
100 } 119 }
101 120
102 if (my $widget = eval { 121 if (my $widget = eval {
122 local $SIG{__DIE__};
103 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
104 %$args, 124 %$args,
105 s_ws => $arg->{ws}, 125 s_ws => $ws,
106 s_id => $arg->{id}, 126 s_id => $id,
107 ) 127 )
108 } 128 }
109 ) { 129 ) {
110 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
112 = $widget; 132 = $widget;
113 133
114 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
115 my ($widget) = @_; 135 my ($widget) = @_;
116 136
117 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 }); 139 });
120 } else { 140 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 141 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
123 } 143 }
124 }); 144 });
125 145
146 # widget call
126 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
127 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
128 149
129 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
130 or return; 151 or return;
131 my $m = $arg->{name};
132 152
133 my @a = map { 153 $args ||= [];
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138 154
139 if (exists $arg->{rid}) { 155 if ($rid) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
141 } else { 157 } else {
142 $w->$m (@a); 158 $w->$method (@$args);
143 } 159 }
144 }); 160 });
145 161
162 # widget set
146 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
147 my ($arg) = @_; 164 my ($id, $attr) = @_;
148 165
149 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
150 or return; 167 or return;
151 168
152 $w->{$arg->{name}} = $arg->{value}; 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 }
153 }); 178 });
154 179
180 # widget get
155 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
156 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
157 183
158 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
159 or return; 185 or return;
160 186
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
162 }); 188 });
163 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
164 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 198 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 200 $_->destroy
167 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
168 } 202 }
… …
381 my @skills = keys %{ $self->{skill_info} }; 415 my @skills = keys %{ $self->{skill_info} };
382 416
383 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 417 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
384 $sktbl->clear; 418 $sktbl->clear;
385 419
420 my @add;
421
422 push @add,
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 423 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 424 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 425 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 426 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 427 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 428 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
429 ;
392 430
393 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>";
394 432
395 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);
396 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);
… …
424 } 462 }
425 463
426 1 464 1
427 }; 465 };
428 466
467 push @add,
429 $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
430 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),
431 $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
432 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),
433 $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,
434 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 ;
435 475
436 $x++ and ($x, $y) = (0, $y + 1); 476 $x++ and ($x, $y) = (0, $y + 1);
437 } 477 }
478
479 $sktbl->add_at (@add);
438 } 480 }
439 481
440 for (grep exists $stats->{$_}, @skills) { 482 for (grep exists $stats->{$_}, @skills) {
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 483 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 484 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
679} 721}
680 722
681sub face_find { 723sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 724 my ($self, $facenum, $face, $cb) = @_;
683 725
684 my $hash = "$face->{chksum},$face->{name}"; 726 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 727 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
687 728
688 $face->{id} = $id; 729 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id; 730 $self->{faceid}[$facenum] = $id;
690 731
691 $self->{map}->set_tileid ($facenum => $id); 732 $self->{map}->set_tileid ($facenum => $id);
692 733
693 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_meta => $face->{name}, $cb;
739 }
694} 740}
695 741
696sub face_update { 742sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 743 my ($self, $facenum, $face, $changed) = @_;
698 744
745 if ($face->{type} == 0) { # FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 746 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 747 if $changed;
701 748
702 $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_push ($facenum);
762 };
763 } elsif ($face->{type} == 5) { # FT_SOUND
764 $cb = sub {
765 $self->{sound_meta}{$facenum} = $face;
766
767 ::message ({ markup => "downloaded sound #$facenum" })
768 if $changed;
769
770 &::audio_sound_push ($facenum);
771 };
772 }
773
774 if ($changed) { # new data
775 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
776
777 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
779 $face->{meta} = $self->{json_coder}->decode ($meta_json);
780 $cb->();
781 };
782
783 } else {
784 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
785 $cb->();
786 }
787 }
703} 788}
704 789
705sub smooth_update { 790sub smooth_update {
706 my ($self, $facenum, $face) = @_; 791 my ($self, $facenum, $face) = @_;
707 792
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 793 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 794}
710 795
711sub set_texture { 796sub set_texture {
712 my ($self, $id, $data) = @_; 797 my ($self, $id, $data) = @_;
798
799 return unless $self->{map};
713 800
714 $self->{texture}[$id] = my $tex = 801 $self->{texture}[$id] = my $tex =
715 new_from_image CFPlus::Texture 802 new_from_image CFPlus::Texture
716 $data, minify => 1, mipmap => 1; 803 $data, minify => 1, mipmap => 1;
717 804
718 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 805 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
719 $self->{map_widget}->update; 806 $self->{map_widget}->update;
807
808 $_->() for @{(delete $self->{face_cb}{$id}) || []};
809}
810
811sub connect_face_update {
812 my ($self, $id, $cb) = @_;
813
814 push @{$self->{face_cb}{$id}}, $cb;
815
816 CFPlus::guard {
817 @{$self->{face_cb}{$id}}
818 = grep $_ != $cb,
819 @{$self->{face_cb}{$id}};
820 }
720} 821}
721 822
722sub sound_play { 823sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 824 my ($self, $type, $face, $dx, $dy, $vol) = @_;
724 825
725 $self->{sound_play}->($x, $y, $soundnum, $type); 826 &::audio_sound_play ($face, $dx, $dy, $vol)
827 unless $type & 1; # odd types are silent for future expansion
726} 828}
727 829
728my $LAST_QUERY; # server is stupid, stupid, stupid 830my $LAST_QUERY; # server is stupid, stupid, stupid
729 831
730sub query { 832sub query {
… …
795 $self->{$type} = $text; 897 $self->{$type} = $text;
796 } else { 898 } else {
797 $self->logprint ("msg: ", $text); 899 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 900 return if $color < 0; # negative color == ignore if not understood
799 901
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 902 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
801 903
802 ## try to create single paragraphs of multiple lines sent by the server 904 ## try to create single paragraphs of multiple lines sent by the server
803 # no longer neecssary with TRT servers 905 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 906 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 907
806 ::message ({ fg => $fg, markup => $_ }) 908 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
807 for split /\n/, $text; 909 for split /\n/, $text;
808 910
809 $self->{statusbox}->add ($text, 911 $self->{statusbox}->add ($text,
810 group => $text, 912 group => $text,
811 fg => $fg, 913 fg => $fg,
… …
868 $self->{map_widget}->clr_commands; 970 $self->{map_widget}->clr_commands;
869 971
870 ::stop_game (); 972 ::stop_game ();
871} 973}
872 974
873sub image_info {
874 my ($self, $numfaces) = @_;
875
876 $self->{num_faces} = $numfaces;
877 $self->{face_prefetch} = [1 .. $numfaces];
878 $self->face_prefetch;
879}
880
881sub face_prefetch {
882 my ($self) = @_;
883
884 return unless $::CFG->{face_prefetch};
885
886 if ($self->{num_faces}) {
887 return if @{ $self->{send_queue} || [] };
888 my $todo = @{ $self->{face_prefetch} }
889 or return;
890
891 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
892
893 $self->send ("requestinfo image_sums $face $face");
894
895 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
896 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
897 } elsif (!exists $self->{num_faces}) {
898 $self->send ("requestinfo image_info");
899
900 $self->{num_faces} = 0;
901
902 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
903 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
904 }
905}
906
907sub update_floorbox { 975sub update_floorbox {
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 976 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 977 return unless $::CONN;
910 978
911 $::FLOORBOX->clear; 979 $::FLOORBOX->clear;
980
981 my @add;
912 982
913 my $row; 983 my $row;
914 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 984 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
915 if ($row < 6) { 985 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 986 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 987 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 988 CFPlus::Item::update_widgets $_;
919 989
990 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 991 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 992 1, $row, $_->{desc_widget};
922 993
923 $row++; 994 $row++;
924 } else { 995 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 996 push @add, 1, $row, new CFPlus::UI::Button
926 text => "More...", 997 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 998 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 999 ;
929 last; 1000 last;
930 } 1001 }
931 } 1002 }
932 if ($::CONN->{open_container}) { 1003 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1004 push @add, 1, $row++, new CFPlus::UI::Button
934 text => "Close container", 1005 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1006 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 1007 ;
937 } 1008 }
1009
1010 $::FLOORBOX->add_at (@add);
938 }); 1011 });
939 1012
940 $::WANT_REFRESH++; 1013 $::WANT_REFRESH++;
941} 1014}
942 1015
… …
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1135 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1136 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1137 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1138 );
1066 1139
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1140}
1069 1141
1070sub logged_in { 1142sub logged_in {
1071 my ($self) = @_; 1143 my ($self) = @_;
1072 1144
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1145 $self->send_ext_req (cfplus_support => version => 2, sub {
1146 my (%msg) = @_;
1147
1074 $self->{cfplus_ext} = $_[0]{version}; 1148 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1149 $self->update_server_info;
1076 1150
1077 if ($self->{cfplus_ext} >= 2) { 1151 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1152 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1153 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1154 $self->update_server_info;
1081 1155
1082 0 1156 0
1083 }); 1157 });
1084 } 1158 }
… …
1092 $self->send_command ("output-count $::CFG->{output_count}"); 1166 $self->send_command ("output-count $::CFG->{output_count}");
1093 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1167 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1168 $self->send_command ("pickup $::CFG->{pickup}");
1095} 1169}
1096 1170
1097sub buildat {
1098 my ($self, $builditem, $x, $y) = @_;
1099
1100 if ($self->{cfplus_ext}) {
1101 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1102 }
1103}
1104
1105sub lookat { 1171sub lookat {
1106 my ($self, $x, $y) = @_; 1172 my ($self, $x, $y) = @_;
1107 1173
1108 if ($self->{cfplus_ext}) { 1174 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1175 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1176 my (%msg) = @_;
1111 1177
1112 if (exists $msg->{npc_dialog}) { 1178 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1179 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1180 $self->{npc_dialog} = new CFPlus::NPCDialog::
1115 dx => $x, 1181 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1182 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1183 conn => $self,
1119 ; 1184 ;
1120 } 1185 }
1121 }); 1186 });
1122 } 1187 }
… …
1129 1194
1130 (delete $self->{npc_dialog})->destroy 1195 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1196 if $self->{npc_dialog};
1132 1197
1133 $self->SUPER::destroy; 1198 $self->SUPER::destroy;
1199
1200 %$self = ();
1134} 1201}
1135 1202
1136package CFPlus::NPCDialog; 1203package CFPlus::NPCDialog;
1137 1204
1138our @ISA = 'CFPlus::UI::Toplevel'; 1205our @ISA = 'CFPlus::UI::Toplevel';
… …
1185 on_activate => sub { $this->destroy; 1 }, 1252 on_activate => sub { $this->destroy; 1 },
1186 ; 1253 ;
1187 1254
1188 $self->update_options; 1255 $self->update_options;
1189 1256
1190 $self->{id} = $self->{conn}->send_ext_req ( 1257 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1258 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1259 $this->feed (@_) if $this;
1193 ); 1260 });
1261
1262 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1263
1195 $self->{entry}->grab_focus; 1264 $self->{entry}->grab_focus;
1196 1265
1197 $self->{textview}->add_paragraph ({ 1266 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1267 fg => [1, 1, 0, 1],
… …
1221 ); 1290 );
1222 } 1291 }
1223} 1292}
1224 1293
1225sub feed { 1294sub feed {
1226 my ($self, $msg) = @_; 1295 my ($self, $type, @arg) = @_;
1227 1296
1228 CFPlus::weaken $self; 1297 CFPlus::weaken $self;
1229 1298
1230 if ($msg->{msgtype} eq "reply") { 1299 if ($type eq "update") {
1300 my (%info) = @arg;
1301
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1302 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1303 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1233
1234 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1235 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1236 my @link;
1237 $text =~ s{
1238 ($match)
1239 }{
1240 my $kw = $1;
1241
1242 push @link, new CFPlus::UI::Label
1243 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1244 can_hover => 1,
1245 can_events => 1,
1246 padding_x => 0,
1247 padding_y => 0,
1248 on_button_up => sub {
1249 $self->send ($kw);
1250 };
1251
1252 "\x{fffc}"
1253 }giex;
1254 1304
1305 if (exists $info{msg}) {
1306 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1307 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1308 my @link;
1309 $text =~ s{
1310 ($match)
1311 }{
1312 my $kw = $1;
1313
1314 push @link, new CFPlus::UI::Label
1315 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1316 can_hover => 1,
1317 can_events => 1,
1318 padding_x => 0,
1319 padding_y => 0,
1320 on_button_up => sub {
1321 $self->send ($kw);
1322 };
1323
1324 "\x{fffc}"
1325 }giex;
1326
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1327 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1328 $self->{textview}->scroll_to_bottom;
1329 }
1330
1257 $self->update_options; 1331 $self->update_options;
1258 } else { 1332 } else {
1259 $self->destroy; 1333 $self->destroy;
1260 } 1334 }
1261 1335
… …
1266 my ($self, $msg) = @_; 1340 my ($self, $msg) = @_;
1267 1341
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1342 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1343 $self->{textview}->scroll_to_bottom;
1270 1344
1271 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1345 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1272} 1346}
1273 1347
1274sub destroy { 1348sub destroy {
1275 my ($self) = @_; 1349 my ($self) = @_;
1276 1350
1277 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1351 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1278 1352
1279 if ($self->{conn}) { 1353 if ($self->{conn}) {
1280 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1354 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1281 delete $self->{conn}{npc_dialog}; 1355 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1356 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1357 }
1284 1358
1285 $self->SUPER::destroy; 1359 $self->SUPER::destroy;

Diff Legend

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