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

Diff Legend

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