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.47 by root, Wed Jun 28 21:43:15 2006 UTC vs.
Revision 1.209 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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