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

Diff Legend

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