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.138 by root, Sat Jul 28 16:48:45 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 (music => sub {
54 my ($ev) = @_;
55
56 &::audio_music_set ($self->{songs} = $ev->{play})
57 if $ev->{play};
58 });
59
53 $self->connect_ext (event_capabilities => sub { 60 $self->connect_ext (capabilities => sub {
54 my ($cap) = @_; 61 my (%cap) = @_;
55 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
56 if (my $ts = $cap->{tileset}) { 70 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 71 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 72 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 73 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 74 $self->setup_req (tileset => $default->[0]);
61 75
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 79 $self->setup_req (mapsize => "${w}x${h}");
66 } 80 }
67 } 81 }
68 }); 82 });
69 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
70 $self->connect_ext (ws_n => sub { 91 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 92 my ($id) = @_;
72 93
73 $self->{widgetset}{$arg{id}} = { 94 $self->{widgetset}{$id} = {
74 w => {}, 95 w => {},
75 }; 96 };
76 }); 97 });
77 98
99 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 100 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 101 my ($id) = @_;
80 102
81 my $ws = delete $self->{widgetset}{$arg{id}} 103 my $ws = delete $self->{widgetset}{$id}
82 or return; 104 or return;
83 105
84 $_->destroy 106 $_->destroy
85 for values %{$ws->{w}}; 107 for values %{$ws->{w}};
86 }); 108 });
87 109
110 # widgetset create
88 $self->connect_ext (ws_c => sub { 111 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 112 my ($ws, $id, $class, $args) = @_;
90
91 my $args = $arg->{args} || {};
92 113
93 for my $ev (grep /^on_/, keys %$args) { 114 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub { 115 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 116 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 117 $self->send_exti_msg (w_e => $id, $ev, \@_);
97 118
98 1 119 1
99 }; 120 };
100 } 121 }
101 122
102 if (my $widget = eval { 123 if (my $widget = eval {
124 local $SIG{__DIE__};
103 "CFPlus::UI::$arg->{class}"->new ( 125 "CFPlus::UI::$class"->new (
104 %$args, 126 %$args,
105 s_ws => $arg->{ws}, 127 s_ws => $ws,
106 s_id => $arg->{id}, 128 s_id => $id,
107 ) 129 )
108 } 130 }
109 ) { 131 ) {
110 $self->{widget}{$arg->{id}} 132 $self->{widget}{$id}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 133 = $self->{widgetset}{$ws}{w}{$id}
112 = $widget; 134 = $widget;
113 135
114 $widget->connect (on_destroy => sub { 136 $widget->connect (on_destroy => sub {
115 my ($widget) = @_; 137 my ($widget) = @_;
116 138
117 delete $self->{widget}{$widget->{s_id}}; 139 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 140 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 }); 141 });
120 } else { 142 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 143 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 144 $self->send_exti_msg (w_e => $id, "destroy");
123 } 145 }
124 }); 146 });
125 147
148 # widget call
126 $self->connect_ext (w_c => sub { 149 $self->connect_ext (w_c => sub {
127 my ($arg) = @_; 150 my ($id, $rid, $method, $args) = @_;
128 151
129 my $w = $self->{widget}{$arg->{id}} 152 my $w = $self->{widget}{$id}
130 or return; 153 or return;
131 my $m = $arg->{name};
132 154
133 my @a = map { 155 $args ||= [];
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138 156
139 if (exists $arg->{rid}) { 157 if ($rid) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 158 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
141 } else { 159 } else {
142 $w->$m (@a); 160 $w->$method (@$args);
143 } 161 }
144 }); 162 });
145 163
164 # widget set
146 $self->connect_ext (w_s => sub { 165 $self->connect_ext (w_s => sub {
147 my ($arg) = @_; 166 my ($id, $attr) = @_;
148 167
149 my $w = $self->{widget}{$arg->{id}} 168 my $w = $self->{widget}{$id}
150 or return; 169 or return;
151 170
152 $w->{$arg->{name}} = $arg->{value}; 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 }
153 }); 180 });
154 181
182 # widget get
155 $self->connect_ext (w_g => sub { 183 $self->connect_ext (w_g => sub {
156 my ($arg) = @_; 184 my ($id, $rid, $attr) = @_;
157 185
158 my $w = $self->{widget}{$arg->{id}} 186 my $w = $self->{widget}{$id}
159 or return; 187 or return;
160 188
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 189 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
162 }); 190 });
163 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
164 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 200 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 201 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 202 $_->destroy
167 for values %{delete $ws->{w} || {}}; 203 for values %{delete $ws->{w} || {}};
168 } 204 }
… …
381 my @skills = keys %{ $self->{skill_info} }; 417 my @skills = keys %{ $self->{skill_info} };
382 418
383 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 419 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
384 $sktbl->clear; 420 $sktbl->clear;
385 421
422 my @add;
423
424 push @add,
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 425 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 426 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 427 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 428 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 429 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 430 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
431 ;
392 432
393 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>";
394 434
395 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);
396 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);
… …
424 } 464 }
425 465
426 1 466 1
427 }; 467 };
428 468
469 push @add,
429 $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
430 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),
431 $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
432 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),
433 $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,
434 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 ;
435 477
436 $x++ and ($x, $y) = (0, $y + 1); 478 $x++ and ($x, $y) = (0, $y + 1);
437 } 479 }
480
481 $sktbl->add_at (@add);
438 } 482 }
439 483
440 for (grep exists $stats->{$_}, @skills) { 484 for (grep exists $stats->{$_}, @skills) {
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 485 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 486 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
679} 723}
680 724
681sub face_find { 725sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 726 my ($self, $facenum, $face, $cb) = @_;
683 727
684 my $hash = "$face->{chksum},$face->{name}"; 728 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 729 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
687 730
688 $face->{id} = $id; 731 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id; 732 $self->{faceid}[$facenum] = $id;
690 733
691 $self->{map}->set_tileid ($facenum => $id); 734 $self->{map}->set_tileid ($facenum => $id);
692 735
693 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 }
694} 742}
695 743
696sub face_update { 744sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
698 746
747 if ($face->{type} == 0) { # FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 748 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 749 if $changed;
701 750
702 $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 }
703} 786}
704 787
705sub smooth_update { 788sub smooth_update {
706 my ($self, $facenum, $face) = @_; 789 my ($self, $facenum, $face) = @_;
707 790
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 791 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 792}
710 793
711sub set_texture { 794sub set_texture {
712 my ($self, $id, $data) = @_; 795 my ($self, $id, $data) = @_;
796
797 return unless $self->{map};
713 798
714 $self->{texture}[$id] = my $tex = 799 $self->{texture}[$id] = my $tex =
715 new_from_image CFPlus::Texture 800 new_from_image CFPlus::Texture
716 $data, minify => 1, mipmap => 1; 801 $data, minify => 1, mipmap => 1;
717 802
718 $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}});
719 $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 }
720} 819}
721 820
722sub sound_play { 821sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 822 my ($self, $x, $y, $soundnum, $type) = @_;
823 warn "sound play <@_>\n";#d#
724 824
725 $self->{sound_play}->($x, $y, $soundnum, $type); 825 #$self->{sound_play}->($x, $y, $soundnum, $type);
726} 826}
727 827
728my $LAST_QUERY; # server is stupid, stupid, stupid 828my $LAST_QUERY; # server is stupid, stupid, stupid
729 829
730sub query { 830sub query {
… …
795 $self->{$type} = $text; 895 $self->{$type} = $text;
796 } else { 896 } else {
797 $self->logprint ("msg: ", $text); 897 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 898 return if $color < 0; # negative color == ignore if not understood
799 899
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 900 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
801 901
802 ## 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
803 # no longer neecssary with TRT servers 903 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 904 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 905
806 ::message ({ fg => $fg, markup => $_ }) 906 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
807 for split /\n/, $text; 907 for split /\n/, $text;
808 908
809 $self->{statusbox}->add ($text, 909 $self->{statusbox}->add ($text,
810 group => $text, 910 group => $text,
811 fg => $fg, 911 fg => $fg,
… …
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1008 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 1009 return unless $::CONN;
910 1010
911 $::FLOORBOX->clear; 1011 $::FLOORBOX->clear;
912 1012
1013 my @add;
1014
913 my $row; 1015 my $row;
914 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} }) {
915 if ($row < 6) { 1017 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 1018 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 1019 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 1020 CFPlus::Item::update_widgets $_;
919 1021
1022 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1023 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1024 1, $row, $_->{desc_widget};
922 1025
923 $row++; 1026 $row++;
924 } else { 1027 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1028 push @add, 1, $row, new CFPlus::UI::Button
926 text => "More...", 1029 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1030 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 1031 ;
929 last; 1032 last;
930 } 1033 }
931 } 1034 }
932 if ($::CONN->{open_container}) { 1035 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1036 push @add, 1, $row++, new CFPlus::UI::Button
934 text => "Close container", 1037 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1038 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 1039 ;
937 } 1040 }
1041
1042 $::FLOORBOX->add_at (@add);
938 }); 1043 });
939 1044
940 $::WANT_REFRESH++; 1045 $::WANT_REFRESH++;
941} 1046}
942 1047
… …
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1167 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1168 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1169 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1170 );
1066 1171
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1172}
1069 1173
1070sub logged_in { 1174sub logged_in {
1071 my ($self) = @_; 1175 my ($self) = @_;
1072 1176
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1177 $self->send_ext_req (cfplus_support => version => 2, sub {
1178 my (%msg) = @_;
1179
1074 $self->{cfplus_ext} = $_[0]{version}; 1180 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1181 $self->update_server_info;
1076 1182
1077 if ($self->{cfplus_ext} >= 2) { 1183 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1184 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1185 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1186 $self->update_server_info;
1081 1187
1082 0 1188 0
1083 }); 1189 });
1084 } 1190 }
… …
1092 $self->send_command ("output-count $::CFG->{output_count}"); 1198 $self->send_command ("output-count $::CFG->{output_count}");
1093 $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;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1200 $self->send_command ("pickup $::CFG->{pickup}");
1095} 1201}
1096 1202
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 { 1203sub lookat {
1106 my ($self, $x, $y) = @_; 1204 my ($self, $x, $y) = @_;
1107 1205
1108 if ($self->{cfplus_ext}) { 1206 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1207 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1208 my (%msg) = @_;
1111 1209
1112 if (exists $msg->{npc_dialog}) { 1210 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1211 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1212 $self->{npc_dialog} = new CFPlus::NPCDialog::
1115 dx => $x, 1213 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1214 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1215 conn => $self,
1119 ; 1216 ;
1120 } 1217 }
1121 }); 1218 });
1122 } 1219 }
… …
1129 1226
1130 (delete $self->{npc_dialog})->destroy 1227 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1228 if $self->{npc_dialog};
1132 1229
1133 $self->SUPER::destroy; 1230 $self->SUPER::destroy;
1231
1232 %$self = ();
1134} 1233}
1135 1234
1136package CFPlus::NPCDialog; 1235package CFPlus::NPCDialog;
1137 1236
1138our @ISA = 'CFPlus::UI::Toplevel'; 1237our @ISA = 'CFPlus::UI::Toplevel';
… …
1185 on_activate => sub { $this->destroy; 1 }, 1284 on_activate => sub { $this->destroy; 1 },
1186 ; 1285 ;
1187 1286
1188 $self->update_options; 1287 $self->update_options;
1189 1288
1190 $self->{id} = $self->{conn}->send_ext_req ( 1289 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1290 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1291 $this->feed (@_) if $this;
1193 ); 1292 });
1293
1294 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1295
1195 $self->{entry}->grab_focus; 1296 $self->{entry}->grab_focus;
1196 1297
1197 $self->{textview}->add_paragraph ({ 1298 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1299 fg => [1, 1, 0, 1],
… …
1221 ); 1322 );
1222 } 1323 }
1223} 1324}
1224 1325
1225sub feed { 1326sub feed {
1226 my ($self, $msg) = @_; 1327 my ($self, $type, @arg) = @_;
1227 1328
1228 CFPlus::weaken $self; 1329 CFPlus::weaken $self;
1229 1330
1230 if ($msg->{msgtype} eq "reply") { 1331 if ($type eq "update") {
1332 my (%info) = @arg;
1333
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1334 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1335 $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 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
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1359 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1360 $self->{textview}->scroll_to_bottom;
1361 }
1362
1257 $self->update_options; 1363 $self->update_options;
1258 } else { 1364 } else {
1259 $self->destroy; 1365 $self->destroy;
1260 } 1366 }
1261 1367
… …
1266 my ($self, $msg) = @_; 1372 my ($self, $msg) = @_;
1267 1373
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1374 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1375 $self->{textview}->scroll_to_bottom;
1270 1376
1271 $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);
1272} 1378}
1273 1379
1274sub destroy { 1380sub destroy {
1275 my ($self) = @_; 1381 my ($self) = @_;
1276 1382
1277 #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
1278 1384
1279 if ($self->{conn}) { 1385 if ($self->{conn}) {
1280 $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};
1281 delete $self->{conn}{npc_dialog}; 1387 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1388 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1389 }
1284 1390
1285 $self->SUPER::destroy; 1391 $self->SUPER::destroy;

Diff Legend

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