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.55 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.226 by root, Thu Nov 15 03:07:46 2012 UTC

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

Diff Legend

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