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.125 by root, Sat Jul 21 15:04:27 2007 UTC vs.
Revision 1.207 by root, Sat Dec 20 19:45:50 2008 UTC

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

Diff Legend

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