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

Diff Legend

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