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.115 by root, Thu Jul 12 19:10:52 2007 UTC vs.
Revision 1.219 by root, Sat Aug 13 23:18:19 2011 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 resmap => $chksum, sub {
72 my ($meta) = @_;
73
74 if (defined $meta) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put resmap => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
86 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs});
89 });
90 }
91 }
92 }
93 }
94
95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 use Data::Dumper;
98 warn Dumper $self->{songs};#d#
99 }
100 });
101
102 $self->connect_ext (event_capabilities => sub {
103 my ($cap) = @_;
104
105 if (my $ts = $cap->{tileset}) {
106 if (my ($default) = grep $_->[2] & 1, @$ts) {
107 $self->{tileset} = $default;
108 $self->{tilesize} = $default->[3];
109 $self->setup_req (tileset => $default->[0]);
110
111 my $w = int $self->{mapw} * 32 / $self->{tilesize};
112 my $h = int $self->{maph} * 32 / $self->{tilesize};
113
114 $self->setup_req (mapsize => "${w}x${h}");
115 }
116 }
117 });
118 59
119 $self->{json_coder} 60 $self->{json_coder}
120 ->convert_blessed 61 ->convert_blessed
121 ->filter_json_single_key_object (__widget_ref__ => sub { 62 ->filter_json_single_key_object ("\fw" => sub {
122 $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 }
123 }); 70 });
124 71
125 $self->connect_ext (ws_n => sub { 72 # destroy widgets on logout
126 my ($arg) = @_;
127
128 $self->{widgetset}{$arg{id}} = {
129 w => {},
130 };
131 });
132
133 $self->connect_ext (ws_d => sub {
134 my ($arg) = @_;
135
136 my $ws = delete $self->{widgetset}{$arg{id}}
137 or return;
138
139 $_->destroy
140 for values %{$ws->{w}};
141 });
142
143 $self->connect_ext (ws_c => sub {
144 my ($arg) = @_;
145
146 my $args = $arg->{args} || {};
147
148 for my $ev (grep /^on_/, keys %$args) {
149 $args->{$ev} = sub {
150 my $id = shift->{s_id};
151 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
152
153 1
154 };
155 }
156
157 if (my $widget = eval {
158 local $SIG{__DIE__};
159 "CFPlus::UI::$arg->{class}"->new (
160 %$args,
161 s_ws => $arg->{ws},
162 s_id => $arg->{id},
163 )
164 }
165 ) {
166 $self->{widget}{$arg->{id}}
167 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
168 = $widget;
169
170 $widget->connect (on_destroy => sub {
171 my ($widget) = @_;
172
173 delete $self->{widget}{$widget->{s_id}};
174 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
175 });
176 } else {
177 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
178 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
179 }
180 });
181
182 $self->connect_ext (w_c => sub {
183 my ($arg) = @_;
184
185 my $w = $self->{widget}{$arg->{id}}
186 or return;
187 my $m = $arg->{name};
188
189 my $a = $arg->{args} || [];
190
191 if (exists $arg->{rid}) {
192 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
193 } else {
194 $w->$m (@$a);
195 }
196 });
197
198 $self->connect_ext (w_s => sub {
199 my ($arg) = @_;
200
201 my $w = $self->{widget}{$arg->{id}}
202 or return;
203
204 $w->{$arg->{name}} = $arg->{value};
205 });
206
207 $self->connect_ext (w_g => sub {
208 my ($arg) = @_;
209
210 my $w = $self->{widget}{$arg->{id}}
211 or return;
212
213 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
214 });
215
216 $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 {
217 for my $ws (values %{delete $self->{widgetset} || {}}) { 74 for my $ws (values %{delete $self->{widgetset} || {}}) {
218 $_->destroy 75 $_->destroy
219 for values %{delete $ws->{w} || {}}; 76 for values %{delete $ws->{w} || {}};
220 } 77 }
78
79 delete $self->{items};
80 $::INV->clear;
81 $::INVR->clear;
82 $::INVR_HB->clear;
83 $::FLOORBOX->clear;
221 }); 84 });
222 85
223 $self->{map_widget}->add_command (@$_) 86 $self->{map_widget}->add_command (@$_)
224 for @cmd_help; 87 for @cmd_help;
225 88
226 { 89 {
227 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 90 $self->{dialogue} = my $tex = $TEX_DIALOGUE;
228 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
229 $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}});
230 } 92 }
231 93
232 { 94 {
233 $self->{noface} = my $tex = new_from_file CFPlus::Texture 95 $self->{noface} = my $tex = $TEX_NOFACE;
234 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
235 $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}});
236 } 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# };
237 113
238 $self->{open_container} = 0; 114 $self->{open_container} = 0;
239 115
240 # per server 116 # per server
241 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 117 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
242 118
243 $self 119 $self
244} 120}
245 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
246sub logprint { 375sub logprint {
247 my ($self, @a) = @_; 376 my ($self, @a) = @_;
248 377
249 $self->{log_fh} ||= do { 378 DC::DB::logprint "$Deliantra::VARDIR/log.$self->{host}" => (join "", @a), sub { };
250 my $path = "$Crossfire::VARDIR/log.$self->{host}";
251
252 open my $fh, ">>:utf8", $path
253 or die "Couldn't open logfile $path: $!";
254
255 $fh->autoflush (1);
256
257 $fh;
258 };
259
260 my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
261
262 my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
263 $year + 1900, $mon + 1, $mday, $hour, $min, $sec;
264
265 print {$self->{log_fh}} "$ts ", @a, "\n";
266} 379}
267 380
268sub _stat_numdiff { 381sub _stat_numdiff {
269 my ($self, $name, $old, $new) = @_; 382 my ($self, $name, $old, $new) = @_;
270 383
… …
288 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_}) 401 ? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
289 : () 402 : ()
290 } 403 }
291 sort { $a <=> $b } keys %{$self->{spell_paths}}; 404 sort { $a <=> $b } keys %{$self->{spell_paths}};
292 405
293 join "", @diff 406 "\u$name: " . (join ", ", @diff)
294} 407}
295 408
296# all stats that are chacked against changes 409# all stats that are chacked against changes
297my @statchange = ( 410my @statchange = (
298 [&CS_STAT_STR => \&_stat_numdiff, "Str"], 411 [&CS_STAT_STR => \&_stat_numdiff, "Str"],
… …
353 } 466 }
354 467
355 if ( 468 if (
356 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange 469 my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
357 ) { 470 ) {
358 my $msg = "<b>stat change</b>: " . (join " ", @diffs); 471 my $msg = "<b>stat change</b>: " . (join " ", map "($_)", @diffs);
359 $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);
360 } 473 }
361 474
362 $self->update_stats_window ($stats, $prev); 475 $self->update_stats_window ($stats, $prev);
363 476
364 $self->{prev_stats} = { %$stats }; 477 $self->{prev_stats} = { %$stats };
… …
401 514
402 $::GAUGES->{hp} ->set_value ($hp, $hp_m); 515 $::GAUGES->{hp} ->set_value ($hp, $hp_m);
403 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 516 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
404 $::GAUGES->{food} ->set_value ($fo, $fo_m); 517 $::GAUGES->{food} ->set_value ($fo, $fo_m);
405 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 518 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
406 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 519 $::GAUGES->{exp} ->set_label ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))#d#
407 . " (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});
408 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 522 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
409 my $title = $stats->{+CS_STAT_TITLE}; 523 my $title = $stats->{+CS_STAT_TITLE};
410 $title =~ s/^Player: //; 524 $title =~ s/^Player: //;
411 $::STATWIDS->{title} ->set_text ("Title: " . $title); 525 $::STATWIDS->{title} ->set_text ("Title: " . $title);
412 526
… …
424 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 538 $::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
425 $::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});
426 540
427 $self->update_weight; 541 $self->update_weight;
428 542
429 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}}) 543 $::STATWIDS->{"res_$_"}->set_text (sprintf "%d%%", $stats->{$RES_TBL{$_}})
430 for keys %RES_TBL; 544 for keys %RES_TBL;
431 545
432 my $sktbl = $::STATWIDS->{skill_tbl}; 546 my $sktbl = $::STATWIDS->{skill_tbl};
433 my @skills = keys %{ $self->{skill_info} }; 547 my @skills = keys %{ $self->{skill_info} };
434 548
435 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
436 $sktbl->clear; 557 $sktbl->clear;
437 558
559 my $sw = $self->{skillwid}{""} ||= [
438 $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1); 560 0, 0, (new DC::UI::Label text => "Experience", align => 1),
439 $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 561 1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
440 $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 562 2, 0, (new DC::UI::Label text => "Progress"),
563 3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
441 $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1); 564 4, 0, (new DC::UI::Label text => "Experience", align => 1),
442 $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1); 565 5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
443 $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1); 566 6, 0, (new DC::UI::Label text => "Progress"),
567 7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
568 ];
444 569
570 my @add = @$sw;
571
445 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>";
446 573
447 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);
448 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);
449 576
450 my ($x, $y) = (0, 1); 577 my ($x, $y) = (0, 1);
451 for ( 578 for (@order) {
452 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
453 map [$_, $self->{skill_info}{$_}],
454 grep exists $stats->{$_},
455 @skills
456 ) {
457 my ($idx, $name) = @$_; 579 my ($idx, $name) = @$_;
458 580
459 my $spell_cb = sub { 581 my $spell_cb = sub {
460 my ($widget, $ev) = @_; 582 my ($widget, $ev) = @_;
461 583
462 if ($ev->{button} == 1) { 584 if ($ev->{button} == 1) {
463 $::CONN->user_send ("ready_skill $name"); 585 $::CONN->user_send ("ready_skill $name");
464 } elsif ($ev->{button} == 2) { 586 } elsif ($ev->{button} == 2) {
465 $::CONN->user_send ("use_skill $name"); 587 $::CONN->user_send ("use_skill $name");
466 } elsif ($ev->{button} == 3) { 588 } elsif ($ev->{button} == 3) {
467 my $shortname = CFPlus::shorten $name, 14; 589 my $shortname = DC::shorten $name, 14;
468 (new CFPlus::UI::Menu 590 (new DC::UI::Menu
469 items => [ 591 items => [
470 ["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"] }],
471 ["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"] }],
472 ], 594 ],
473 )->popup ($ev); 595 )->popup ($ev);
474 } else { 596 } else {
475 return 0; 597 return 0;
476 } 598 }
477 599
478 1 600 1
479 }; 601 };
480 602
481 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 603 my $sw = $self->{skillwid}{$idx} ||= [
604 # exp
605 (new DC::UI::Label
482 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 606 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
483 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 607
608 # level
609 (new DC::UI::Label
484 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 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
485 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 616 (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
486 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL); 617 can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
618 ];
619
620 push @add,
621 $x * 4 + 0, $y, $sw->[0],
622 $x * 4 + 1, $y, $sw->[1],
623 $x * 4 + 2, $y, $sw->[2],
624 $x * 4 + 3, $y, $sw->[3],
625 ;
487 626
488 $x++ and ($x, $y) = (0, $y + 1); 627 $x++ and ($x, $y) = (0, $y + 1);
489 } 628 }
490 }
491 629
492 for (grep exists $stats->{$_}, @skills) { 630 $sktbl->add_at (@add);
493 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
494 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
495 } 631 }
496}
497 632
498sub macro_send { 633 for (@order) {
499 my ($self, $macro) = @_; 634 my ($idx, $name) = @$_;
635 my $val = $stats->{$idx};
500 636
501 for my $cmd (@{ $macro->{action} }) { 637 next if $prev->{$idx}[1] eq $val->[1];
502 $self->send_command ($cmd); 638
639 my $sw = $self->{skillwid}{$idx};
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);
503 } 646 }
504} 647}
505 648
506sub user_send { 649sub user_send {
507 my ($self, $command) = @_; 650 my ($self, $command) = @_;
… …
509 $self->{record}->($command) 652 $self->{record}->($command)
510 if $self->{record}; 653 if $self->{record};
511 654
512 $self->logprint ("send: ", $command); 655 $self->logprint ("send: ", $command);
513 $self->send_command ($command); 656 $self->send_command ($command);
514 ::status ($command);
515} 657}
516 658
517sub record { 659sub record {
518 my ($self, $cb) = @_; 660 my ($self, $cb) = @_;
519 661
… …
521} 663}
522 664
523sub map_scroll { 665sub map_scroll {
524 my ($self, $dx, $dy) = @_; 666 my ($self, $dx, $dy) = @_;
525 667
526 $self->{map}->scroll ($dx, $dy); 668 $self->{map_widget}->scroll ($dx, $dy);
527} 669}
528 670
529sub feed_map1a { 671sub feed_map1a {
530 my ($self, $data) = @_; 672 my ($self, $data) = @_;
531 673
532 $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 {
533 $self->{map_widget}->update; 702 $self->{map_widget}->update;
703 }
534} 704}
535 705
536sub magicmap { 706sub magicmap {
537 my ($self, $w, $h, $x, $y, $data) = @_; 707 my ($self, $w, $h, $x, $y, $data) = @_;
538 708
… …
540} 710}
541 711
542sub flush_map { 712sub flush_map {
543 my ($self) = @_; 713 my ($self) = @_;
544 714
545 my $map_info = delete $self->{map_info} 715 return unless $self->{map_info};
546 or return;
547 716
717 for my $map_info (values %{ $self->{map_cache} || {} }) {
548 my ($hash, $x, $y, $w, $h) = @$map_info; 718 my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
549 719
550 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;
551 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { }; 725 DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
552 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 726 }
727 }
553} 728}
554 729
555sub map_clear { 730sub map_clear {
556 my ($self) = @_; 731 my ($self) = @_;
557 732
558 $self->flush_map; 733 $self->flush_map;
734 delete $self->{map_info};
559 delete $self->{neigh_map}; 735 delete $self->{neigh_map};
560 736
561 $self->{map}->clear; 737 $self->{map}->clear;
562 delete $self->{map_widget}{magicmap}; 738 delete $self->{map_widget}{magicmap};
563} 739}
564 740
565sub bg_fetch { 741sub bg_fetch {
566 my ($self) = @_; 742 my ($self) = @_;
567 743
568 my $id; 744 my $tile;
569 745
570 do { 746 do {
571 $id = pop @{$self->{bg_fetch}} 747 $tile = pop @{$self->{bg_fetch}}
572 or return; 748 or return;
573 } while $self->{texture}[$id]; 749 } while $self->{texture}[$tile];
574 750
575 CFPlus::DB::get tilecache => $id, sub { 751 DC::DB::get tilecache => $tile, sub {
576 my ($data) = @_; 752 my ($data) = @_;
577 753
578 return unless $self->{map}; # stop when destroyed 754 return unless $self->{map}; # stop when destroyed
579 755
580 $self->set_texture ($id => $data)
581 if defined $data; 756 if (defined $data) {
757 $self->have_tile ($tile, $data);
758 $self->{texture}[$tile]->upload;
759 }
582 760
583 $self->bg_fetch; 761 $self->bg_fetch;
584 }; 762 };
585} 763}
586 764
587sub load_map($$$) { 765sub load_map($$$$$$) {
588 my ($self, $hash, $x, $y) = @_; 766 my ($self, $hash, $x, $y, $w, $h) = @_;
589 767
590 my $gen = $self->{map_change_gen}; 768 my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
591 769
592 CFPlus::DB::get $self->{mapcache} => $hash, sub { 770 my $cb = sub {
593 return unless $gen == $self->{map_change_gen}; 771 $map_info->[1] = \$_[0];
594 772
595 my ($data) = @_;
596
597 if (defined $data) {
598 $data = Compress::LZF::decompress $data;
599 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
600
601 my $inprogress = @{ $self->{bg_fetch} || [] }; 773 my $inprogress = @{ $self->{bg_fetch} || [] };
602 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data); 774 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
603 $self->bg_fetch unless $inprogress; 775 $self->bg_fetch unless $inprogress;
604 }
605 }; 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 }
606} 789}
607 790
608# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 791# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
609# (server resource,s latency, bandwidth), so this hack is warranted. 792# (server resources, latency, bandwidth), so this hack is warranted.
610# 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
611sub send_mapinfo { 794sub send_mapinfo {
612 my ($self, $data, $cb) = @_; 795 my ($self, $data, $cb) = @_;
613 796
614 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)$%) {
… …
639} 822}
640 823
641# this method does a "flood fill" into every tile direction 824# this method does a "flood fill" into every tile direction
642# it assumes that tiles are arranged in a rectangular grid, 825# it assumes that tiles are arranged in a rectangular grid,
643# 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.
644# failure to comply are harmless and result in display errors 827# failure to comply is harmless and results in display errors
645# at worst. 828# at worst.
646sub flood_fill { 829sub flood_fill {
647 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_; 830 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
648 831
649 # the server does not allow map paths > 6 832 # the server does not allow map paths > 6
… …
685 return if $mode ne "spatial"; 868 return if $mode ne "spatial";
686 869
687 $x += $self->{map}->ox; 870 $x += $self->{map}->ox;
688 $y += $self->{map}->oy; 871 $y += $self->{map}->oy;
689 872
690 $self->load_map ($hash, $x, $y) 873 $self->load_map ($hash, $x, $y, $w, $h)
691 unless $self->{neigh_map}{$hash}[5]++;#d# 874 unless $self->{neigh_map}{$hash}[5]++;#d#
692 875
693 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 876 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
694 877
695 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 878 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
… …
703 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 886 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
704 887
705 $self->flush_map; 888 $self->flush_map;
706 889
707 ++$self->{map_change_gen}; 890 ++$self->{map_change_gen};
891 $self->{map_cache_old} = delete $self->{map_cache};
708 892
709 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 893 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
710 894
711 my $mapmapw = $self->{mapmap}->{w}; 895 my $mapmapw = $self->{mapmap}->{w};
712 my $mapmaph = $self->{mapmap}->{h}; 896 my $mapmaph = $self->{mapmap}->{h};
… …
724 $self->{map_info} = [$hash, $x, $y, $w, $h]; 908 $self->{map_info} = [$hash, $x, $y, $w, $h];
725 909
726 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/; 910 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
727 $::STATWIDS->{map}->set_text ("Map: " . $map); 911 $::STATWIDS->{map}->set_text ("Map: " . $map);
728 912
729 $self->load_map ($hash, $x, $y); 913 $self->load_map ($hash, $x, $y, $w, $h);
730 $self->flood_fill (0, 0, 0, "", $hash, $flags); 914 $self->flood_fill (0, 0, 0, "", $hash, $flags);
731} 915}
732 916
733sub face_find { 917sub face_find {
734 my ($self, $facenum, $face, $cb) = @_; 918 my ($self, $facenum, $face, $cb) = @_;
735 919
736 my $hash = "$face->{chksum},$face->{name}"; 920 if ($face->{type} == 0) { # FT_FACE
737
738 my $id = CFPlus::DB::get_tile_id_sync $hash; 921 my $id = DC::DB::get_tile_id_sync $face->{name};
739 922
740 $face->{id} = $id; 923 $face->{id} = $id;
741 $self->{faceid}[$facenum] = $id;
742
743 $self->{map}->set_tileid ($facenum => $id); 924 $self->{map}->set_tileid ($facenum => $id);
744 925
745 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 }
746} 934}
747 935
748sub face_update { 936sub face_update {
749 my ($self, $facenum, $face, $changed) = @_; 937 my ($self, $facenum, $face, $changed) = @_;
750 938
939 if ($face->{type} == 0) {
940 # image, FT_FACE
751 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { } 941 DC::DB::put tilecache => $face->{id} => $face->{data}, sub { }
752 if $changed; 942 if $changed;
753 943
754 $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 }
755} 977}
756 978
757sub smooth_update { 979sub smooth_update {
758 my ($self, $facenum, $face) = @_; 980 my ($self, $facenum, $face) = @_;
759 981
760 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 982 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
761} 983}
762 984
763sub set_texture { 985sub have_tile {
764 my ($self, $id, $data) = @_; 986 my ($self, $tile, $data) = @_;
765 987
766 $self->{texture}[$id] = my $tex = 988 return unless $self->{map};
767 new_from_image CFPlus::Texture
768 $data, minify => 1, mipmap => 1;
769 989
770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 990 my $tex = $self->{texture}[$tile] ||=
771 $self->{map_widget}->update; 991 new DC::Texture
992 tile => $tile,
993 image => $data, delete_image => 1,
994 minify => 1;
995
996 if (my $cbs = delete $self->{tile_cb}{$tile}) {
997 $_->($tex) for @$cbs;
998 }
999}
1000
1001# call in non-void context registers a temporary
1002# hook with handle, otherwise its permanent
1003sub on_face_change {
1004 my ($self, $num, $cb) = @_;
1005
1006 push @{$self->{face_cb}{$num}}, $cb;
1007
1008 defined wantarray
1009 ? Guard::guard {
1010 @{$self->{face_cb}{$num}}
1011 = grep $_ != $cb,
1012 @{$self->{face_cb}{$num}};
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)
772} 1030}
773 1031
774sub sound_play { 1032sub sound_play {
775 my ($self, $x, $y, $soundnum, $type) = @_; 1033 my ($self, $type, $face, $dx, $dy, $vol) = @_;
776 1034
777 $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
778} 1037}
779 1038
780my $LAST_QUERY; # server is stupid, stupid, stupid 1039my $LAST_QUERY; # server is stupid, stupid, stupid
781 1040
782sub query { 1041sub query {
… …
790 1049
791sub sanitise_xml($) { 1050sub sanitise_xml($) {
792 local $_ = shift; 1051 local $_ = shift;
793 1052
794 # we now weed out all tags we do not support 1053 # we now weed out all tags we do not support
795 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
796 # now all entities 1059 # now all entities
797 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;
798 1061
799 # handle some elements 1062 # handle some elements
800 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs; 1063 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
801 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+$//;
802 1067
803 $_ 1068 $_
804} 1069}
805 1070
806our %NAME_TO_COLOR = ( 1071our %NAME_TO_COLOR = (
… …
847 $self->{$type} = $text; 1112 $self->{$type} = $text;
848 } else { 1113 } else {
849 $self->logprint ("msg: ", $text); 1114 $self->logprint ("msg: ", $text);
850 return if $color < 0; # negative color == ignore if not understood 1115 return if $color < 0; # negative color == ignore if not understood
851 1116
852 my $fg = $CF_COLOR[$color % @CF_COLOR]; 1117 my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] || [1, 0, 0];
853 1118
854 ## try to create single paragraphs of multiple lines sent by the server 1119 ## try to create single paragraphs of multiple lines sent by the server
855 # no longer neecssary with TRT servers 1120 # no longer neecssary with TRT servers
856 #$text =~ s/(?<=\S)\n(?=\w)/ /g; 1121 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
857 1122
858 ::message ({ fg => $fg, markup => $_ }) 1123 ::message ({
859 for split /\n/, $text; 1124 fg => $fg,
1125 markup => $text,
1126 type => $type,
1127 extra => [@extra],
1128 color_flags => $color, #d# ugly, kill
1129 });
1130
1131# $color &= ~NDI_CLEAR; # only clear once for multiline messages
1132# # actually, this is an ugly design. _we_ should control the channels,
1133# # not some random other widget, as the channels are clearly protocol-specific.
1134# # then we could also react to flags such as CLEAR without resorting to
1135# # hacks such as color_flags, above.
860 1136
861 $self->{statusbox}->add ($text, 1137 $self->{statusbox}->add ($text,
862 group => $text, 1138 group => $text,
863 fg => $fg, 1139 fg => $fg,
864 timeout => $color >= 2 ? 180 : 10, 1140 timeout => $color >= 2 ? 180 : 10,
865 tooltip_font => $::FONT_FIXED, 1141 tooltip_font => $::FONT_FIXED,
866 ); 1142 ) if $type eq "info";
867 } 1143 }
868} 1144}
869 1145
870sub spell_add { 1146sub spell_add {
871 my ($self, $spell) = @_; 1147 my ($self, $spell) = @_;
… …
875 $spell->{message} =~ s/\n+$//; 1151 $spell->{message} =~ s/\n+$//;
876 $spell->{message} ||= "Server did not provide a description for this spell."; 1152 $spell->{message} ||= "Server did not provide a description for this spell.";
877 1153
878 $::SPELL_LIST->add_spell ($spell); 1154 $::SPELL_LIST->add_spell ($spell);
879 1155
880 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 1156 $self->{map_widget}->add_command ("invoke $spell->{name}", DC::asxml $spell->{message});
881 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 1157 $self->{map_widget}->add_command ("cast $spell->{name}", DC::asxml $spell->{message});
882} 1158}
883 1159
884sub spell_delete { 1160sub spell_delete {
885 my ($self, $spell) = @_; 1161 my ($self, $spell) = @_;
886 1162
… …
897sub addme_success { 1173sub addme_success {
898 my ($self) = @_; 1174 my ($self) = @_;
899 1175
900 my %skill_help; 1176 my %skill_help;
901 1177
902 for my $node (CFPlus::Pod::find skill_description => "*") { 1178 for my $node (DC::Pod::find skill_description => "*") {
903 my (undef, @par) = CFPlus::Pod::section_of $node; 1179 my (undef, @par) = DC::Pod::section_of $node;
904 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par; 1180 $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
905 }; 1181 };
906 1182
907 for my $skill (values %{$self->{skill_info}}) { 1183 for my $skill (values %{$self->{skill_info}}) {
908 $self->{map_widget}->add_command ("ready_skill $skill", 1184 $self->{map_widget}->add_command ("ready_skill $skill",
909 (CFPlus::asxml "Ready the skill '$skill'\n\n") 1185 (DC::asxml "Ready the skill '$skill'\n\n")
910 . $skill_help{$skill}); 1186 . $skill_help{$skill});
911 $self->{map_widget}->add_command ("use_skill $skill", 1187 $self->{map_widget}->add_command ("use_skill $skill",
912 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 1188 (DC::asxml "Immediately use the skill '$skill'\n\n")
913 . $skill_help{$skill}); 1189 . $skill_help{$skill});
914 } 1190 }
915} 1191}
916 1192
917sub eof { 1193sub eof {
… …
920 $self->{map_widget}->clr_commands; 1196 $self->{map_widget}->clr_commands;
921 1197
922 ::stop_game (); 1198 ::stop_game ();
923} 1199}
924 1200
925sub image_info {
926 my ($self, $numfaces) = @_;
927
928 $self->{num_faces} = $numfaces;
929 $self->{face_prefetch} = [1 .. $numfaces];
930 $self->face_prefetch;
931}
932
933sub face_prefetch {
934 my ($self) = @_;
935
936 return unless $::CFG->{face_prefetch};
937
938 if ($self->{num_faces}) {
939 return if @{ $self->{send_queue} || [] };
940 my $todo = @{ $self->{face_prefetch} }
941 or return;
942
943 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
944
945 $self->send ("requestinfo image_sums $face $face");
946
947 $self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
948 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
949 } elsif (!exists $self->{num_faces}) {
950 $self->send ("requestinfo image_info");
951
952 $self->{num_faces} = 0;
953
954 $self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
955 group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
956 }
957}
958
959sub update_floorbox { 1201sub update_floorbox {
960 $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub { 1202 $DC::UI::ROOT->on_refresh ($::FLOORBOX => sub {
961 return unless $::CONN; 1203 return unless $::CONN;
962 1204
963 $::FLOORBOX->clear; 1205 $::FLOORBOX->clear;
964 1206
1207 my @add;
1208
965 my $row; 1209 my $row;
966 for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) { 1210 for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
1211 next if $_->{tag} & 0x80000000;
967 if ($row < 6) { 1212 if ($row < 6) {
968 local $_->{face_widget}; # hack to force recreation of widget 1213 local $_->{face_widget}; # hack to force recreation of widget
969 local $_->{desc_widget}; # hack to force recreation of widget 1214 local $_->{desc_widget}; # hack to force recreation of widget
970 CFPlus::Item::update_widgets $_; 1215 DC::Item::update_widgets $_;
971 1216
1217 push @add,
972 $::FLOORBOX->add (0, $row, $_->{face_widget}); 1218 0, $row, $_->{face_widget},
973 $::FLOORBOX->add (1, $row, $_->{desc_widget}); 1219 1, $row, $_->{desc_widget};
974 1220
975 $row++; 1221 $row++;
976 } else { 1222 } else {
977 $::FLOORBOX->add (1, $row, new CFPlus::UI::Button 1223 push @add, 1, $row, new DC::UI::Button
978 text => "More...", 1224 text => "More...",
979 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 }, 1225 on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
980 ); 1226 ;
981 last; 1227 last;
982 } 1228 }
983 } 1229 }
984 if ($::CONN->{open_container}) { 1230 if ($::CONN->{open_container}) {
985 $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button 1231 push @add, 1, $row++, new DC::UI::Button
986 text => "Close container", 1232 text => "Close container",
987 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") } 1233 on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
988 ); 1234 ;
989 } 1235 }
1236
1237 $::FLOORBOX->add_at (@add);
990 }); 1238 });
991 1239
992 $::WANT_REFRESH++; 1240 $::WANT_REFRESH = 1;
993} 1241}
994 1242
995sub set_opencont { 1243sub set_opencont {
996 my ($conn, $tag, $name) = @_; 1244 my ($conn, $tag, $name) = @_;
997 $conn->{open_container} = $tag; 1245 $conn->{open_container} = $tag;
998 update_floorbox; 1246 update_floorbox;
999 1247
1000 $::INV_RIGHT_HB->clear (); 1248 $::INVR_HB->clear;
1001 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1249 $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
1002 1250
1003 if ($tag != 0) { # Floor isn't closable, is it? 1251 if ($tag != 0) { # Floor isn't closable, is it?
1004 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1252 $::INVR_HB->add (new DC::UI::Button
1005 text => "Close container", 1253 text => "Close container",
1006 tooltip => "Close the currently open container (if one is open)", 1254 tooltip => "Close the currently open container (if one is open)",
1007 on_activate => sub { 1255 on_activate => sub {
1008 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1256 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1009 if $tag != 0; 1257 if $tag != 0;
1010 #if $CONN->{open_container} != 0;
1011 0 1258 0
1012 }, 1259 },
1013 ); 1260 );
1014 } 1261 }
1015 1262
… …
1017} 1264}
1018 1265
1019sub update_containers { 1266sub update_containers {
1020 my ($self) = @_; 1267 my ($self) = @_;
1021 1268
1022 $CFPlus::UI::ROOT->on_refresh ("update_containers_$self" => sub { 1269 $DC::UI::ROOT->on_refresh ("update_containers_$self" => sub {
1023 my $todo = delete $self->{update_container} 1270 my $todo = delete $self->{update_container}
1024 or return; 1271 or return;
1025 1272
1026 for my $tag (keys %$todo) { 1273 for my $tag (keys %$todo) {
1027 update_floorbox if $tag == 0 or $tag == $self->{open_container}; 1274 update_floorbox if $tag == 0 or $tag == $self->{open_container};
… …
1062} 1309}
1063 1310
1064sub item_update { 1311sub item_update {
1065 my ($self, $item) = @_; 1312 my ($self, $item) = @_;
1066 1313
1067 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n"; 1314 #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
1068 1315
1069 CFPlus::Item::update_widgets $item; 1316 DC::Item::update_widgets $item;
1070 1317
1071 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) { 1318 if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
1072 set_opencont ($::CONN, 0, "Floor"); 1319 set_opencont ($::CONN, 0, "Floor");
1073 1320
1074 } elsif ($item->{flags} & F_OPEN) { 1321 } elsif ($item->{flags} & F_OPEN) {
1075 set_opencont ($::CONN, $item->{tag}, CFPlus::Item::desc_string $item); 1322 set_opencont ($::CONN, $item->{tag}, DC::Item::desc_string $item);
1076 1323
1077 } else { 1324 } else {
1078 $self->{update_container}{$item->{container}}++; 1325 $self->{update_container}{$item->{container}}++;
1079 $self->update_containers; 1326 $self->update_containers;
1080 } 1327 }
… …
1091 1338
1092 my $weight = .001 * $self->{player}{weight}; 1339 my $weight = .001 * $self->{player}{weight};
1093 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM}; 1340 my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
1094 1341
1095 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight); 1342 $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
1096 $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit); 1343 $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
1097 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit); 1344 $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
1098} 1345}
1099 1346
1100sub update_server_info { 1347sub update_server_info {
1101 my ($self) = @_; 1348 my ($self) = @_;
1102 1349
1103 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>"); 1350 my @yesno = ("<span foreground='red'>no</span>", "<span foreground='green'>yes</span>");
1104 1351
1352 my $version = JSON::XS->new->encode ($self->{s_version});
1353
1105 $::SERVER_INFO->set_markup ( 1354 $::SERVER_INFO->set_markup (
1106 "server <tt>$self->{host}:$self->{port}</tt>\n" 1355 "server <tt>$self->{host}:$self->{port}</tt>\n"
1107 . "protocol version <tt>$self->{version}</tt>\n" 1356 . "protocol version <tt>$version</tt>\n"
1108 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1357 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
1109 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1358 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1110 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n" 1359 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1111 . "editing support $yesno[!!$self->{editor_support}]\n" 1360 . "editing support $yesno[!!$self->{editor_support}]\n"
1112 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n" 1361 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1113 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n" 1362 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
1114 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1363 . "client support $yesno[$self->{cfplus_ext} > 0]"
1115 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1364 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1116 . "map size $self->{mapw}×$self->{maph}\n" 1365 . "map size $self->{mapw}×$self->{maph}\n"
1117 ); 1366 );
1118 1367
1119 ::setup_build_button ($self->{editor_support}->{builder_ui});
1120} 1368}
1121 1369
1122sub logged_in { 1370sub logged_in {
1123 my ($self) = @_; 1371 my ($self) = @_;
1124 1372
1125 $self->send_ext_req (cfplus_support => version => 1, sub { 1373 $self->send_ext_req (cfplus_support => version => 2, sub {
1374 my (%msg) = @_;
1375
1126 $self->{cfplus_ext} = $_[0]{version}; 1376 $self->{cfplus_ext} = $msg{version};
1127 $self->update_server_info; 1377 $self->update_server_info;
1128 1378
1129 if ($self->{cfplus_ext} >= 2) { 1379 if ($self->{cfplus_ext} >= 2) {
1130 $self->send_ext_req ("editor_support", sub { 1380 $self->send_ext_req ("editor_support", sub {
1131 $self->{editor_support} = $_[0]; 1381 $self->{editor_support} = { @_ };
1132 $self->update_server_info; 1382 $self->update_server_info;
1133 1383
1134 0 1384 0
1135 }); 1385 });
1136 } 1386 }
… …
1138 0 1388 0
1139 }); 1389 });
1140 1390
1141 $self->update_server_info; 1391 $self->update_server_info;
1142 1392
1143 $self->send_command ("output-sync $::CFG->{output_sync}");
1144 $self->send_command ("output-count $::CFG->{output_count}");
1145 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0; 1393 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1146 $self->send_command ("pickup $::CFG->{pickup}"); 1394 $self->send_pickup ($::CFG->{pickup});
1147}
1148
1149sub buildat {
1150 my ($self, $builditem, $x, $y) = @_;
1151
1152 if ($self->{cfplus_ext}) {
1153 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1154 }
1155} 1395}
1156 1396
1157sub lookat { 1397sub lookat {
1158 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1159 1399
1160 if ($self->{cfplus_ext}) { 1400 if ($self->{cfplus_ext}) {
1161 $self->send_ext_req (lookat => dx => $x, dy => $y, sub { 1401 $self->send_ext_req (lookat => $x, $y, sub {
1162 my ($msg) = @_; 1402 my (%msg) = @_;
1163 1403
1164 if (exists $msg->{npc_dialog}) { 1404 if (exists $msg{npc_dialog}) {
1165 # start npc chat dialog 1405 # start npc chat dialog
1166 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1406 $self->{npc_dialog} = new DC::NPCDialog::
1167 dx => $x, 1407 token => $msg{npc_dialog},
1168 dy => $y,
1169 title => "$msg->{npc_dialog} (NPC)", 1408 title => "$msg{npc_dialog}[0] (NPC)",
1170 conn => $self, 1409 conn => $self,
1171 ; 1410 ;
1172 } 1411 }
1173 }); 1412 });
1174 } 1413 }
… …
1185 $self->SUPER::destroy; 1424 $self->SUPER::destroy;
1186 1425
1187 %$self = (); 1426 %$self = ();
1188} 1427}
1189 1428
1190package CFPlus::NPCDialog; 1429package DC::NPCDialog;
1191 1430
1192our @ISA = 'CFPlus::UI::Toplevel'; 1431our @ISA = 'DC::UI::Toplevel';
1193 1432
1194sub new { 1433sub new {
1195 my $class = shift; 1434 my $class = shift;
1196 1435
1197 my $self = $class->SUPER::new ( 1436 my $self = $class->SUPER::new (
… …
1204 kw => { hi => 0, yes => 0, no => 0 }, 1443 kw => { hi => 0, yes => 0, no => 0 },
1205 has_close_button => 1, 1444 has_close_button => 1,
1206 @_, 1445 @_,
1207 ); 1446 );
1208 1447
1209 CFPlus::weaken (my $this = $self); 1448 DC::weaken (my $this = $self);
1210 1449
1211 $self->connect (delete => sub { $this->destroy; 1 }); 1450 $self->connect (delete => sub { $this->destroy; 1 });
1212 1451
1213 # better use a pane... 1452 # better use a pane...
1214 $self->add (my $hbox = new CFPlus::UI::HBox); 1453 $self->add (my $hbox = new DC::UI::HBox);
1215 $hbox->add ($self->{textview} = new CFPlus::UI::TextScroller expand => 1); 1454 $hbox->add ($self->{textview} = new DC::UI::TextScroller expand => 1);
1216 1455
1217 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1456 $hbox->add (my $vbox = new DC::UI::VBox);
1218 1457
1219 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1458 $vbox->add (new DC::UI::Label text => "Message Entry:");
1220 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1459 $vbox->add ($self->{entry} = new DC::UI::Entry
1221 tooltip => "#npc_message_entry", 1460 tooltip => "#npc_message_entry",
1222 on_activate => sub { 1461 on_activate => sub {
1223 my ($entry, $text) = @_; 1462 my ($entry, $text) = @_;
1224 1463
1225 return unless $text =~ /\S/; 1464 return unless $text =~ /\S/;
… …
1229 1468
1230 0 1469 0
1231 }, 1470 },
1232 ); 1471 );
1233 1472
1234 $vbox->add ($self->{options} = new CFPlus::UI::VBox); 1473 $vbox->add ($self->{options} = new DC::UI::VBox);
1235 1474
1236 $self->{bye_button} = new CFPlus::UI::Button 1475 $self->{bye_button} = new DC::UI::Button
1237 text => "Bye (close)", 1476 text => "Bye (close)",
1238 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.", 1477 tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
1239 on_activate => sub { $this->destroy; 1 }, 1478 on_activate => sub { $this->destroy; 1 },
1240 ; 1479 ;
1241 1480
1242 $self->update_options; 1481 $self->update_options;
1243 1482
1244 $self->{id} = $self->{conn}->send_ext_req ( 1483 $self->{id} = "npc-channel-" . $self->{conn}->token;
1245 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy}, 1484 $self->{conn}->connect_ext ($self->{id} => sub {
1246 sub { $this && $this->feed (@_) } 1485 $this->feed (@_) if $this;
1247 ); 1486 });
1487
1488 $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1248 1489
1249 $self->{entry}->grab_focus; 1490 $self->{entry}->grab_focus;
1250 1491
1251 $self->{textview}->add_paragraph ({ 1492 $self->{textview}->add_paragraph ({
1252 fg => [1, 1, 0, 1], 1493 fg => [1, 1, 0, 1],
… …
1258}; 1499};
1259 1500
1260sub update_options { 1501sub update_options {
1261 my ($self) = @_; 1502 my ($self) = @_;
1262 1503
1263 CFPlus::weaken $self; 1504 DC::weaken $self;
1264 1505
1265 $self->{options}->clear; 1506 $self->{options}->clear;
1266 $self->{options}->add ($self->{bye_button}); 1507 $self->{options}->add ($self->{bye_button});
1267 1508
1268 for my $kw (sort keys %{ $self->{kw} }) { 1509 for my $kw (sort keys %{ $self->{kw} }) {
1269 $self->{options}->add (new CFPlus::UI::Button 1510 $self->{options}->add (new DC::UI::Button
1270 text => $kw, 1511 text => $kw,
1271 on_activate => sub { 1512 on_activate => sub {
1272 $self->send ($kw); 1513 $self->send ($kw);
1273 0 1514 0
1274 }, 1515 },
1275 ); 1516 );
1276 } 1517 }
1277} 1518}
1278 1519
1279sub feed { 1520sub feed {
1280 my ($self, $msg) = @_; 1521 my ($self, $type, @arg) = @_;
1281 1522
1282 CFPlus::weaken $self; 1523 DC::weaken $self;
1283 1524
1284 if ($msg->{msgtype} eq "reply") { 1525 if ($type eq "update") {
1526 my (%info) = @arg;
1527
1285 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []}; 1528 $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
1286 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []}; 1529 $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
1287
1288 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1289 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1290 my @link;
1291 $text =~ s{
1292 ($match)
1293 }{
1294 my $kw = $1;
1295
1296 push @link, new CFPlus::UI::Label
1297 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1298 can_hover => 1,
1299 can_events => 1,
1300 padding_x => 0,
1301 padding_y => 0,
1302 on_button_up => sub {
1303 $self->send ($kw);
1304 };
1305
1306 "\x{fffc}"
1307 }giex;
1308 1530
1531 if (exists $info{msg}) {
1532 my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
1533 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1534 my @link;
1535 $text =~ s{
1536 ($match)
1537 }{
1538 my $kw = $1;
1539
1540 push @link, new DC::UI::Label
1541 markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1542 can_hover => 1,
1543 can_events => 1,
1544 padding_x => 0,
1545 padding_y => 0,
1546 on_button_up => sub {
1547 $self->send ($kw);
1548 };
1549
1550 "\x{fffc}"
1551 }giex;
1552
1309 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link }); 1553 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1310 $self->{textview}->scroll_to_bottom; 1554 $self->{textview}->scroll_to_bottom;
1555 }
1556
1311 $self->update_options; 1557 $self->update_options;
1312 } else { 1558 } else {
1313 $self->destroy; 1559 $self->destroy;
1314 } 1560 }
1315 1561
… …
1317} 1563}
1318 1564
1319sub send { 1565sub send {
1320 my ($self, $msg) = @_; 1566 my ($self, $msg) = @_;
1321 1567
1322 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1568 $self->{textview}->add_paragraph ({
1569 markup =>
1570 "\n<span foreground='#ffff00'><b>"
1571 . (DC::asxml $msg)
1572 . "</b></span>"
1573 });
1323 $self->{textview}->scroll_to_bottom; 1574 $self->{textview}->scroll_to_bottom;
1324 1575
1325 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg); 1576 $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1326} 1577}
1327 1578
1328sub destroy { 1579sub destroy {
1329 my ($self) = @_; 1580 my ($self) = @_;
1330 1581
1331 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1582 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1332 1583
1333 if ($self->{conn}) { 1584 if ($self->{conn}) {
1334 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id}; 1585 $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1335 delete $self->{conn}{npc_dialog}; 1586 delete $self->{conn}{npc_dialog};
1336 $self->{conn}->disconnect_ext ($self->{id}); 1587 $self->{conn}->disconnect_ext ($self->{id});
1337 } 1588 }
1338 1589
1339 $self->SUPER::destroy; 1590 $self->SUPER::destroy;

Diff Legend

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