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.124 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.220 by root, Wed Jan 4 11:23:23 2012 UTC

1package CFPlus::Protocol; 1package DC::Protocol;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
5use Guard ();
6
6use Crossfire::Protocol::Constants; 7use Deliantra::Protocol::Constants;
7 8
8use CFPlus; 9use DC;
9use CFPlus::DB; 10use DC::DB;
10use CFPlus::UI; 11use DC::UI;
11use CFPlus::Pod; 12use DC::Pod;
12use CFPlus::Macro; 13use DC::Macro;
13use CFPlus::Item; 14use DC::Item;
14 15
15use Crossfire::Protocol::Base 0.95;
16
17use base 'Crossfire::Protocol::Base'; 16use base 'Deliantra::Protocol::Base';
17
18our $TEX_DIALOGUE = new_from_resource DC::Texture
19 "dialogue.png", minify => 1, mipmap => 1;
20
21our $TEX_NOFACE = new_from_resource DC::Texture
22 "noface.png", minify => 1, mipmap => 1, wrap => 1;
23
24sub MIN_TEXTURE_UNUSED() { 1 }#d#
18 25
19sub new { 26sub new {
20 my ($class, %arg) = @_; 27 my ($class, %arg) = @_;
21 28
22 my $self = $class->SUPER::new (%arg, 29 my $self = $class->SUPER::new (%arg,
23 setup_req => { 30 setup_req => {
24 extmap => 1, 31 extmap => 1,
25 excmd => 1, 32 excmd => 1,
26 ywidget => 1, 33 widget => 2,
27 %{$arg{setup_req} || {}}, 34 %{$arg{setup_req} || {}},
28 }, 35 },
29 ); 36 );
30 37
31 $self->{map_widget}->clr_commands; 38 $self->{map_widget}->clr_commands;
32 39
33 my @cmd_help = map { 40 my @cmd_help = map {
34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 41 $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
35 or die "unparseable command help: $_->{kw}[0]"; 42 or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
36 43
37 my $cmd = $1; 44 my $cmd = $1;
38 my @args = split /\|/, $2; 45 my @args = split /\|/, $2;
39 @args = (".*") unless @args; 46 @args = (".*") unless @args;
40 47
41 my (undef, @par) = CFPlus::Pod::section_of $_; 48 my (undef, @par) = DC::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par; 49 my $text = DC::Pod::as_label @par;
43 50
44 $_ = $_ eq ".*" ? "" : " $_" 51 $_ = $_ eq ".*" ? "" : " $_"
45 for @args; 52 for @args;
46 53
47 map ["$cmd$_", $text], 54 map ["$cmd$_", $text],
48 sort { (length $a) <=> (length $b) } 55 sort { (length $a) <=> (length $b) }
49 @args 56 @args
50 } sort { $a->{par} <=> $b->{par} } 57 } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
51 CFPlus::Pod::find command => "*"; 58 DC::Pod::find command => "*";
52
53 $self->connect_ext (event_music => sub {
54 my ($ev) = @_;
55
56 return unless $::CFG->{bgm_enable};
57
58 my $faces = $ev->{faces};
59 my @songs;
60
61 # request music from server if appropriate
62 if (my $faces = $ev->{faces}) {
63 for (@$faces) {
64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum;
66
67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum;
69
70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 &::audio_music_set ($self->{songs});
80 } else {
81 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82 $self->ask_face ($face, -100 - $pri, undef, sub {
83 my $len = length $_[1];
84 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
85
86 CFPlus::DB::write_file $path, $data, sub {
87 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88 my $meta = $self->{json_coder}->decode ($meta_json);
89 $meta->{path} = $path;
90 $self->{music_meta}{$chksum} = $meta;
91
92 ::message ({ markup => "downloaded song #$face, size $len octets" });
93 &::audio_music_set ($self->{songs});
94 };
95 };
96 });
97 }
98 }
99 }
100 }
101
102 if (my $play = $ev->{play}) {
103 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104 }
105 });
106
107 $self->connect_ext (event_capabilities => sub {
108 my ($cap) = @_;
109
110 if (my $ts = $cap->{tileset}) {
111 if (my ($default) = grep $_->[2] & 1, @$ts) {
112 $self->{tileset} = $default;
113 $self->{tilesize} = $default->[3];
114 $self->setup_req (tileset => $default->[0]);
115
116 my $w = int $self->{mapw} * 32 / $self->{tilesize};
117 my $h = int $self->{maph} * 32 / $self->{tilesize};
118
119 $self->setup_req (mapsize => "${w}x${h}");
120 }
121 }
122 });
123 59
124 $self->{json_coder} 60 $self->{json_coder}
125 ->convert_blessed 61 ->convert_blessed
126 ->filter_json_single_key_object (__widget_ref__ => sub { 62 ->filter_json_single_key_object ("\fw" => sub {
127 $self->{widget}{$_[0]} 63 $self->{widget}{$_[0]}
64 })
65 ->filter_json_single_key_object ("\fc" => sub {
66 my ($id) = @_;
67 sub {
68 $self->send_exti_msg (w_e => $id, @_);
69 }
128 }); 70 });
129
130 # widgetset new
131 $self->connect_ext (ws_n => sub {
132 my ($arg) = @_;
133
134 $self->{widgetset}{$arg{id}} = {
135 w => {},
136 };
137 });
138
139 # widgetset destroy
140 $self->connect_ext (ws_d => sub {
141 my ($arg) = @_;
142
143 my $ws = delete $self->{widgetset}{$arg{id}}
144 or return;
145
146 $_->destroy
147 for values %{$ws->{w}};
148 });
149
150 # widgetset destroy
151 $self->connect_ext (ws_c => sub {
152 my ($arg) = @_;
153
154 my $args = $arg->{args} || {};
155
156 for my $ev (grep /^on_/, keys %$args) {
157 $args->{$ev} = sub {
158 my $id = shift->{s_id};
159 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
160
161 1
162 };
163 }
164
165 if (my $widget = eval {
166 local $SIG{__DIE__};
167 "CFPlus::UI::$arg->{class}"->new (
168 %$args,
169 s_ws => $arg->{ws},
170 s_id => $arg->{id},
171 )
172 }
173 ) {
174 $self->{widget}{$arg->{id}}
175 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176 = $widget;
177
178 $widget->connect (on_destroy => sub {
179 my ($widget) = @_;
180
181 delete $self->{widget}{$widget->{s_id}};
182 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183 });
184 } else {
185 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
186 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
187 }
188 });
189
190 # widget call
191 $self->connect_ext (w_c => sub {
192 my ($arg) = @_;
193
194 my $w = $self->{widget}{$arg->{id}}
195 or return;
196 my $m = $arg->{name};
197
198 my $a = $arg->{args} || [];
199
200 if (exists $arg->{rid}) {
201 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
202 } else {
203 $w->$m (@$a);
204 }
205 });
206
207 # widget set
208 $self->connect_ext (w_s => sub {
209 my ($arg) = @_;
210
211 my $w = $self->{widget}{$arg->{id}}
212 or return;
213
214 $w->{$arg->{name}} = $arg->{value};
215 });
216
217 # widget get
218 $self->connect_ext (w_g => sub {
219 my ($arg) = @_;
220
221 my $w = $self->{widget}{$arg->{id}}
222 or return;
223
224 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
225 });
226 71
227 # destroy widgets on logout 72 # destroy widgets on logout
228 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub { 73 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
229 for my $ws (values %{delete $self->{widgetset} || {}}) { 74 for my $ws (values %{delete $self->{widgetset} || {}}) {
230 $_->destroy 75 $_->destroy
231 for values %{delete $ws->{w} || {}}; 76 for values %{delete $ws->{w} || {}};
232 } 77 }
78
79 delete $self->{items};
80 $::INV->clear;
81 $::INVR->clear;
82 $::INVR_HB->clear;
83 $::FLOORBOX->clear;
233 }); 84 });
234 85
235 $self->{map_widget}->add_command (@$_) 86 $self->{map_widget}->add_command (@$_)
236 for @cmd_help; 87 for @cmd_help;
237 88
238 { 89 {
239 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 90 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
240 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
241 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 91 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
242 } 92 }
243 93
244 { 94 {
245 $self->{noface} = my $tex = new_from_file CFPlus::Texture 95 $self->{noface} = my $tex = $TEX_NOFACE;
246 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
247 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 96 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
248 } 97 }
98
99# $self->{expire_count} = DC::DB::FIRST_TILE_ID; # minimum non-fixed tile id
100# $self->{expire_w} = AE::timer 1, 1, sub {
101# my $count = (int @{ $self->{texture} } / MIN_TEXTURE_UNUSED) || 1;
102#
103# for ($self->{map}->expire_textures ($self->{expire_count}, $count)) {
104# warn DC::SvREFCNT $self->{texture}[$_];
105# $self->{texture}[$_]->unload;
106# warn "expire texture $_\n";#d#
107# }
108#
109# ($self->{expire_count} += $count) < @{ $self->{texture} }
110# or $self->{expire_count} = DC::DB::FIRST_TILE_ID;
111# warn "count is $count\n";#d#
112# };
249 113
250 $self->{open_container} = 0; 114 $self->{open_container} = 0;
251 115
252 # per server 116 # per server
253 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 117 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
254 118
255 $self 119 $self
256} 120}
257 121
122sub update_fx_want {
123 my ($self) = @_;
124
125 $self->send_exti_msg (fx_want => {
126 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
127 5 => !!$::CFG->{audio_enable}, # FT_SOUND
128 6 => 1, # FT_RSRC
129 });
130}
131
132sub ext_capabilities {
133 my ($self, %cap) = @_;
134
135 $self->update_fx_want;
136
137 $self->send_exti_req (resource => "exp_table", sub {
138 my ($exp_table) = @_;
139
140 $self->register_face_handler ($exp_table, sub {
141 my ($face) = @_;
142
143 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
144 $_->() for values %{ $self->{on_exp_update} || {} };
145 });
146
147 ()
148 });
149
150 if (my $ts = $cap{tileset}) {
151 if (my ($default) = grep $_->[2] & 1, @$ts) {
152 $self->{tileset} = $default;
153 $self->{tilesize} = $default->[3];
154 $self->setup_req (tileset => $default->[0]);
155
156 my $w = int $self->{mapw} * 32 / $self->{tilesize};
157 my $h = int $self->{maph} * 32 / $self->{tilesize};
158
159 $self->setup_req (mapsize => "${w}x${h}");
160 }
161 }
162}
163
164sub ext_ambient_music {
165 my ($self, $songs) = @_;
166 &::audio_music_set_ambient ($songs);
167}
168
169#############################################################################
170
171sub widget_associate {
172 my ($self, $ws, $id, $widget) = @_;
173
174 $widget ||= new DC::UI::Bin;
175
176 $widget->{s_id} = $id;
177 $self->{widget}{$id} = $widget;
178
179 if ($ws) {
180 $widget->{s_ws} = $ws;
181 $self->{widgetset}{$ws}{w}{$id} = $widget;
182 }
183
184 $widget->connect (on_destroy => sub {
185 my ($widget) = @_;
186
187 delete $self->{widget}{$widget->{s_id}};
188 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
189 if exists $widget->{s_ws};
190 });
191}
192
193# widgetset new
194sub ext_ws_n {
195 my ($self, $id) = @_;
196
197 $self->{widgetset}{$id} = {
198 w => {},
199 };
200}
201
202# widgetset destroy
203sub ext_ws_d {
204 my ($self, $id) = @_;
205
206 my $ws = delete $self->{widgetset}{$id}
207 or return;
208
209 $_->destroy
210 for values %{$ws->{w}};
211}
212
213# widgetset create
214sub ext_ws_c {
215 my ($self, $ws, $id, $class, $args) = @_;
216
217 $self->widget_associate (
218 $ws, $id => scalar eval {
219 local $SIG{__DIE__};
220 "DC::UI::$class"->new (%$args)
221 }
222 );
223}
224
225# widgetset create template
226sub ext_ws_ct {
227 my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
228
229 $done_cb ||= sub { };
230
231 my $parse_list; $parse_list = sub {
232 my ($list) = @_;
233 my @w;
234
235 while (@$list) {
236 my ($class, $args) = splice @$list, 0, 2;
237 my $name = delete $args->{s_id};
238 my $cl = delete $args->{s_cl};
239 my $cfg = delete $cfg->{$name};
240 my $id = delete $cfg->{id};
241 my $w = eval { "DC::UI::$class"->new (%$args, %{ $cfg || {} }) }
242 or next;
243
244 $self->widget_associate ($ws, $id, $w)
245 if $id;
246
247 $w->add ($parse_list->($cl))
248 if $cl;
249
250 push @w, $w;
251 }
252
253 @w
254 };
255
256 # either array reference, or face #
257 if ($type eq "inline") {
258 $done_cb->();
259 $parse_list->($template);
260 } elsif ($type eq "face") {
261 my $handler; $handler = $self->register_face_handler ($template, sub {
262 my ($face) = @_;
263
264 undef $handler;
265 $done_cb->();
266 $parse_list->($self->{json_coder}->decode ($face->{data}));
267 });
268 } else {
269 $done_cb->(0);
270 }
271}
272
273# widgetset associate
274sub ext_ws_a {
275 my ($self, %ass) = @_;
276
277 # everything that has a name, wether conceivably useful or not
278 my %wkw = (
279 root => $DC::UI::ROOT,
280 tooltip => $DC::UI::TOOLTIP,
281
282 mapwidget => $::MAPWIDGET,
283 menubar => $::MENUBAR,
284 menupopup => $::MENUPOPUP,
285 pickup_enable => $::PICKUP_ENABLE,
286 buttonbar => $::BUTTONBAR,
287 metaserver => $::METASERVER,
288 buttonbar => $::BUTTONBAR,
289 login_button => $::LOGIN_BUTTON,
290 quit_dialog => $::QUIT_DIALOG,
291 host_entry => $::HOST_ENTRY,
292 metaserver => $::METASERVER,
293 server_info => $::SERVER_INFO,
294
295 setup_dialog => $::SETUP_DIALOG,
296 setup_notebook => $::SETUP_NOTEBOOK,
297 setup_server => $::SETUP_SERVER,
298 setup_keyboard => $::SETUP_KEYBOARD,
299
300 pl_notebook => $::PL_NOTEBOOK,
301 pl_window => $::PL_WINDOW,
302 inventory_page => $::INVENTORY_PAGE,
303 stats_page => $::STATS_PAGE,
304 skill_page => $::SKILL_PAGE,
305 spell_page => $::SPELL_PAGE,
306 spell_list => $::SPELL_LIST,
307
308 floorbox => $::FLOORBOX,
309 help_window => $::HELP_WINDOW,
310 message_window => $::MESSAGE_WINDOW,
311 message_dist => $::MESSAGE_DIST,
312 statusbox => $::STATUSBOX,
313
314 inv => $::INV,
315 invr => $::INVR,
316 invr_hb => $::INVR_HB,
317 );
318
319 while (my ($id, $name) = each %ass) {
320 $self->widget_associate (undef, $id => $wkw{$name});
321 }
322}
323
324# widget call
325sub ext_w_c {
326 my ($self, $id, $rcb, $method, @args) = @_;
327
328 my $w = $self->{widget}{$id}
329 or return;
330
331 if ($rcb) {
332 $rcb->($w->$method (@args));
333 } else {
334 $w->$method (@args);
335 }
336}
337
338# widget set
339sub ext_w_s {
340 my ($self, $id, $attr) = @_;
341
342 my $w = $self->{widget}{$id}
343 or return;
344
345 for (my $i = 0; $i < $#$attr; $i += 2) {
346 my ($member, $value) = @$attr[$i, $i+1];
347 if (defined $value) {
348 $w->{$member} = $value;
349 } else {
350 delete $w->{$member};
351 }
352 $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
353 }
354}
355
356# widget get
357sub ext_w_g {
358 my ($self, $id, $rid, @attr) = @_;
359
360 my $w = $self->{widget}{$id}
361 or return;
362
363 $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
364}
365
366# message window
367sub ext_channel_info {
368 my ($self, $info) = @_;
369 $self->{channels}->{$info->{id}} = $info;
370 $::MESSAGE_DIST->add_channel ($info);
371}
372
373#############################################################################
374
258sub logprint { 375sub logprint {
259 my ($self, @a) = @_; 376 my ($self, @a) = @_;
260 377
261 $self->{log_fh} ||= do { 378 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
262 my $path = "$Crossfire::VARDIR/log.$self->{host}";
263
264 open my $fh, ">>:utf8", $path
265 or die "Couldn't open logfile $path: $!";
266
267 $fh->autoflush (1);
268
269 $fh;
270 };
271
272 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
273
274 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
275 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
276
277 print {$self->{log_fh}} "$ts ", @a, "\n";
278} 379}
279 380
280sub _stat_numdiff { 381sub _stat_numdiff {
281 my ($self, $name, $old, $new) = @_; 382 my ($self, $name, $old, $new) = @_;
282 383
… …
300 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 401 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
301 : () 402 : ()
302 } 403 }
303 sort { $a <=> $b } keys %{$self->{spell_paths}}; 404 sort { $a <=> $b } keys %{$self->{spell_paths}};
304 405
305 join "", @diff 406 "\u$name: " . (join ", ", @diff)
306} 407}
307 408
308# all stats that are chacked against changes 409# all stats that are chacked against changes
309my @statchange = ( 410my @statchange = (
310 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 411 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
365 } 466 }
366 467
367 if ( 468 if (
368 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 469 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
369 ) { 470 ) {
370 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 471 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
371 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10); 472 $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
372 } 473 }
373 474
374 $self->update_stats_window ($stats, $prev); 475 $self->update_stats_window ($stats, $prev);
375 476
376 $self->{prev_stats} = { %$stats }; 477 $self->{prev_stats} = { %$stats };
… …
413 514
414 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 515 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
415 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 516 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
416 $::GAUGES->{food} ->set_value ($fo, $fo_m); 517 $::GAUGES->{food} ->set_value ($fo, $fo_m);
417 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 518 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
418 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 519 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
419 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 520 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
521 $::GAUGES->{exp} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
420 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 522 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
421 my $title = $stats->{+CS_STAT_TITLE}; 523 my $title = $stats->{+CS_STAT_TITLE};
422 $title =~ s/^Player: //; 524 $title =~ s/^Player: //;
423 $::STATWIDS->{title} ->set_text ("Title: " . $title); 525 $::STATWIDS->{title} ->set_text ("Title: " . $title);
424 526
… …
436 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 538 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
437 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 539 $::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
438 540
439 $self->update_weight; 541 $self->update_weight;
440 542
441 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 543 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
442 for keys %RES_TBL; 544 for keys %RES_TBL;
443 545
444 my $sktbl = $::STATWIDS->{skill_tbl}; 546 my $sktbl = $::STATWIDS->{skill_tbl};
445 my @skills = keys %{ $self->{skill_info} }; 547 my @skills = keys %{ $self->{skill_info} };
446 548
447 if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) { 549 my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
550 map [$_, $self->{skill_info}{$_}],
551 grep exists $stats->{$_},
552 @skills;
553
554 if ($self->{stat_order} ne join ",", map $_->[0], @order) {
555 $self->{stat_order} = join ",", map $_->[0], @order;
556
448 $sktbl->clear; 557 $sktbl->clear;
449 558
450 my @add; 559 my $sw = $self->{skillwid}{""} ||= [
451
452 push @add,
453 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 560 0, 0, (new DC::UI::Label text => "Experience", align => 1),
454 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 561 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
562 2, 0, (new DC::UI::Label text => "Progress"),
455 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 563 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
456 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 564 4, 0, (new DC::UI::Label text => "Experience", align => 1),
457 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 565 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
566 6, 0, (new DC::UI::Label text => "Progress"),
458 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 567 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
459 ; 568 ];
460 569
570 my @add = @$sw;
571
461 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 572 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use skill\nRight click - further options</small>";
462 573
463 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 574 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
464 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 575 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
465 576
466 my ($x, $y) = (0, 1); 577 my ($x, $y) = (0, 1);
467 for ( 578 for (@order) {
468 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
469 map [$_, $self->{skill_info}{$_}],
470 grep exists $stats->{$_},
471 @skills
472 ) {
473 my ($idx, $name) = @$_; 579 my ($idx, $name) = @$_;
474 580
475 my $spell_cb = sub { 581 my $spell_cb = sub {
476 my ($widget, $ev) = @_; 582 my ($widget, $ev) = @_;
477 583
478 if ($ev->{button} == 1) { 584 if ($ev->{button} == 1) {
479 $::CONN->user_send ("ready_skill $name"); 585 $::CONN->user_send ("ready_skill $name");
480 } elsif ($ev->{button} == 2) { 586 } elsif ($ev->{button} == 2) {
481 $::CONN->user_send ("use_skill $name"); 587 $::CONN->user_send ("use_skill $name");
482 } elsif ($ev->{button} == 3) { 588 } elsif ($ev->{button} == 3) {
483 my $shortname = CFPlus::shorten $name, 14; 589 my $shortname = DC::shorten $name, 14;
484 (new CFPlus::UI::Menu 590 (new DC::UI::Menu
485 items => [ 591 items => [
486 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }], 592 ["bind <i>ready_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["ready_skill $name"] }],
487 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }], 593 ["bind <i>use_skill $shortname</i> to a key" => sub { DC::Macro::quick_macro ["use_skill $name"] }],
488 ], 594 ],
489 )->popup ($ev); 595 )->popup ($ev);
490 } else { 596 } else {
491 return 0; 597 return 0;
492 } 598 }
493 599
494 1 600 1
495 }; 601 };
496 602
603 my $sw = $self->{skillwid}{$idx} ||= [
604 # exp
605 (new DC::UI::Label
606 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
607
608 # level
609 (new DC::UI::Label
610 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
611
612 # progress
613 (new DC::UI::ExperienceProgress),
614
615 # label
616 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
617 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
618 ];
619
497 push @add, 620 push @add,
498 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 621 $x * 4 + 0, $y, $sw->[0],
499 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 622 $x * 4 + 1, $y, $sw->[1],
500 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 623 $x * 4 + 2, $y, $sw->[2],
501 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 624 $x * 4 + 3, $y, $sw->[3],
502 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
503 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
504 ; 625 ;
505 626
506 $x++ and ($x, $y) = (0, $y + 1); 627 $x++ and ($x, $y) = (0, $y + 1);
507 } 628 }
508 629
509 $sktbl->add_at (@add); 630 $sktbl->add_at (@add);
510 } 631 }
511 632
512 for (grep exists $stats->{$_}, @skills) { 633 for (@order) {
513 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 634 my ($idx, $name) = @$_;
514 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 635 my $val = $stats->{$idx};
515 }
516}
517 636
518sub macro_send { 637 next if $prev->{$idx}[1] eq $val->[1];
519 my ($self, $macro) = @_;
520 638
521 for my $cmd (@{ $macro->{action} }) { 639 my $sw = $self->{skillwid}{$idx};
522 $self->send_command ($cmd); 640 $sw->[0]->set_text (::formsep ($val->[1]));
641 $sw->[1]->set_text ($val->[0] * 1);
642 $sw->[2]->set_value (@$val);
643
644 $::GAUGES->{skillexp}->set_label ("$name %d%%");
645 $::GAUGES->{skillexp}->set_value (@$val);
523 } 646 }
524} 647}
525 648
526sub user_send { 649sub user_send {
527 my ($self, $command) = @_; 650 my ($self, $command) = @_;
… …
529 $self->{record}->($command) 652 $self->{record}->($command)
530 if $self->{record}; 653 if $self->{record};
531 654
532 $self->logprint ("send: ", $command); 655 $self->logprint ("send: ", $command);
533 $self->send_command ($command); 656 $self->send_command ($command);
534 ::status ($command);
535} 657}
536 658
537sub record { 659sub record {
538 my ($self, $cb) = @_; 660 my ($self, $cb) = @_;
539 661
… …
541} 663}
542 664
543sub map_scroll { 665sub map_scroll {
544 my ($self, $dx, $dy) = @_; 666 my ($self, $dx, $dy) = @_;
545 667
546 $self->{map}->scroll ($dx, $dy); 668 $self->{map_widget}->scroll ($dx, $dy);
547} 669}
548 670
549sub feed_map1a { 671sub feed_map1a {
550 my ($self, $data) = @_; 672 my ($self, $data) = @_;
551 673
552 $self->{map}->map1a_update ($data, $self->{setup}{extmap}); 674 my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
675 my $delay;
676
677 for my $tile (@$missing) {
678 next if $self->{delay}{$tile};
679
680 $delay = 1;
681
682 if (my $tex = $self->{texture}[$tile]) {
683 $tex->upload;
684 } else {
685 $self->{delay}{$tile} = 1;
686
687 # we assume the face is in-flight and will eventually arrive
688 push @{$self->{tile_cb}{$tile}}, sub {
689 delete $self->{delay}{$tile};
690 $_[0]->upload;
691 };
692 }
693 }
694
695 if ($delay) {
696 # delay the map drawing a tiny bit in the hope of getting the missing tiles fetched
697 EV::once undef, 0, 0.03, sub {
698 $self->{map_widget}->update
699 if $self->{map_widget};
700 };
701 } else {
553 $self->{map_widget}->update; 702 $self->{map_widget}->update;
703 }
554} 704}
555 705
556sub magicmap { 706sub magicmap {
557 my ($self, $w, $h, $x, $y, $data) = @_; 707 my ($self, $w, $h, $x, $y, $data) = @_;
558 708
… …
560} 710}
561 711
562sub flush_map { 712sub flush_map {
563 my ($self) = @_; 713 my ($self) = @_;
564 714
565 my $map_info = delete $self->{map_info} 715 return unless $self->{map_info};
566 or return;
567 716
717 for my $map_info (values %{ $self->{map_cache} || {} }) {
568 my ($hash, $x, $y, $w, $h) = @$map_info; 718 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
569 719
570 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 720 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
721
722 if ($data ne $$rdata) {
723 $map_info->[1] = \$data;
724 my $cdata = Compress::LZF::compress $data;
571 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 725 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
572 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 726 }
727 }
573} 728}
574 729
575sub map_clear { 730sub map_clear {
576 my ($self) = @_; 731 my ($self) = @_;
577 732
578 $self->flush_map; 733 $self->flush_map;
734 delete $self->{map_info};
579 delete $self->{neigh_map}; 735 delete $self->{neigh_map};
580 736
581 $self->{map}->clear; 737 $self->{map}->clear;
582 delete $self->{map_widget}{magicmap}; 738 delete $self->{map_widget}{magicmap};
583} 739}
584 740
585sub bg_fetch { 741sub bg_fetch {
586 my ($self) = @_; 742 my ($self) = @_;
587 743
588 my $id; 744 my $tile;
589 745
590 do { 746 do {
591 $id = pop @{$self->{bg_fetch}} 747 $tile = pop @{$self->{bg_fetch}}
592 or return; 748 or return;
593 } while $self->{texture}[$id]; 749 } while $self->{texture}[$tile];
594 750
595 CFPlus::DB::get tilecache => $id, sub { 751 DC::DB::get tilecache => $tile, sub {
596 my ($data) = @_; 752 my ($data) = @_;
597 753
598 return unless $self->{map}; # stop when destroyed 754 return unless $self->{map}; # stop when destroyed
599 755
600 $self->set_texture ($id => $data)
601 if defined $data; 756 if (defined $data) {
757 $self->have_tile ($tile, $data);
758 $self->{texture}[$tile]->upload;
759 }
602 760
603 $self->bg_fetch; 761 $self->bg_fetch;
604 }; 762 };
605} 763}
606 764
607sub load_map($$$) { 765sub load_map($$$$$$) {
608 my ($self, $hash, $x, $y) = @_; 766 my ($self, $hash, $x, $y, $w, $h) = @_;
609 767
610 my $gen = $self->{map_change_gen}; 768 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
611 769
612 CFPlus::DB::get $self->{mapcache} => $hash, sub { 770 my $cb = sub {
613 return unless $gen == $self->{map_change_gen}; 771 $map_info->[1] = \$_[0];
614 772
615 my ($data) = @_;
616
617 if (defined $data) {
618 $data = Compress::LZF::decompress $data;
619 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
620
621 my $inprogress = @{ $self->{bg_fetch} || [] }; 773 my $inprogress = @{ $self->{bg_fetch} || [] };
622 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 774 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
623 $self->bg_fetch unless $inprogress; 775 $self->bg_fetch unless $inprogress;
624 }
625 }; 776 };
777
778 if (my $map_info = $self->{map_cache_old}{$hash}) {
779 $cb->(${ $map_info->[1] });
780 } else {
781 my $gen = $self->{map_change_gen};
782
783 DC::DB::get $self->{mapcache} => $hash, sub {
784 return unless $gen == $self->{map_change_gen};
785 return unless defined $_[0];
786 $cb->(Compress::LZF::decompress $_[0]);
787 };
788 }
626} 789}
627 790
628# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 791# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
629# (server resource,s latency, bandwidth), so this hack is warranted. 792# (server resources, latency, bandwidth), so this hack is warranted.
630# the right fix is to make real tiled maps with an overview file 793# the right fix is to make real tiled maps with an overview file
631sub send_mapinfo { 794sub send_mapinfo {
632 my ($self, $data, $cb) = @_; 795 my ($self, $data, $cb) = @_;
633 796
634 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) { 797 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
… …
659} 822}
660 823
661# this method does a "flood fill" into every tile direction 824# this method does a "flood fill" into every tile direction
662# it assumes that tiles are arranged in a rectangular grid, 825# it assumes that tiles are arranged in a rectangular grid,
663# i.e. a map is the same as the left of the right map etc. 826# i.e. a map is the same as the left of the right map etc.
664# failure to comply are harmless and result in display errors 827# failure to comply is harmless and results in display errors
665# at worst. 828# at worst.
666sub flood_fill { 829sub flood_fill {
667 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 830 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
668 831
669 # the server does not allow map paths > 6 832 # the server does not allow map paths > 6
… …
705 return if $mode ne "spatial"; 868 return if $mode ne "spatial";
706 869
707 $x += $self->{map}->ox; 870 $x += $self->{map}->ox;
708 $y += $self->{map}->oy; 871 $y += $self->{map}->oy;
709 872
710 $self->load_map ($hash, $x, $y) 873 $self->load_map ($hash, $x, $y, $w, $h)
711 unless $self->{neigh_map}{$hash}[5]++;#d# 874 unless $self->{neigh_map}{$hash}[5]++;#d#
712 875
713 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 876 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
714 877
715 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 878 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
723 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 886 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
724 887
725 $self->flush_map; 888 $self->flush_map;
726 889
727 ++$self->{map_change_gen}; 890 ++$self->{map_change_gen};
891 $self->{map_cache_old} = delete $self->{map_cache};
728 892
729 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 893 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
730 894
731 my $mapmapw = $self->{mapmap}->{w}; 895 my $mapmapw = $self->{mapmap}->{w};
732 my $mapmaph = $self->{mapmap}->{h}; 896 my $mapmaph = $self->{mapmap}->{h};
… …
744 $self->{map_info} = [$hash, $x, $y, $w, $h]; 908 $self->{map_info} = [$hash, $x, $y, $w, $h];
745 909
746 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 910 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
747 $::STATWIDS->{map}->set_text ("Map: " . $map); 911 $::STATWIDS->{map}->set_text ("Map: " . $map);
748 912
749 $self->load_map ($hash, $x, $y); 913 $self->load_map ($hash, $x, $y, $w, $h);
750 $self->flood_fill (0, 0, 0, "", $hash, $flags); 914 $self->flood_fill (0, 0, 0, "", $hash, $flags);
751} 915}
752 916
753sub face_find { 917sub face_find {
754 my ($self, $facenum, $face, $cb) = @_; 918 my ($self, $facenum, $face, $cb) = @_;
755 919
756 my $hash = "$face->{chksum},$face->{name}"; 920 if ($face->{type} == 0) { # FT_FACE
757
758 my $id = CFPlus::DB::get_tile_id_sync $hash; 921 my $id = DC::DB::get_tile_id_sync $face->{name};
759 922
760 $face->{id} = $id; 923 $face->{id} = $id;
761 $self->{faceid}[$facenum] = $id;
762
763 $self->{map}->set_tileid ($facenum => $id); 924 $self->{map}->set_tileid ($facenum => $id);
764 925
765 CFPlus::DB::get tilecache => $id, $cb; 926 DC::DB::get tilecache => $id, $cb;
927
928 } elsif ($face->{type} & 1) { # with metadata
929 DC::DB::get res_meta => $face->{name}, $cb;
930
931 } else { # no metadata
932 DC::DB::get res_data => $face->{name}, $cb;
933 }
766} 934}
767 935
768sub face_update { 936sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 937 my ($self, $facenum, $face, $changed) = @_;
770 938
939 if ($face->{type} == 0) {
940 # image, FT_FACE
771 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 941 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
772 if $changed; 942 if $changed;
773 943
774 $self->set_texture ($face->{id} => delete $face->{image}); 944 $self->have_tile ($face->{id}, delete $face->{data});
945
946 } elsif ($face->{type} & 1) {
947 # split metadata case, FT_MUSIC, FT_SOUND
948 if ($changed) { # new data
949 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
950 $face->{data} = $meta;
951
952 # rely on strict ordering here and also on later fetch
953 DC::DB::put res_data => $face->{name} => $data, sub { };
954 DC::DB::put res_meta => $face->{name} => $meta, sub { };
955 }
956
957 $face->{data} = $self->{json_coder}->decode ($face->{data});
958 ::add_license ($face);
959 ::message ({ markup => DC::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
960 if $changed;
961
962 if ($face->{type} == 3) { # FT_MUSIC
963 &::audio_music_push ($facenum);
964 } elsif ($face->{type} == 5) { # FT_SOUND
965 &::audio_sound_push ($facenum);
966 }
967
968 } else {
969 # flat resource case, FT_RSRC
970 DC::DB::put res_data => $face->{name} => $face->{data}, sub { }
971 if $changed;
972 }
973
974 if (my $cbs = $self->{face_cb}{$facenum}) {
975 $_->($face, $changed) for @$cbs;
976 }
775} 977}
776 978
777sub smooth_update { 979sub smooth_update {
778 my ($self, $facenum, $face) = @_; 980 my ($self, $facenum, $face) = @_;
779 981
780 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 982 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781} 983}
782 984
783sub set_texture { 985sub have_tile {
784 my ($self, $id, $data) = @_; 986 my ($self, $tile, $data) = @_;
785 987
786 return unless $self->{map}; 988 return unless $self->{map};
787 989
788 $self->{texture}[$id] = my $tex = 990 my $tex = $self->{texture}[$tile] ||=
789 new_from_image CFPlus::Texture 991 new DC::Texture
790 $data, minify => 1, mipmap => 1; 992 tile => $tile,
993 image => $data, delete_image => 1,
994 minify => 1;
791 995
792 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 996 if (my $cbs = delete $self->{tile_cb}{$tile}) {
793 $self->{map_widget}->update; 997 $_->($tex) for @$cbs;
794 998 }
795 $_->() for @{(delete $self->{face_cb}{$id}) || []};
796} 999}
797 1000
798sub connect_face_update { 1001# call in non-void context registers a temporary
1002# hook with handle, otherwise its permanent
1003sub on_face_change {
799 my ($self, $id, $cb) = @_; 1004 my ($self, $num, $cb) = @_;
800 1005
801 push @{$self->{face_cb}{$id}}, $cb; 1006 push @{$self->{face_cb}{$num}}, $cb;
802 1007
803 CFPlus::guard { 1008 defined wantarray
1009 ? Guard::guard {
804 @{$self->{face_cb}{$id}} 1010 @{$self->{face_cb}{$num}}
805 = grep $_ != $cb, 1011 = grep $_ != $cb,
806 @{$self->{face_cb}{$id}}; 1012 @{$self->{face_cb}{$num}};
807 } 1013 }
1014 : ()
1015}
1016
1017# call in non-void context registers a temporary
1018# hook with handle, otherwise its permanent
1019sub register_face_handler {
1020 my ($self, $num, $cb) = @_;
1021
1022 return unless $num;
1023
1024 # invoke if available right now
1025 $cb->($self->{face}[$num], 0)
1026 unless exists $self->{face}[$num]{loading};
1027
1028 # future changes
1029 $self->on_face_change ($num => $cb)
808} 1030}
809 1031
810sub sound_play { 1032sub sound_play {
811 my ($self, $x, $y, $soundnum, $type) = @_; 1033 my ($self, $type, $face, $dx, $dy, $vol) = @_;
812 1034
813 $self->{sound_play}->($x, $y, $soundnum, $type); 1035 &::audio_sound_play ($face, $dx, $dy, $vol)
1036 unless $type & 1; # odd types are silent for future expansion
814} 1037}
815 1038
816my $LAST_QUERY; # server is stupid, stupid, stupid 1039my $LAST_QUERY; # server is stupid, stupid, stupid
817 1040
818sub query { 1041sub query {
819 my ($self, $flags, $prompt) = @_; 1042 my ($self, $flags, $prompt) = @_;
820 1043
821 $prompt = $LAST_QUERY unless length $prompt; 1044 $prompt = $LAST_QUERY unless length $prompt;
822 $LAST_QUERY = $prompt; 1045 $LAST_QUERY = $prompt;
823 1046
824 $self->{query}-> ($self, $flags, $prompt); 1047 $self->{query}->($self, $flags, $prompt);
825} 1048}
826 1049
827sub sanitise_xml($) { 1050sub sanitise_xml($) {
828 local $_ = shift; 1051 local $_ = shift;
829 1052
830 # we now weed out all tags we do not support 1053 # we now weed out all tags we do not support
831 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g; 1054 s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
1055 }{
1056 "&lt;"
1057 }gex;
1058
832 # now all entities 1059 # now all entities
833 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g; 1060 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
834 1061
835 # handle some elements 1062 # handle some elements
836 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1063 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
837 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs; 1064 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
1065
1066 s/\s+$//;
838 1067
839 $_ 1068 $_
840} 1069}
841 1070
842our %NAME_TO_COLOR = ( 1071our %NAME_TO_COLOR = (
… …
883 $self->{$type} = $text; 1112 $self->{$type} = $text;
884 } else { 1113 } else {
885 $self->logprint ("msg: ", $text); 1114 $self->logprint ("msg: ", $text);
886 return if $color < 0; # negative color == ignore if not understood 1115 return if $color < 0; # negative color == ignore if not understood
887 1116
888 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1117 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
889 1118
890 ## try to create single paragraphs of multiple lines sent by the server 1119 ::message ({
891 # no longer neecssary with TRT servers 1120 fg => $fg,
892 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1121 markup => $text,
1122 type => $type,
1123 extra => [@extra],
1124 color_flags => $color, #d# ugly, kill
1125 });
893 1126
894 ::message ({ fg => $fg, markup => $_ }) 1127# $color &= ~NDI_CLEAR; # only clear once for multiline messages
895 for split /\n/, $text; 1128# # actually, this is an ugly design. _we_ should control the channels,
1129# # not some random other widget, as the channels are clearly protocol-specific.
1130# # then we could also react to flags such as CLEAR without resorting to
1131# # hacks such as color_flags, above.
896 1132
897 $self->{statusbox}->add ($text, 1133 $self->{statusbox}->add ($text,
898 group => $text, 1134 group => $text,
899 fg => $fg, 1135 fg => $fg,
900 timeout => $color >= 2 ? 180 : 10, 1136 timeout => $color >= 2 ? 180 : 10,
901 tooltip_font => $::FONT_FIXED, 1137 tooltip_font => $::FONT_FIXED,
902 ); 1138 ) if $type eq "info";
903 } 1139 }
904} 1140}
905 1141
906sub spell_add { 1142sub spell_add {
907 my ($self, $spell) = @_; 1143 my ($self, $spell) = @_;
… …
911 $spell->{message} =~ s/\n+$//; 1147 $spell->{message} =~ s/\n+$//;
912 $spell->{message} ||= "Server did not provide a description for this spell."; 1148 $spell->{message} ||= "Server did not provide a description for this spell.";
913 1149
914 $::SPELL_LIST->add_spell ($spell); 1150 $::SPELL_LIST->add_spell ($spell);
915 1151
916 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1152 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
917 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1153 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
918} 1154}
919 1155
920sub spell_delete { 1156sub spell_delete {
921 my ($self, $spell) = @_; 1157 my ($self, $spell) = @_;
922 1158
… …
933sub addme_success { 1169sub addme_success {
934 my ($self) = @_; 1170 my ($self) = @_;
935 1171
936 my %skill_help; 1172 my %skill_help;
937 1173
938 for my $node (CFPlus::Pod::find skill_description => "*") { 1174 for my $node (DC::Pod::find skill_description => "*") {
939 my (undef, @par) = CFPlus::Pod::section_of $node; 1175 my (undef, @par) = DC::Pod::section_of $node;
940 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1176 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
941 }; 1177 };
942 1178
943 for my $skill (values %{$self->{skill_info}}) { 1179 for my $skill (values %{$self->{skill_info}}) {
944 $self->{map_widget}->add_command ("ready_skill $skill", 1180 $self->{map_widget}->add_command ("ready_skill $skill",
945 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1181 (DC::asxml "Ready the skill '$skill'\n\n")
946 . $skill_help{$skill}); 1182 . $skill_help{$skill});
947 $self->{map_widget}->add_command ("use_skill $skill", 1183 $self->{map_widget}->add_command ("use_skill $skill",
948 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1184 (DC::asxml "Immediately use the skill '$skill'\n\n")
949 . $skill_help{$skill}); 1185 . $skill_help{$skill});
950 } 1186 }
951} 1187}
952 1188
953sub eof { 1189sub eof {
… …
956 $self->{map_widget}->clr_commands; 1192 $self->{map_widget}->clr_commands;
957 1193
958 ::stop_game (); 1194 ::stop_game ();
959} 1195}
960 1196
961sub image_info {
962 my ($self, $numfaces) = @_;
963
964 $self->{num_faces} = $numfaces;
965 $self->{face_prefetch} = [1 .. $numfaces];
966 $self->face_prefetch;
967}
968
969sub face_prefetch {
970 my ($self) = @_;
971
972 return unless $::CFG->{face_prefetch};
973
974 if ($self->{num_faces}) {
975 return if @{ $self->{send_queue} || [] };
976 my $todo = @{ $self->{face_prefetch} }
977 or return;
978
979 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981 $self->send ("requestinfo image_sums $face $face");
982
983 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985 } elsif (!exists $self->{num_faces}) {
986 $self->send ("requestinfo image_info");
987
988 $self->{num_faces} = 0;
989
990 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992 }
993}
994
995sub update_floorbox { 1197sub update_floorbox {
996 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1198 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997 return unless $::CONN; 1199 return unless $::CONN;
998 1200
999 $::FLOORBOX->clear; 1201 $::FLOORBOX->clear;
1000 1202
1001 my @add; 1203 my @add;
1002 1204
1003 my $row; 1205 my $row;
1004 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1206 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1207 next if $_->{tag} & 0x80000000;
1005 if ($row < 6) { 1208 if ($row < 6) {
1006 local $_->{face_widget}; # hack to force recreation of widget 1209 local $_->{face_widget}; # hack to force recreation of widget
1007 local $_->{desc_widget}; # hack to force recreation of widget 1210 local $_->{desc_widget}; # hack to force recreation of widget
1008 CFPlus::Item::update_widgets $_; 1211 DC::Item::update_widgets $_;
1009 1212
1010 push @add, 1213 push @add,
1011 0, $row, $_->{face_widget}, 1214 0, $row, $_->{face_widget},
1012 1, $row, $_->{desc_widget}; 1215 1, $row, $_->{desc_widget};
1013 1216
1014 $row++; 1217 $row++;
1015 } else { 1218 } else {
1016 push @add, 1, $row, new CFPlus::UI::Button 1219 push @add, 1, $row, new DC::UI::Button
1017 text => "More...", 1220 text => "More...",
1018 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1221 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
1019 ; 1222 ;
1020 last; 1223 last;
1021 } 1224 }
1022 } 1225 }
1023 if ($::CONN->{open_container}) { 1226 if ($::CONN->{open_container}) {
1024 push @add, 1, $row++, new CFPlus::UI::Button 1227 push @add, 1, $row++, new DC::UI::Button
1025 text => "Close container", 1228 text => "Close container",
1026 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1229 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
1027 ; 1230 ;
1028 } 1231 }
1029 1232
1030 $::FLOORBOX->add_at (@add); 1233 $::FLOORBOX->add_at (@add);
1031 }); 1234 });
1032 1235
1033 $::WANT_REFRESH++; 1236 $::WANT_REFRESH = 1;
1034} 1237}
1035 1238
1036sub set_opencont { 1239sub set_opencont {
1037 my ($conn, $tag, $name) = @_; 1240 my ($conn, $tag, $name) = @_;
1038 $conn->{open_container} = $tag; 1241 $conn->{open_container} = $tag;
1039 update_floorbox; 1242 update_floorbox;
1040 1243
1041 $::INV_RIGHT_HB->clear (); 1244 $::INVR_HB->clear;
1042 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1245 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1043 1246
1044 if ($tag != 0) { # Floor isn't closable, is it? 1247 if ($tag != 0) { # Floor isn't closable, is it?
1045 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1248 $::INVR_HB->add (new DC::UI::Button
1046 text => "Close container", 1249 text => "Close container",
1047 tooltip => "Close the currently open container (if one is open)", 1250 tooltip => "Close the currently open container (if one is open)",
1048 on_activate => sub { 1251 on_activate => sub {
1049 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1252 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050 if $tag != 0; 1253 if $tag != 0;
1051 #if $CONN->{open_container} != 0;
1052 0 1254 0
1053 }, 1255 },
1054 ); 1256 );
1055 } 1257 }
1056 1258
… …
1058} 1260}
1059 1261
1060sub update_containers { 1262sub update_containers {
1061 my ($self) = @_; 1263 my ($self) = @_;
1062 1264
1063 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1265 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1064 my $todo = delete $self->{update_container} 1266 my $todo = delete $self->{update_container}
1065 or return; 1267 or return;
1066 1268
1067 for my $tag (keys %$todo) { 1269 for my $tag (keys %$todo) {
1068 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1270 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1103} 1305}
1104 1306
1105sub item_update { 1307sub item_update {
1106 my ($self, $item) = @_; 1308 my ($self, $item) = @_;
1107 1309
1108 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1310 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1109 1311
1110 CFPlus::Item::update_widgets $item; 1312 DC::Item::update_widgets $item;
1111 1313
1112 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1314 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1113 set_opencont ($::CONN, 0, "Floor"); 1315 set_opencont ($::CONN, 0, "Floor");
1114 1316
1115 } elsif ($item->{flags} & F_OPEN) { 1317 } elsif ($item->{flags} & F_OPEN) {
1116 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1318 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1117 1319
1118 } else { 1320 } else {
1119 $self->{update_container}{$item->{container}}++; 1321 $self->{update_container}{$item->{container}}++;
1120 $self->update_containers; 1322 $self->update_containers;
1121 } 1323 }
… …
1132 1334
1133 my $weight = .001 * $self->{player}{weight}; 1335 my $weight = .001 * $self->{player}{weight};
1134 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1336 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1135 1337
1136 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1338 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1137 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1339 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1138 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1340 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1139} 1341}
1140 1342
1141sub update_server_info { 1343sub update_server_info {
1142 my ($self) = @_; 1344 my ($self) = @_;
1143 1345
1144 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1346 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1145 1347
1348 my $version = JSON::XS->new->encode ($self->{s_version});
1349
1146 $::SERVER_INFO->set_markup ( 1350 $::SERVER_INFO->set_markup (
1147 "server <tt>$self->{host}:$self->{port}</tt>\n" 1351 "server <tt>$self->{host}:$self->{port}</tt>\n"
1148 . "protocol version <tt>$self->{version}</tt>\n" 1352 . "protocol version <tt>$version</tt>\n"
1149 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1353 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1150 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1354 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1151 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1355 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1152 . "editing support $yesno[!!$self->{editor_support}]\n" 1356 . "editing support $yesno[!!$self->{editor_support}]\n"
1153 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1357 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1154 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1358 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1155 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1359 . "client support $yesno[$self->{cfplus_ext} > 0]"
1156 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1360 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157 . "map size $self->{mapw}×$self->{maph}\n" 1361 . "map size $self->{mapw}×$self->{maph}\n"
1158 ); 1362 );
1159 1363
1160 ::setup_build_button ($self->{editor_support}->{builder_ui});
1161} 1364}
1162 1365
1163sub logged_in { 1366sub logged_in {
1164 my ($self) = @_; 1367 my ($self) = @_;
1165 1368
1166 $self->send_ext_req (cfplus_support => version => 1, sub { 1369 $self->send_ext_req (cfplus_support => version => 2, sub {
1370 my (%msg) = @_;
1371
1167 $self->{cfplus_ext} = $_[0]{version}; 1372 $self->{cfplus_ext} = $msg{version};
1168 $self->update_server_info; 1373 $self->update_server_info;
1169 1374
1170 if ($self->{cfplus_ext} >= 2) { 1375 if ($self->{cfplus_ext} >= 2) {
1171 $self->send_ext_req ("editor_support", sub { 1376 $self->send_ext_req ("editor_support", sub {
1172 $self->{editor_support} = $_[0]; 1377 $self->{editor_support} = { @_ };
1173 $self->update_server_info; 1378 $self->update_server_info;
1174 1379
1175 0 1380 0
1176 }); 1381 });
1177 } 1382 }
… …
1179 0 1384 0
1180 }); 1385 });
1181 1386
1182 $self->update_server_info; 1387 $self->update_server_info;
1183 1388
1184 $self->send_command ("output-sync $::CFG->{output_sync}");
1185 $self->send_command ("output-count $::CFG->{output_count}");
1186 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1389 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1187 $self->send_command ("pickup $::CFG->{pickup}"); 1390 $self->send_pickup ($::CFG->{pickup});
1188}
1189
1190sub buildat {
1191 my ($self, $builditem, $x, $y) = @_;
1192
1193 if ($self->{cfplus_ext}) {
1194 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1195 }
1196} 1391}
1197 1392
1198sub lookat { 1393sub lookat {
1199 my ($self, $x, $y) = @_; 1394 my ($self, $x, $y) = @_;
1200 1395
1201 if ($self->{cfplus_ext}) { 1396 if ($self->{cfplus_ext}) {
1202 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1397 $self->send_ext_req (lookat => $x, $y, sub {
1203 my ($msg) = @_; 1398 my (%msg) = @_;
1204 1399
1205 if (exists $msg->{npc_dialog}) { 1400 if (exists $msg{npc_dialog}) {
1206 # start npc chat dialog 1401 # start npc chat dialog
1207 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1402 $self->{w}{npc_dialog} = new DC::NPCDialog::
1208 dx => $x, 1403 token => $msg{npc_dialog},
1209 dy => $y,
1210 title => "$msg->{npc_dialog} (NPC)", 1404 title => "$msg{npc_dialog}[0] (NPC)",
1211 conn => $self, 1405 conn => $self,
1212 ; 1406 ;
1213 } 1407 }
1214 }); 1408 });
1215 } 1409 }
… …
1218} 1412}
1219 1413
1220sub destroy { 1414sub destroy {
1221 my ($self) = @_; 1415 my ($self) = @_;
1222 1416
1223 (delete $self->{npc_dialog})->destroy 1417 $_->destroy
1224 if $self->{npc_dialog}; 1418 for values %{ $self->{w} };
1225 1419
1226 $self->SUPER::destroy; 1420 $self->SUPER::destroy;
1227 1421
1228 %$self = (); 1422 %$self = ();
1229} 1423}
1230 1424
1231package CFPlus::NPCDialog; 1425package DC::NPCDialog;
1232 1426
1233our @ISA = 'CFPlus::UI::Toplevel'; 1427our @ISA = 'DC::UI::Toplevel';
1234 1428
1235sub new { 1429sub new {
1236 my $class = shift; 1430 my $class = shift;
1237 1431
1238 my $self = $class->SUPER::new ( 1432 my $self = $class->SUPER::new (
… …
1245 kw => { hi => 0, yes => 0, no => 0 }, 1439 kw => { hi => 0, yes => 0, no => 0 },
1246 has_close_button => 1, 1440 has_close_button => 1,
1247 @_, 1441 @_,
1248 ); 1442 );
1249 1443
1250 CFPlus::weaken (my $this = $self); 1444 DC::weaken (my $this = $self);
1251 1445
1252 $self->connect (delete => sub { $this->destroy; 1 }); 1446 $self->connect (delete => sub { $this->destroy; 1 });
1253 1447
1254 # better use a pane... 1448 # better use a pane...
1255 $self->add (my $hbox = new CFPlus::UI::HBox); 1449 $self->add (my $hbox = new DC::UI::HBox);
1256 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1450 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1257 1451
1258 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1452 $hbox->add (my $vbox = new DC::UI::VBox);
1259 1453
1260 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1454 $vbox->add (new DC::UI::Label text => "Message Entry:");
1261 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1455 $vbox->add ($self->{entry} = new DC::UI::Entry
1262 tooltip => "#npc_message_entry", 1456 tooltip => "#npc_message_entry",
1263 on_activate => sub { 1457 on_activate => sub {
1264 my ($entry, $text) = @_; 1458 my ($entry, $text) = @_;
1265 1459
1266 return unless $text =~ /\S/; 1460 return unless $text =~ /\S/;
… …
1270 1464
1271 0 1465 0
1272 }, 1466 },
1273 ); 1467 );
1274 1468
1275 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1469 $vbox->add ($self->{options} = new DC::UI::VBox);
1276 1470
1277 $self->{bye_button} = new CFPlus::UI::Button 1471 $self->{bye_button} = new DC::UI::Button
1278 text => "Bye (close)", 1472 text => "Bye (close)",
1279 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1473 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1280 on_activate => sub { $this->destroy; 1 }, 1474 on_activate => sub { $this->destroy; 1 },
1281 ; 1475 ;
1282 1476
1283 $self->update_options; 1477 $self->update_options;
1284 1478
1285 $self->{id} = $self->{conn}->send_ext_req ( 1479 $self->{id} = "npc-channel-" . $self->{conn}->token;
1286 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1480 $self->{conn}->connect_ext ($self->{id} => sub {
1287 sub { $this && $this->feed (@_) } 1481 $this->feed (@_) if $this;
1288 ); 1482 });
1483
1484 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1289 1485
1290 $self->{entry}->grab_focus; 1486 $self->{entry}->grab_focus;
1291 1487
1292 $self->{textview}->add_paragraph ({ 1488 $self->{textview}->add_paragraph ({
1293 fg => [1, 1, 0, 1], 1489 fg => [1, 1, 0, 1],
… …
1299}; 1495};
1300 1496
1301sub update_options { 1497sub update_options {
1302 my ($self) = @_; 1498 my ($self) = @_;
1303 1499
1304 CFPlus::weaken $self; 1500 DC::weaken $self;
1305 1501
1306 $self->{options}->clear; 1502 $self->{options}->clear;
1307 $self->{options}->add ($self->{bye_button}); 1503 $self->{options}->add ($self->{bye_button});
1308 1504
1309 for my $kw (sort keys %{ $self->{kw} }) { 1505 for my $kw (sort keys %{ $self->{kw} }) {
1310 $self->{options}->add (new CFPlus::UI::Button 1506 $self->{options}->add (new DC::UI::Button
1311 text => $kw, 1507 text => $kw,
1312 on_activate => sub { 1508 on_activate => sub {
1313 $self->send ($kw); 1509 $self->send ($kw);
1314 0 1510 0
1315 }, 1511 },
1316 ); 1512 );
1317 } 1513 }
1318} 1514}
1319 1515
1320sub feed { 1516sub feed {
1321 my ($self, $msg) = @_; 1517 my ($self, $type, @arg) = @_;
1322 1518
1323 CFPlus::weaken $self; 1519 DC::weaken $self;
1324 1520
1325 if ($msg->{msgtype} eq "reply") { 1521 if ($type eq "update") {
1522 my (%info) = @arg;
1523
1326 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1524 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1327 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1525 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1328
1329 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1330 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1331 my @link;
1332 $text =~ s{
1333 ($match)
1334 }{
1335 my $kw = $1;
1336
1337 push @link, new CFPlus::UI::Label
1338 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1339 can_hover => 1,
1340 can_events => 1,
1341 padding_x => 0,
1342 padding_y => 0,
1343 on_button_up => sub {
1344 $self->send ($kw);
1345 };
1346
1347 "\x{fffc}"
1348 }giex;
1349 1526
1527 if (exists $info{msg}) {
1528 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1529 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1530 my @link;
1531 $text =~ s{
1532 ($match)
1533 }{
1534 my $kw = $1;
1535
1536 push @link, new DC::UI::Label
1537 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1538 can_hover => 1,
1539 can_events => 1,
1540 padding_x => 0,
1541 padding_y => 0,
1542 on_button_up => sub {
1543 $self->send ($kw);
1544 };
1545
1546 "\x{fffc}"
1547 }giex;
1548
1350 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1549 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1351 $self->{textview}->scroll_to_bottom; 1550 $self->{textview}->scroll_to_bottom;
1551 }
1552
1352 $self->update_options; 1553 $self->update_options;
1353 } else { 1554 } else {
1354 $self->destroy; 1555 $self->destroy;
1355 } 1556 }
1356 1557
… …
1358} 1559}
1359 1560
1360sub send { 1561sub send {
1361 my ($self, $msg) = @_; 1562 my ($self, $msg) = @_;
1362 1563
1363 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1564 $self->{textview}->add_paragraph ({
1565 markup =>
1566 "\n<span foreground='#ffff00'><b>"
1567 . (DC::asxml $msg)
1568 . "</b></span>"
1569 });
1364 $self->{textview}->scroll_to_bottom; 1570 $self->{textview}->scroll_to_bottom;
1365 1571
1366 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1572 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1367} 1573}
1368 1574
1369sub destroy { 1575sub destroy {
1370 my ($self) = @_; 1576 my ($self) = @_;
1371 1577
1372 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1578 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1373 1579
1374 if ($self->{conn}) { 1580 if ($self->{conn}) {
1375 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1581 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1376 delete $self->{conn}{npc_dialog}; 1582 delete $self->{conn}{w}{npc_dialog};
1377 $self->{conn}->disconnect_ext ($self->{id}); 1583 $self->{conn}->disconnect_ext ($self->{id});
1378 } 1584 }
1379 1585
1380 $self->SUPER::destroy; 1586 $self->SUPER::destroy;
1381} 1587}

Diff Legend

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