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

Diff Legend

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