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.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.146 by root, Mon Aug 6 05:06:33 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 {
103 local $SIG{__DIE__}; 122 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new ( 123 "CFPlus::UI::$class"->new (
105 %$args, 124 %$args,
106 s_ws => $arg->{ws}, 125 s_ws => $ws,
107 s_id => $arg->{id}, 126 s_id => $id,
108 ) 127 )
109 } 128 }
110 ) { 129 ) {
111 $self->{widget}{$arg->{id}} 130 $self->{widget}{$id}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 131 = $self->{widgetset}{$ws}{w}{$id}
113 = $widget; 132 = $widget;
114 133
115 $widget->connect (on_destroy => sub { 134 $widget->connect (on_destroy => sub {
116 my ($widget) = @_; 135 my ($widget) = @_;
117 136
118 delete $self->{widget}{$widget->{s_id}}; 137 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 138 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 }); 139 });
121 } else { 140 } else {
122 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";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 142 $self->send_exti_msg (w_e => $id, "destroy");
124 } 143 }
125 }); 144 });
126 145
146 # widget call
127 $self->connect_ext (w_c => sub { 147 $self->connect_ext (w_c => sub {
128 my ($arg) = @_; 148 my ($id, $rid, $method, $args) = @_;
129 149
130 my $w = $self->{widget}{$arg->{id}} 150 my $w = $self->{widget}{$id}
131 or return; 151 or return;
132 my $m = $arg->{name};
133 152
134 my @a = map { 153 $args ||= [];
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139 154
140 if (exists $arg->{rid}) { 155 if ($rid) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 156 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
142 } else { 157 } else {
143 $w->$m (@a); 158 $w->$method (@$args);
144 } 159 }
145 }); 160 });
146 161
162 # widget set
147 $self->connect_ext (w_s => sub { 163 $self->connect_ext (w_s => sub {
148 my ($arg) = @_; 164 my ($id, $attr) = @_;
149 165
150 my $w = $self->{widget}{$arg->{id}} 166 my $w = $self->{widget}{$id}
151 or return; 167 or return;
152 168
153 $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 }
154 }); 178 });
155 179
180 # widget get
156 $self->connect_ext (w_g => sub { 181 $self->connect_ext (w_g => sub {
157 my ($arg) = @_; 182 my ($id, $rid, $attr) = @_;
158 183
159 my $w = $self->{widget}{$arg->{id}} 184 my $w = $self->{widget}{$id}
160 or return; 185 or return;
161 186
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 187 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
163 }); 188 });
164 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
165 $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 {
166 for my $ws (values %{delete $self->{widgetset} || {}}) { 199 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy 200 $_->destroy
168 for values %{delete $ws->{w} || {}}; 201 for values %{delete $ws->{w} || {}};
169 } 202 }
… …
193} 226}
194 227
195sub logprint { 228sub logprint {
196 my ($self, @a) = @_; 229 my ($self, @a) = @_;
197 230
198 $self->{log_fh} ||= do { 231 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
199 my $path = "$Crossfire::VARDIR/log.$self->{host}";
200
201 open my $fh, ">>:utf8", $path
202 or die "Couldn't open logfile $path: $!";
203
204 $fh->autoflush (1);
205
206 $fh;
207 };
208
209 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
210
211 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
212 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
213
214 print {$self->{log_fh}} "$ts ", @a, "\n";
215} 232}
216 233
217sub _stat_numdiff { 234sub _stat_numdiff {
218 my ($self, $name, $old, $new) = @_; 235 my ($self, $name, $old, $new) = @_;
219 236
… …
382 my @skills = keys %{ $self->{skill_info} }; 399 my @skills = keys %{ $self->{skill_info} };
383 400
384 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 401 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
385 $sktbl->clear; 402 $sktbl->clear;
386 403
404 my @add;
405
406 push @add,
387 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 407 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 408 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
389 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 409 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 410 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 411 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
392 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 412 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
413 ;
393 414
394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 415 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395 416
396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 417 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 418 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
425 } 446 }
426 447
427 1 448 1
428 }; 449 };
429 450
451 push @add,
430 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 452 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
431 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 453 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
432 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 454 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
433 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 455 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 456 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 457 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
458 ;
436 459
437 $x++ and ($x, $y) = (0, $y + 1); 460 $x++ and ($x, $y) = (0, $y + 1);
438 } 461 }
462
463 $sktbl->add_at (@add);
439 } 464 }
440 465
441 for (grep exists $stats->{$_}, @skills) { 466 for (grep exists $stats->{$_}, @skills) {
442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 467 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 468 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
519 do { 544 do {
520 $id = pop @{$self->{bg_fetch}} 545 $id = pop @{$self->{bg_fetch}}
521 or return; 546 or return;
522 } while $self->{texture}[$id]; 547 } while $self->{texture}[$id];
523 548
524 CFPlus::DB::get tilecache => $id, sub { 549 CFPlus::DB::exists tilecache => $id, sub {
525 my ($data) = @_; 550 my ($exists) = @_;
526 551
527 return unless $self->{map}; # stop when destroyed 552 return unless $self->{map}; # stop when destroyed
528 553
529 $self->set_texture ($id => $data) 554 $self->have_tile ($id)
530 if defined $data; 555 if $exists;
531 556
532 $self->bg_fetch; 557 $self->bg_fetch;
533 }; 558 };
534} 559}
535 560
… …
680} 705}
681 706
682sub face_find { 707sub face_find {
683 my ($self, $facenum, $face, $cb) = @_; 708 my ($self, $facenum, $face, $cb) = @_;
684 709
685 my $hash = "$face->{chksum},$face->{name}"; 710 if ($face->{type} == 0) { # FT_FACE
686
687 my $id = CFPlus::DB::get_tile_id_sync $hash; 711 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688 712
689 $face->{id} = $id; 713 $face->{id} = $id;
690 $self->{faceid}[$facenum] = $id; 714 $self->{faceid}[$facenum] = $id;
691 715
692 $self->{map}->set_tileid ($facenum => $id); 716 $self->{map}->set_tileid ($facenum => $id);
693 717
694 CFPlus::DB::get tilecache => $id, $cb; 718 CFPlus::DB::get tilecache => $id, $cb;
719
720 } elsif ($face->{type} & 1) { # with metadata
721 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
722 CFPlus::DB::get res_meta => $face->{name}, $cb;
723 }
695} 724}
696 725
697sub face_update { 726sub face_update {
698 my ($self, $facenum, $face, $changed) = @_; 727 my ($self, $facenum, $face, $changed) = @_;
699 728
729 if ($face->{type} == 0) { # FT_FACE
700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 730 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701 if $changed; 731 if $changed;
702 732
703 $self->set_texture ($face->{id} => delete $face->{image}); 733 $self->have_tile ($face->{id});
734
735 } elsif ($face->{type} & 1) { # split metadata
736 my $cb = sub { };
737
738 if ($face->{type} == 3) { # FT_MUSIC
739 $cb = sub {
740 $self->{music_meta}{$facenum} = $face;
741
742 ::message ({ markup => "downloaded song #$facenum" })
743 if $changed;
744
745 &::audio_music_push ($facenum);
746 };
747 } elsif ($face->{type} == 5) { # FT_SOUND
748 $cb = sub {
749 $self->{sound_meta}{$facenum} = $face;
750
751 ::message ({ markup => "downloaded sound #$facenum" })
752 if $changed;
753
754 &::audio_sound_push ($facenum);
755 };
756 }
757
758 if ($changed) { # new data
759 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
760
761 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
762 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
763 $face->{meta} = $self->{json_coder}->decode ($meta_json);
764 ::add_license ($face);
765 $cb->();
766 };
767
768 } else {
769 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
770 ::add_license ($face);
771 $cb->();
772 }
773 }
704} 774}
705 775
706sub smooth_update { 776sub smooth_update {
707 my ($self, $facenum, $face) = @_; 777 my ($self, $facenum, $face) = @_;
708 778
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 779 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710} 780}
711 781
712sub set_texture { 782sub have_tile {
713 my ($self, $id, $data) = @_; 783 my ($self, $tile) = @_;
714 784
785 return unless $self->{map};
786
715 $self->{texture}[$id] = my $tex = 787 $self->{texture}[$tile] ||= my $tex =
716 new_from_image CFPlus::Texture 788 new CFPlus::Texture
717 $data, minify => 1, mipmap => 1; 789 tile => $tile, minify => 1, mipmap => 1, delay => 1;
718 790
719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 791 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
720 $self->{map_widget}->update; 792}
793
794sub connect_face_update {
795 my ($self, $id, $cb) = @_;
796
797 push @{$self->{face_cb}{$id}}, $cb;
798
799 CFPlus::guard {
800 @{$self->{face_cb}{$id}}
801 = grep $_ != $cb,
802 @{$self->{face_cb}{$id}};
803 }
721} 804}
722 805
723sub sound_play { 806sub sound_play {
724 my ($self, $x, $y, $soundnum, $type) = @_; 807 my ($self, $type, $face, $dx, $dy, $vol) = @_;
725 808
726 $self->{sound_play}->($x, $y, $soundnum, $type); 809 &::audio_sound_play ($face, $dx, $dy, $vol)
810 unless $type & 1; # odd types are silent for future expansion
727} 811}
728 812
729my $LAST_QUERY; # server is stupid, stupid, stupid 813my $LAST_QUERY; # server is stupid, stupid, stupid
730 814
731sub query { 815sub query {
… …
796 $self->{$type} = $text; 880 $self->{$type} = $text;
797 } else { 881 } else {
798 $self->logprint ("msg: ", $text); 882 $self->logprint ("msg: ", $text);
799 return if $color < 0; # negative color == ignore if not understood 883 return if $color < 0; # negative color == ignore if not understood
800 884
801 my $fg = $CF_COLOR[$color % @CF_COLOR]; 885 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
802 886
803 ## try to create single paragraphs of multiple lines sent by the server 887 ## try to create single paragraphs of multiple lines sent by the server
804 # no longer neecssary with TRT servers 888 # no longer neecssary with TRT servers
805 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 889 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
806 890
807 ::message ({ fg => $fg, markup => $_ }) 891 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
808 for split /\n/, $text; 892 for split /\n/, $text;
809 893
810 $self->{statusbox}->add ($text, 894 $self->{statusbox}->add ($text,
811 group => $text, 895 group => $text,
812 fg => $fg, 896 fg => $fg,
… …
869 $self->{map_widget}->clr_commands; 953 $self->{map_widget}->clr_commands;
870 954
871 ::stop_game (); 955 ::stop_game ();
872} 956}
873 957
874sub image_info {
875 my ($self, $numfaces) = @_;
876
877 $self->{num_faces} = $numfaces;
878 $self->{face_prefetch} = [1 .. $numfaces];
879 $self->face_prefetch;
880}
881
882sub face_prefetch {
883 my ($self) = @_;
884
885 return unless $::CFG->{face_prefetch};
886
887 if ($self->{num_faces}) {
888 return if @{ $self->{send_queue} || [] };
889 my $todo = @{ $self->{face_prefetch} }
890 or return;
891
892 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
893
894 $self->send ("requestinfo image_sums $face $face");
895
896 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
897 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
898 } elsif (!exists $self->{num_faces}) {
899 $self->send ("requestinfo image_info");
900
901 $self->{num_faces} = 0;
902
903 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
904 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
905 }
906}
907
908sub update_floorbox { 958sub update_floorbox {
909 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 959 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910 return unless $::CONN; 960 return unless $::CONN;
911 961
912 $::FLOORBOX->clear; 962 $::FLOORBOX->clear;
963
964 my @add;
913 965
914 my $row; 966 my $row;
915 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 967 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
916 if ($row < 6) { 968 if ($row < 6) {
917 local $_->{face_widget}; # hack to force recreation of widget 969 local $_->{face_widget}; # hack to force recreation of widget
918 local $_->{desc_widget}; # hack to force recreation of widget 970 local $_->{desc_widget}; # hack to force recreation of widget
919 CFPlus::Item::update_widgets $_; 971 CFPlus::Item::update_widgets $_;
920 972
973 push @add,
921 $::FLOORBOX->add (0, $row, $_->{face_widget}); 974 0, $row, $_->{face_widget},
922 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 975 1, $row, $_->{desc_widget};
923 976
924 $row++; 977 $row++;
925 } else { 978 } else {
926 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 979 push @add, 1, $row, new CFPlus::UI::Button
927 text => "More...", 980 text => "More...",
928 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 981 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929 ); 982 ;
930 last; 983 last;
931 } 984 }
932 } 985 }
933 if ($::CONN->{open_container}) { 986 if ($::CONN->{open_container}) {
934 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 987 push @add, 1, $row++, new CFPlus::UI::Button
935 text => "Close container", 988 text => "Close container",
936 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 989 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937 ); 990 ;
938 } 991 }
992
993 $::FLOORBOX->add_at (@add);
939 }); 994 });
940 995
941 $::WANT_REFRESH++; 996 $::WANT_REFRESH++;
942} 997}
943 998
… …
1063 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1118 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1119 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065 . "map size $self->{mapw}×$self->{maph}\n" 1120 . "map size $self->{mapw}×$self->{maph}\n"
1066 ); 1121 );
1067 1122
1068 ::setup_build_button ($self->{editor_support}->{builder_ui});
1069} 1123}
1070 1124
1071sub logged_in { 1125sub logged_in {
1072 my ($self) = @_; 1126 my ($self) = @_;
1073 1127
1074 $self->send_ext_req (cfplus_support => version => 1, sub { 1128 $self->send_ext_req (cfplus_support => version => 2, sub {
1129 my (%msg) = @_;
1130
1075 $self->{cfplus_ext} = $_[0]{version}; 1131 $self->{cfplus_ext} = $msg{version};
1076 $self->update_server_info; 1132 $self->update_server_info;
1077 1133
1078 if ($self->{cfplus_ext} >= 2) { 1134 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub { 1135 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0]; 1136 $self->{editor_support} = { @_ };
1081 $self->update_server_info; 1137 $self->update_server_info;
1082 1138
1083 0 1139 0
1084 }); 1140 });
1085 } 1141 }
… …
1093 $self->send_command ("output-count $::CFG->{output_count}"); 1149 $self->send_command ("output-count $::CFG->{output_count}");
1094 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1150 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095 $self->send_command ("pickup $::CFG->{pickup}"); 1151 $self->send_command ("pickup $::CFG->{pickup}");
1096} 1152}
1097 1153
1098sub buildat {
1099 my ($self, $builditem, $x, $y) = @_;
1100
1101 if ($self->{cfplus_ext}) {
1102 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103 }
1104}
1105
1106sub lookat { 1154sub lookat {
1107 my ($self, $x, $y) = @_; 1155 my ($self, $x, $y) = @_;
1108 1156
1109 if ($self->{cfplus_ext}) { 1157 if ($self->{cfplus_ext}) {
1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1158 $self->send_ext_req (lookat => $x, $y, sub {
1111 my ($msg) = @_; 1159 my (%msg) = @_;
1112 1160
1113 if (exists $msg->{npc_dialog}) { 1161 if (exists $msg{npc_dialog}) {
1114 # start npc chat dialog 1162 # start npc chat dialog
1115 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1163 $self->{npc_dialog} = new CFPlus::NPCDialog::
1116 dx => $x, 1164 token => $msg{npc_dialog},
1117 dy => $y,
1118 title => "$msg->{npc_dialog} (NPC)", 1165 title => "$msg{npc_dialog}[0] (NPC)",
1119 conn => $self, 1166 conn => $self,
1120 ; 1167 ;
1121 } 1168 }
1122 }); 1169 });
1123 } 1170 }
… …
1130 1177
1131 (delete $self->{npc_dialog})->destroy 1178 (delete $self->{npc_dialog})->destroy
1132 if $self->{npc_dialog}; 1179 if $self->{npc_dialog};
1133 1180
1134 $self->SUPER::destroy; 1181 $self->SUPER::destroy;
1182
1183 %$self = ();
1135} 1184}
1136 1185
1137package CFPlus::NPCDialog; 1186package CFPlus::NPCDialog;
1138 1187
1139our @ISA = 'CFPlus::UI::Toplevel'; 1188our @ISA = 'CFPlus::UI::Toplevel';
… …
1186 on_activate => sub { $this->destroy; 1 }, 1235 on_activate => sub { $this->destroy; 1 },
1187 ; 1236 ;
1188 1237
1189 $self->update_options; 1238 $self->update_options;
1190 1239
1191 $self->{id} = $self->{conn}->send_ext_req ( 1240 $self->{id} = "npc-channel-" . $self->{conn}->token;
1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1241 $self->{conn}->connect_ext ($self->{id} => sub {
1193 sub { $this && $this->feed (@_) } 1242 $this->feed (@_) if $this;
1194 ); 1243 });
1244
1245 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195 1246
1196 $self->{entry}->grab_focus; 1247 $self->{entry}->grab_focus;
1197 1248
1198 $self->{textview}->add_paragraph ({ 1249 $self->{textview}->add_paragraph ({
1199 fg => [1, 1, 0, 1], 1250 fg => [1, 1, 0, 1],
… …
1222 ); 1273 );
1223 } 1274 }
1224} 1275}
1225 1276
1226sub feed { 1277sub feed {
1227 my ($self, $msg) = @_; 1278 my ($self, $type, @arg) = @_;
1228 1279
1229 CFPlus::weaken $self; 1280 CFPlus::weaken $self;
1230 1281
1231 if ($msg->{msgtype} eq "reply") { 1282 if ($type eq "update") {
1283 my (%info) = @arg;
1284
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1285 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1286 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1234
1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237 my @link;
1238 $text =~ s{
1239 ($match)
1240 }{
1241 my $kw = $1;
1242
1243 push @link, new CFPlus::UI::Label
1244 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245 can_hover => 1,
1246 can_events => 1,
1247 padding_x => 0,
1248 padding_y => 0,
1249 on_button_up => sub {
1250 $self->send ($kw);
1251 };
1252
1253 "\x{fffc}"
1254 }giex;
1255 1287
1288 if (exists $info{msg}) {
1289 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1290 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1291 my @link;
1292 $text =~ s{
1293 ($match)
1294 }{
1295 my $kw = $1;
1296
1297 push @link, new CFPlus::UI::Label
1298 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1299 can_hover => 1,
1300 can_events => 1,
1301 padding_x => 0,
1302 padding_y => 0,
1303 on_button_up => sub {
1304 $self->send ($kw);
1305 };
1306
1307 "\x{fffc}"
1308 }giex;
1309
1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1310 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257 $self->{textview}->scroll_to_bottom; 1311 $self->{textview}->scroll_to_bottom;
1312 }
1313
1258 $self->update_options; 1314 $self->update_options;
1259 } else { 1315 } else {
1260 $self->destroy; 1316 $self->destroy;
1261 } 1317 }
1262 1318
… …
1267 my ($self, $msg) = @_; 1323 my ($self, $msg) = @_;
1268 1324
1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1325 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270 $self->{textview}->scroll_to_bottom; 1326 $self->{textview}->scroll_to_bottom;
1271 1327
1272 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1328 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273} 1329}
1274 1330
1275sub destroy { 1331sub destroy {
1276 my ($self) = @_; 1332 my ($self) = @_;
1277 1333
1278 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1334 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279 1335
1280 if ($self->{conn}) { 1336 if ($self->{conn}) {
1281 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1337 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282 delete $self->{conn}{npc_dialog}; 1338 delete $self->{conn}{npc_dialog};
1283 $self->{conn}->disconnect_ext ($self->{id}); 1339 $self->{conn}->disconnect_ext ($self->{id});
1284 } 1340 }
1285 1341
1286 $self->SUPER::destroy; 1342 $self->SUPER::destroy;

Diff Legend

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