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

Diff Legend

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