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.147 by root, Thu Aug 9 03:40:01 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 $self->update_fx_want;
63
56 if (my $ts = $cap->{tileset}) { 64 if (my $ts = $cap{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) { 65 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default; 66 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3]; 67 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]); 68 $self->setup_req (tileset => $default->[0]);
61 69
… …
65 $self->setup_req (mapsize => "${w}x${h}"); 73 $self->setup_req (mapsize => "${w}x${h}");
66 } 74 }
67 } 75 }
68 }); 76 });
69 77
78 $self->{json_coder}
79 ->convert_blessed
80 ->filter_json_single_key_object (__w_ => sub {
81 $self->{widget}{$_[0]}
82 });
83
84 # widgetset new
70 $self->connect_ext (ws_n => sub { 85 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_; 86 my ($id) = @_;
72 87
73 $self->{widgetset}{$arg{id}} = { 88 $self->{widgetset}{$id} = {
74 w => {}, 89 w => {},
75 }; 90 };
76 }); 91 });
77 92
93 # widgetset destroy
78 $self->connect_ext (ws_d => sub { 94 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_; 95 my ($id) = @_;
80 96
81 my $ws = delete $self->{widgetset}{$arg{id}} 97 my $ws = delete $self->{widgetset}{$id}
82 or return; 98 or return;
83 99
84 $_->destroy 100 $_->destroy
85 for values %{$ws->{w}}; 101 for values %{$ws->{w}};
86 }); 102 });
87 103
104 # widgetset create
88 $self->connect_ext (ws_c => sub { 105 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_; 106 my ($ws, $id, $class, $args) = @_;
90
91 my $args = $arg->{args} || {};
92 107
93 for my $ev (grep /^on_/, keys %$args) { 108 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub { 109 $args->{$ev} = sub {
95 my $id = shift->{s_id}; 110 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_); 111 $self->send_exti_msg (w_e => $id, $ev, \@_);
97 112
98 1 113 1
99 }; 114 };
100 } 115 }
101 116
102 if (my $widget = eval { 117 if (my $widget = eval {
118 local $SIG{__DIE__};
103 "CFPlus::UI::$arg->{class}"->new ( 119 "CFPlus::UI::$class"->new (
104 %$args, 120 %$args,
105 s_ws => $arg->{ws}, 121 s_ws => $ws,
106 s_id => $arg->{id}, 122 s_id => $id,
107 ) 123 )
108 } 124 }
109 ) { 125 ) {
110 $self->{widget}{$arg->{id}} 126 $self->{widget}{$id}
111 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}} 127 = $self->{widgetset}{$ws}{w}{$id}
112 = $widget; 128 = $widget;
113 129
114 $widget->connect (on_destroy => sub { 130 $widget->connect (on_destroy => sub {
115 my ($widget) = @_; 131 my ($widget) = @_;
116 132
117 delete $self->{widget}{$widget->{s_id}}; 133 delete $self->{widget}{$widget->{s_id}};
118 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}; 134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
119 }); 135 });
120 } else { 136 } else {
121 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n"; 137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
122 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy"); 138 $self->send_exti_msg (w_e => $id, "destroy");
123 } 139 }
124 }); 140 });
125 141
142 # widget call
126 $self->connect_ext (w_c => sub { 143 $self->connect_ext (w_c => sub {
127 my ($arg) = @_; 144 my ($id, $rid, $method, $args) = @_;
128 145
129 my $w = $self->{widget}{$arg->{id}} 146 my $w = $self->{widget}{$id}
130 or return; 147 or return;
131 my $m = $arg->{name};
132 148
133 my @a = map { 149 $args ||= [];
134 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
135 ? $self->{widget}{$_->{__widget_ref__}}
136 : $_
137 } @{ $arg->{args} || [] };
138 150
139 if (exists $arg->{rid}) { 151 if ($rid) {
140 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]); 152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
141 } else { 153 } else {
142 $w->$m (@a); 154 $w->$method (@$args);
143 } 155 }
144 }); 156 });
145 157
158 # widget set
146 $self->connect_ext (w_s => sub { 159 $self->connect_ext (w_s => sub {
147 my ($arg) = @_; 160 my ($id, $attr) = @_;
148 161
149 my $w = $self->{widget}{$arg->{id}} 162 my $w = $self->{widget}{$id}
150 or return; 163 or return;
151 164
152 $w->{$arg->{name}} = $arg->{value}; 165 for (my $i = 0; $i < $#$attr; $i += 2) {
166 my ($member, $value) = @$attr[$i, $i+1];
167 if (defined $value) {
168 $w->{$member} = $value;
169 } else {
170 delete $w->{$member};
171 }
172 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
173 }
153 }); 174 });
154 175
176 # widget get
155 $self->connect_ext (w_g => sub { 177 $self->connect_ext (w_g => sub {
156 my ($arg) = @_; 178 my ($id, $rid, $attr) = @_;
157 179
158 my $w = $self->{widget}{$arg->{id}} 180 my $w = $self->{widget}{$id}
159 or return; 181 or return;
160 182
161 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]); 183 $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
162 }); 184 });
163 185
186 # message window
187 $self->connect_ext (channel_info => sub {
188 my ($info) = @_;
189 $self->{channels}->{$info->{id}} = $info;
190 $::MESSAGE_WINDOW->add_channel ($info);
191 });
192
193 # destroy widgets on logout
164 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 194 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
165 for my $ws (values %{delete $self->{widgetset} || {}}) { 195 for my $ws (values %{delete $self->{widgetset} || {}}) {
166 $_->destroy 196 $_->destroy
167 for values %{delete $ws->{w} || {}}; 197 for values %{delete $ws->{w} || {}};
168 } 198 }
… …
189 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
190 220
191 $self 221 $self
192} 222}
193 223
224sub update_fx_want {
225 my ($self) = @_;
226
227 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND
230 });
231}
232
194sub logprint { 233sub logprint {
195 my ($self, @a) = @_; 234 my ($self, @a) = @_;
196 235
197 $self->{log_fh} ||= do { 236 CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
198 my $path = "$Crossfire::VARDIR/log.$self->{host}";
199
200 open my $fh, ">>:utf8", $path
201 or die "Couldn't open logfile $path: $!";
202
203 $fh->autoflush (1);
204
205 $fh;
206 };
207
208 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
209
210 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
211 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
212
213 print {$self->{log_fh}} "$ts ", @a, "\n";
214} 237}
215 238
216sub _stat_numdiff { 239sub _stat_numdiff {
217 my ($self, $name, $old, $new) = @_; 240 my ($self, $name, $old, $new) = @_;
218 241
… …
381 my @skills = keys %{ $self->{skill_info} }; 404 my @skills = keys %{ $self->{skill_info} };
382 405
383 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 406 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
384 $sktbl->clear; 407 $sktbl->clear;
385 408
409 my @add;
410
411 push @add,
386 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
387 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
388 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
389 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
390 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
391 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ;
392 419
393 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
394 421
395 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 422 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); 423 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
424 } 451 }
425 452
426 1 453 1
427 }; 454 };
428 455
456 push @add,
429 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 457 $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); 458 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 459 $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); 460 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, 461 $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); 462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ;
435 464
436 $x++ and ($x, $y) = (0, $y + 1); 465 $x++ and ($x, $y) = (0, $y + 1);
437 } 466 }
467
468 $sktbl->add_at (@add);
438 } 469 }
439 470
440 for (grep exists $stats->{$_}, @skills) { 471 for (grep exists $stats->{$_}, @skills) {
441 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
442 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
… …
518 do { 549 do {
519 $id = pop @{$self->{bg_fetch}} 550 $id = pop @{$self->{bg_fetch}}
520 or return; 551 or return;
521 } while $self->{texture}[$id]; 552 } while $self->{texture}[$id];
522 553
523 CFPlus::DB::get tilecache => $id, sub { 554 CFPlus::DB::exists tilecache => $id, sub {
524 my ($data) = @_; 555 my ($exists) = @_;
525 556
526 return unless $self->{map}; # stop when destroyed 557 return unless $self->{map}; # stop when destroyed
527 558
528 $self->set_texture ($id => $data) 559 $self->have_tile ($id)
529 if defined $data; 560 if $exists;
530 561
531 $self->bg_fetch; 562 $self->bg_fetch;
532 }; 563 };
533} 564}
534 565
… …
679} 710}
680 711
681sub face_find { 712sub face_find {
682 my ($self, $facenum, $face, $cb) = @_; 713 my ($self, $facenum, $face, $cb) = @_;
683 714
684 my $hash = "$face->{chksum},$face->{name}"; 715 if ($face->{type} == 0) { # FT_FACE
685
686 my $id = CFPlus::DB::get_tile_id_sync $hash; 716 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
687 717
688 $face->{id} = $id; 718 $face->{id} = $id;
689 $self->{faceid}[$facenum] = $id; 719 $self->{faceid}[$facenum] = $id;
690 720
691 $self->{map}->set_tileid ($facenum => $id); 721 $self->{map}->set_tileid ($facenum => $id);
692 722
693 CFPlus::DB::get tilecache => $id, $cb; 723 CFPlus::DB::get tilecache => $id, $cb;
724
725 } elsif ($face->{type} & 1) { # with metadata
726 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
727 CFPlus::DB::get res_meta => $face->{name}, $cb;
728 }
694} 729}
695 730
696sub face_update { 731sub face_update {
697 my ($self, $facenum, $face, $changed) = @_; 732 my ($self, $facenum, $face, $changed) = @_;
698 733
734 if ($face->{type} == 0) { # FT_FACE
699 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 735 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
700 if $changed; 736 if $changed;
701 737
702 $self->set_texture ($face->{id} => delete $face->{image}); 738 $self->have_tile ($face->{id});
739
740 } elsif ($face->{type} & 1) { # split metadata
741 if ($changed) { # new data
742 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
743 $face->{meta} = $self->{json_coder}->decode ($meta_json);
744
745 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
746 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
747 } else {
748 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
749 }
750
751 ::add_license ($face);
752
753 if ($face->{type} == 3) { # FT_MUSIC
754 $self->{music_meta}{$facenum} = $face;
755
756 ::message ({ markup => "downloaded song #$facenum" })
757 if $changed;
758
759 &::audio_music_push ($facenum);
760 } elsif ($face->{type} == 5) { # FT_SOUND
761 $self->{sound_meta}{$facenum} = $face;
762
763 ::message ({ markup => "downloaded sound #$facenum" })
764 if $changed;
765
766 &::audio_sound_push ($facenum);
767 }
768
769 }
703} 770}
704 771
705sub smooth_update { 772sub smooth_update {
706 my ($self, $facenum, $face) = @_; 773 my ($self, $facenum, $face) = @_;
707 774
708 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 775 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
709} 776}
710 777
711sub set_texture { 778sub have_tile {
712 my ($self, $id, $data) = @_; 779 my ($self, $tile) = @_;
713 780
781 return unless $self->{map};
782
714 $self->{texture}[$id] = my $tex = 783 $self->{texture}[$tile] ||= my $tex =
715 new_from_image CFPlus::Texture 784 new CFPlus::Texture
716 $data, minify => 1, mipmap => 1; 785 tile => $tile, minify => 1, mipmap => 1, delay => 1;
717 786
718 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 787 $_->() for @{(delete $self->{face_cb}{$tile}) || []};
719 $self->{map_widget}->update; 788}
789
790sub connect_face_update {
791 my ($self, $id, $cb) = @_;
792
793 push @{$self->{face_cb}{$id}}, $cb;
794
795 CFPlus::guard {
796 @{$self->{face_cb}{$id}}
797 = grep $_ != $cb,
798 @{$self->{face_cb}{$id}};
799 }
720} 800}
721 801
722sub sound_play { 802sub sound_play {
723 my ($self, $x, $y, $soundnum, $type) = @_; 803 my ($self, $type, $face, $dx, $dy, $vol) = @_;
724 804
725 $self->{sound_play}->($x, $y, $soundnum, $type); 805 &::audio_sound_play ($face, $dx, $dy, $vol)
806 unless $type & 1; # odd types are silent for future expansion
726} 807}
727 808
728my $LAST_QUERY; # server is stupid, stupid, stupid 809my $LAST_QUERY; # server is stupid, stupid, stupid
729 810
730sub query { 811sub query {
… …
795 $self->{$type} = $text; 876 $self->{$type} = $text;
796 } else { 877 } else {
797 $self->logprint ("msg: ", $text); 878 $self->logprint ("msg: ", $text);
798 return if $color < 0; # negative color == ignore if not understood 879 return if $color < 0; # negative color == ignore if not understood
799 880
800 my $fg = $CF_COLOR[$color % @CF_COLOR]; 881 my $fg = $CF_COLOR[$color & 0x1f] || [1, 0, 0];
801 882
802 ## try to create single paragraphs of multiple lines sent by the server 883 ## try to create single paragraphs of multiple lines sent by the server
803 # no longer neecssary with TRT servers 884 # no longer neecssary with TRT servers
804 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 885 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
805 886
806 ::message ({ fg => $fg, markup => $_ }) 887 ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
807 for split /\n/, $text; 888 for split /\n/, $text;
808 889
809 $self->{statusbox}->add ($text, 890 $self->{statusbox}->add ($text,
810 group => $text, 891 group => $text,
811 fg => $fg, 892 fg => $fg,
… …
868 $self->{map_widget}->clr_commands; 949 $self->{map_widget}->clr_commands;
869 950
870 ::stop_game (); 951 ::stop_game ();
871} 952}
872 953
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 { 954sub update_floorbox {
908 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 955 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
909 return unless $::CONN; 956 return unless $::CONN;
910 957
911 $::FLOORBOX->clear; 958 $::FLOORBOX->clear;
959
960 my @add;
912 961
913 my $row; 962 my $row;
914 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 963 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
915 if ($row < 6) { 964 if ($row < 6) {
916 local $_->{face_widget}; # hack to force recreation of widget 965 local $_->{face_widget}; # hack to force recreation of widget
917 local $_->{desc_widget}; # hack to force recreation of widget 966 local $_->{desc_widget}; # hack to force recreation of widget
918 CFPlus::Item::update_widgets $_; 967 CFPlus::Item::update_widgets $_;
919 968
969 push @add,
920 $::FLOORBOX->add (0, $row, $_->{face_widget}); 970 0, $row, $_->{face_widget},
921 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 971 1, $row, $_->{desc_widget};
922 972
923 $row++; 973 $row++;
924 } else { 974 } else {
925 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 975 push @add, 1, $row, new CFPlus::UI::Button
926 text => "More...", 976 text => "More...",
927 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 977 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
928 ); 978 ;
929 last; 979 last;
930 } 980 }
931 } 981 }
932 if ($::CONN->{open_container}) { 982 if ($::CONN->{open_container}) {
933 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 983 push @add, 1, $row++, new CFPlus::UI::Button
934 text => "Close container", 984 text => "Close container",
935 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 985 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
936 ); 986 ;
937 } 987 }
988
989 $::FLOORBOX->add_at (@add);
938 }); 990 });
939 991
940 $::WANT_REFRESH++; 992 $::WANT_REFRESH++;
941} 993}
942 994
… …
1062 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1063 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1064 . "map size $self->{mapw}×$self->{maph}\n" 1116 . "map size $self->{mapw}×$self->{maph}\n"
1065 ); 1117 );
1066 1118
1067 ::setup_build_button ($self->{editor_support}->{builder_ui});
1068} 1119}
1069 1120
1070sub logged_in { 1121sub logged_in {
1071 my ($self) = @_; 1122 my ($self) = @_;
1072 1123
1073 $self->send_ext_req (cfplus_support => version => 1, sub { 1124 $self->send_ext_req (cfplus_support => version => 2, sub {
1125 my (%msg) = @_;
1126
1074 $self->{cfplus_ext} = $_[0]{version}; 1127 $self->{cfplus_ext} = $msg{version};
1075 $self->update_server_info; 1128 $self->update_server_info;
1076 1129
1077 if ($self->{cfplus_ext} >= 2) { 1130 if ($self->{cfplus_ext} >= 2) {
1078 $self->send_ext_req ("editor_support", sub { 1131 $self->send_ext_req ("editor_support", sub {
1079 $self->{editor_support} = $_[0]; 1132 $self->{editor_support} = { @_ };
1080 $self->update_server_info; 1133 $self->update_server_info;
1081 1134
1082 0 1135 0
1083 }); 1136 });
1084 } 1137 }
… …
1092 $self->send_command ("output-count $::CFG->{output_count}"); 1145 $self->send_command ("output-count $::CFG->{output_count}");
1093 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1146 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1094 $self->send_command ("pickup $::CFG->{pickup}"); 1147 $self->send_command ("pickup $::CFG->{pickup}");
1095} 1148}
1096 1149
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 { 1150sub lookat {
1106 my ($self, $x, $y) = @_; 1151 my ($self, $x, $y) = @_;
1107 1152
1108 if ($self->{cfplus_ext}) { 1153 if ($self->{cfplus_ext}) {
1109 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1154 $self->send_ext_req (lookat => $x, $y, sub {
1110 my ($msg) = @_; 1155 my (%msg) = @_;
1111 1156
1112 if (exists $msg->{npc_dialog}) { 1157 if (exists $msg{npc_dialog}) {
1113 # start npc chat dialog 1158 # start npc chat dialog
1114 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1159 $self->{npc_dialog} = new CFPlus::NPCDialog::
1115 dx => $x, 1160 token => $msg{npc_dialog},
1116 dy => $y,
1117 title => "$msg->{npc_dialog} (NPC)", 1161 title => "$msg{npc_dialog}[0] (NPC)",
1118 conn => $self, 1162 conn => $self,
1119 ; 1163 ;
1120 } 1164 }
1121 }); 1165 });
1122 } 1166 }
… …
1129 1173
1130 (delete $self->{npc_dialog})->destroy 1174 (delete $self->{npc_dialog})->destroy
1131 if $self->{npc_dialog}; 1175 if $self->{npc_dialog};
1132 1176
1133 $self->SUPER::destroy; 1177 $self->SUPER::destroy;
1178
1179 %$self = ();
1134} 1180}
1135 1181
1136package CFPlus::NPCDialog; 1182package CFPlus::NPCDialog;
1137 1183
1138our @ISA = 'CFPlus::UI::Toplevel'; 1184our @ISA = 'CFPlus::UI::Toplevel';
… …
1185 on_activate => sub { $this->destroy; 1 }, 1231 on_activate => sub { $this->destroy; 1 },
1186 ; 1232 ;
1187 1233
1188 $self->update_options; 1234 $self->update_options;
1189 1235
1190 $self->{id} = $self->{conn}->send_ext_req ( 1236 $self->{id} = "npc-channel-" . $self->{conn}->token;
1191 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1237 $self->{conn}->connect_ext ($self->{id} => sub {
1192 sub { $this && $this->feed (@_) } 1238 $this->feed (@_) if $this;
1193 ); 1239 });
1240
1241 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1194 1242
1195 $self->{entry}->grab_focus; 1243 $self->{entry}->grab_focus;
1196 1244
1197 $self->{textview}->add_paragraph ({ 1245 $self->{textview}->add_paragraph ({
1198 fg => [1, 1, 0, 1], 1246 fg => [1, 1, 0, 1],
… …
1221 ); 1269 );
1222 } 1270 }
1223} 1271}
1224 1272
1225sub feed { 1273sub feed {
1226 my ($self, $msg) = @_; 1274 my ($self, $type, @arg) = @_;
1227 1275
1228 CFPlus::weaken $self; 1276 CFPlus::weaken $self;
1229 1277
1230 if ($msg->{msgtype} eq "reply") { 1278 if ($type eq "update") {
1279 my (%info) = @arg;
1280
1231 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1281 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1232 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1282 $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 1283
1284 if (exists $info{msg}) {
1285 my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
1286 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1287 my @link;
1288 $text =~ s{
1289 ($match)
1290 }{
1291 my $kw = $1;
1292
1293 push @link, new CFPlus::UI::Label
1294 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1295 can_hover => 1,
1296 can_events => 1,
1297 padding_x => 0,
1298 padding_y => 0,
1299 on_button_up => sub {
1300 $self->send ($kw);
1301 };
1302
1303 "\x{fffc}"
1304 }giex;
1305
1255 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1306 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1256 $self->{textview}->scroll_to_bottom; 1307 $self->{textview}->scroll_to_bottom;
1308 }
1309
1257 $self->update_options; 1310 $self->update_options;
1258 } else { 1311 } else {
1259 $self->destroy; 1312 $self->destroy;
1260 } 1313 }
1261 1314
… …
1266 my ($self, $msg) = @_; 1319 my ($self, $msg) = @_;
1267 1320
1268 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1321 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1269 $self->{textview}->scroll_to_bottom; 1322 $self->{textview}->scroll_to_bottom;
1270 1323
1271 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1324 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1272} 1325}
1273 1326
1274sub destroy { 1327sub destroy {
1275 my ($self) = @_; 1328 my ($self) = @_;
1276 1329
1277 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1330 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1278 1331
1279 if ($self->{conn}) { 1332 if ($self->{conn}) {
1280 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1333 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1281 delete $self->{conn}{npc_dialog}; 1334 delete $self->{conn}{npc_dialog};
1282 $self->{conn}->disconnect_ext ($self->{id}); 1335 $self->{conn}->disconnect_ext ($self->{id});
1283 } 1336 }
1284 1337
1285 $self->SUPER::destroy; 1338 $self->SUPER::destroy;

Diff Legend

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