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

Diff Legend

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