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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.46 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.201 by root, Wed Sep 3 06:35:55 2008 UTC

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

Diff Legend

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