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

Diff Legend

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