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.45 by root, Wed Jun 28 17:15:34 2006 UTC vs.
Revision 1.227 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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