ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.49 by root, Wed Jun 28 23:39:15 2006 UTC vs.
Revision 1.200 by root, Tue Sep 2 04:16:42 2008 UTC

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

Diff Legend

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