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.69 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
12use CFPlus::Macro;
13use CFPlus::Item;
14
15use Crossfire::Protocol::Base 0.95;
11 16
12use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
13 18
14sub new { 19sub new {
15 my $class = shift; 20 my ($class, %arg) = @_;
16 21
17 my $self = $class->SUPER::new (@_); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 xwidget => 1,
27 %{$arg{setup_req} || {}},
28 },
29 );
18 30
19 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
20 32
21 my $cmd_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/command_help.pod", command_help => 1, sub { 33 my @cmd_help = map {
22 my ($pom) = @_;
23
24 my @cmd_help;
25
26 for my $head2 ($pom->head1->[-2]->head2) {
27 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 34 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
28 or next; 35 or die "unparseable command help: $_->{kw}[0]";
29 36
30 my $cmd = $1; 37 my $cmd = $1;
31 my @args = split /\|/, $2; 38 my @args = split /\|/, $2;
32 @args = (".*") unless @args; 39 @args = (".*") unless @args;
33 40
41 my (undef, @par) = CFPlus::Pod::section_of $_;
42 my $text = CFPlus::Pod::as_label @par;
43
34 $_ = $_ eq ".*" ? "" : " $_" 44 $_ = $_ eq ".*" ? "" : " $_"
35 for @args; 45 for @args;
36 46
37 my $text = CFPlus::Pod::as_markup $head2->content; 47 map ["$cmd$_", $text],
38
39 push @cmd_help, ["$cmd$_", $text]
40 for sort { (length $a) <=> (length $b) } 48 sort { (length $a) <=> (length $b) }
41 @args; 49 @args
50 } sort { $a->{par} <=> $b->{par} }
51 CFPlus::Pod::find command => "*";
52
53 $self->connect_ext (event_capabilities => sub {
54 my ($cap) = @_;
55
56 if (my $ts = $cap->{tileset}) {
57 if (my ($default) = grep $_->[2] & 1, @$ts) {
58 $self->{tileset} = $default;
59 $self->{tilesize} = $default->[3];
60 $self->setup_req (tileset => $default->[0]);
61
62 my $w = int $self->{mapw} * 32 / $self->{tilesize};
63 my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65 $self->setup_req (mapsize => "${w}x${h}");
66 }
42 } 67 }
43
44 \@cmd_help
45 }; 68 });
69
70 $self->connect_ext (ws_n => sub {
71 my ($arg) = @_;
72
73 $self->{widgetset}{$arg{id}} = {
74 w => {},
75 };
76 });
77
78 $self->connect_ext (ws_d => sub {
79 my ($arg) = @_;
80
81 my $ws = delete $self->{widgetset}{$arg{id}}
82 or return;
83
84 $_->destroy
85 for values %{$ws->{w}};
86 });
87
88 $self->connect_ext (ws_c => sub {
89 my ($arg) = @_;
90
91 my $args = $arg->{args} || {};
92
93 for my $ev (grep /^on_/, keys %$args) {
94 $args->{$ev} = sub {
95 my $id = shift->{s_id};
96 $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98 1
99 };
100 }
101
102 if (my $widget = eval {
103 local $SIG{__DIE__};
104 "CFPlus::UI::$arg->{class}"->new (
105 %$args,
106 s_ws => $arg->{ws},
107 s_id => $arg->{id},
108 )
109 }
110 ) {
111 $self->{widget}{$arg->{id}}
112 = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
113 = $widget;
114
115 $widget->connect (on_destroy => sub {
116 my ($widget) = @_;
117
118 delete $self->{widget}{$widget->{s_id}};
119 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120 });
121 } else {
122 warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
123 $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124 }
125 });
126
127 $self->connect_ext (w_c => sub {
128 my ($arg) = @_;
129
130 my $w = $self->{widget}{$arg->{id}}
131 or return;
132 my $m = $arg->{name};
133
134 my @a = map {
135 "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136 ? $self->{widget}{$_->{__widget_ref__}}
137 : $_
138 } @{ $arg->{args} || [] };
139
140 if (exists $arg->{rid}) {
141 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
142 } else {
143 $w->$m (@a);
144 }
145 });
146
147 $self->connect_ext (w_s => sub {
148 my ($arg) = @_;
149
150 my $w = $self->{widget}{$arg->{id}}
151 or return;
152
153 $w->{$arg->{name}} = $arg->{value};
154 });
155
156 $self->connect_ext (w_g => sub {
157 my ($arg) = @_;
158
159 my $w = $self->{widget}{$arg->{id}}
160 or return;
161
162 $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
163 });
164
165 $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166 for my $ws (values %{delete $self->{widgetset} || {}}) {
167 $_->destroy
168 for values %{delete $ws->{w} || {}};
169 }
170 });
46 171
47 $self->{map_widget}->add_command (@$_) 172 $self->{map_widget}->add_command (@$_)
48 for @$cmd_help; 173 for @cmd_help;
49 174
175 {
176 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
177 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
178 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
179 }
180
181 {
50 $self->{noface} = new_from_file CFPlus::Texture 182 $self->{noface} = my $tex = new_from_file CFPlus::Texture
51 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1; 183 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
184 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
185 }
52 186
53 $self->{open_container} = 0; 187 $self->{open_container} = 0;
54 188
55 # "global"
56 $self->{tilecache} = CFPlus::db_table "tilecache";
57 $self->{facemap} = CFPlus::db_table "facemap";
58
59 # per server 189 # per server
60 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"; 190 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
61 191
62 $self 192 $self
63} 193}
64 194
65sub logprint { 195sub logprint {
… …
222 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 352 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
223 $::GAUGES->{food} ->set_value ($fo, $fo_m); 353 $::GAUGES->{food} ->set_value ($fo, $fo_m);
224 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 354 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
225 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 355 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
226 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 356 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
227 my $rng = $stats->{+CS_STAT_RANGE}; 357 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
228 $rng =~ s/^Range: //; # thank you so much dear server
229 $::GAUGES->{range} ->set_text ("Rng: " . $rng);
230 my $title = $stats->{+CS_STAT_TITLE}; 358 my $title = $stats->{+CS_STAT_TITLE};
231 $title =~ s/^Player: //; 359 $title =~ s/^Player: //;
232 $::STATWIDS->{title} ->set_text ("Title: " . $title); 360 $::STATWIDS->{title} ->set_text ("Title: " . $title);
233 361
234 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR}); 362 $::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
… …
265 393
266 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 394 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
267 395
268 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 396 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
269 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 397 my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
270 my @TOOLTIP_NAME = (tooltip => "<b>Name</b>. The name of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
271 398
272 my ($x, $y) = (0, 1); 399 my ($x, $y) = (0, 1);
273 for ( 400 for (
274 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] } 401 sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
275 map [$_, $self->{skill_info}{$_}], 402 map [$_, $self->{skill_info}{$_}],
… …
284 if ($ev->{button} == 1) { 411 if ($ev->{button} == 1) {
285 $::CONN->user_send ("ready_skill $name"); 412 $::CONN->user_send ("ready_skill $name");
286 } elsif ($ev->{button} == 2) { 413 } elsif ($ev->{button} == 2) {
287 $::CONN->user_send ("use_skill $name"); 414 $::CONN->user_send ("use_skill $name");
288 } elsif ($ev->{button} == 3) { 415 } elsif ($ev->{button} == 3) {
416 my $shortname = CFPlus::shorten $name, 14;
289 (new CFPlus::UI::Menu 417 (new CFPlus::UI::Menu
290 items => [ 418 items => [
291 ["bind <i>ready_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["ready_skill $name"]) }], 419 ["bind <i>ready_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["ready_skill $name"] }],
292 ["bind <i>use_skill $name</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["use_skill $name"]) }], 420 ["bind <i>use_skill $shortname</i> to a key" => sub { CFPlus::Macro::quick_macro ["use_skill $name"] }],
293 ], 421 ],
294 )->popup ($ev); 422 )->popup ($ev);
295 } else { 423 } else {
296 return 0; 424 return 0;
297 } 425 }
… …
301 429
302 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 430 $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
303 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP); 431 text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
304 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 432 $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
305 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL); 433 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
306 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, @TOOLTIP_NAME); 434 $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
307 436
308 $x++ and ($x, $y) = (0, $y + 1); 437 $x++ and ($x, $y) = (0, $y + 1);
309 } 438 }
310 } 439 }
311 440
… …
313 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 442 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
314 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 443 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
315 } 444 }
316} 445}
317 446
447sub macro_send {
448 my ($self, $macro) = @_;
449
450 for my $cmd (@{ $macro->{action} }) {
451 $self->send_command ($cmd);
452 }
453}
454
318sub user_send { 455sub user_send {
319 my ($self, $command) = @_; 456 my ($self, $command) = @_;
320 457
458 $self->{record}->($command)
321 if ($self->{record}) { 459 if $self->{record};
322 push @{$self->{record}}, $command;
323 }
324 460
325 $self->logprint ("send: ", $command); 461 $self->logprint ("send: ", $command);
326 $self->send_command ($command); 462 $self->send_command ($command);
327 ::status ($command); 463 ::status ($command);
328} 464}
329 465
330sub start_record { 466sub record {
331 my ($self) = @_; 467 my ($self, $cb) = @_;
332 468
333 $self->{record} = []; 469 $self->{record} = $cb;
334}
335
336sub stop_record {
337 my ($self) = @_;
338 return delete $self->{record};
339} 470}
340 471
341sub map_scroll { 472sub map_scroll {
342 my ($self, $dx, $dy) = @_; 473 my ($self, $dx, $dy) = @_;
343 474
… …
345} 476}
346 477
347sub feed_map1a { 478sub feed_map1a {
348 my ($self, $data) = @_; 479 my ($self, $data) = @_;
349 480
350 $self->{map}->map1a_update ($data); 481 $self->{map}->map1a_update ($data, $self->{setup}{extmap});
351 $self->{map_widget}->update; 482 $self->{map_widget}->update;
352} 483}
353 484
354sub magicmap { 485sub magicmap {
355 my ($self, $w, $h, $x, $y, $data) = @_; 486 my ($self, $w, $h, $x, $y, $data) = @_;
… …
364 or return; 495 or return;
365 496
366 my ($hash, $x, $y, $w, $h) = @$map_info; 497 my ($hash, $x, $y, $w, $h) = @$map_info;
367 498
368 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 499 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
369 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 500 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
370 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 501 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
371} 502}
372 503
373sub map_clear { 504sub map_clear {
374 my ($self) = @_; 505 my ($self) = @_;
… …
378 509
379 $self->{map}->clear; 510 $self->{map}->clear;
380 delete $self->{map_widget}{magicmap}; 511 delete $self->{map_widget}{magicmap};
381} 512}
382 513
514sub bg_fetch {
515 my ($self) = @_;
516
517 my $id;
518
519 do {
520 $id = pop @{$self->{bg_fetch}}
521 or return;
522 } while $self->{texture}[$id];
523
524 CFPlus::DB::get tilecache => $id, sub {
525 my ($data) = @_;
526
527 return unless $self->{map}; # stop when destroyed
528
529 $self->set_texture ($id => $data)
530 if defined $data;
531
532 $self->bg_fetch;
533 };
534}
383 535
384sub load_map($$$) { 536sub load_map($$$) {
385 my ($self, $hash, $x, $y) = @_; 537 my ($self, $hash, $x, $y) = @_;
386 538
387 if (defined (my $data = $self->{mapcache}->get ($hash))) { 539 my $gen = $self->{map_change_gen};
540
541 CFPlus::DB::get $self->{mapcache} => $hash, sub {
542 return unless $gen == $self->{map_change_gen};
543
544 my ($data) = @_;
545
546 if (defined $data) {
388 $data = Compress::LZF::decompress $data; 547 $data = Compress::LZF::decompress $data;
389 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 548 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
390 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
391 my $data = $self->{tilecache}->get ($id)
392 or next;
393 549
394 $self->set_texture ($id => $data); 550 my $inprogress = @{ $self->{bg_fetch} || [] };
551 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552 $self->bg_fetch unless $inprogress;
395 } 553 }
396 } 554 };
397} 555}
398 556
399# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 557# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
400# (server resource,s latency, bandwidth), so this hack is warranted. 558# (server resource,s latency, bandwidth), so this hack is warranted.
401# the right fix is to make real tiled maps with an overview file 559# the right fix is to make real tiled maps with an overview file
… …
465 623
466 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 624 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
467 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 625 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
468 626
469 } else { 627 } else {
628 my $gen = $self->{map_change_gen};
470 $self->send_mapinfo ("spatial $path$tile", sub { 629 $self->send_mapinfo ("spatial $path$tile", sub {
630 return unless $gen == $self->{map_change_gen};
631
471 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 632 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
472 633
473 return if $mode ne "spatial"; 634 return if $mode ne "spatial";
474 635
475 $x += $self->{map}->ox; 636 $x += $self->{map}->ox;
… …
489 650
490sub map_change { 651sub map_change {
491 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 652 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
492 653
493 $self->flush_map; 654 $self->flush_map;
655
656 ++$self->{map_change_gen};
494 657
495 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 658 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
496 659
497 my $mapmapw = $self->{mapmap}->{w}; 660 my $mapmapw = $self->{mapmap}->{w};
498 my $mapmaph = $self->{mapmap}->{h}; 661 my $mapmaph = $self->{mapmap}->{h};
… …
515 $self->load_map ($hash, $x, $y); 678 $self->load_map ($hash, $x, $y);
516 $self->flood_fill (0, 0, 0, "", $hash, $flags); 679 $self->flood_fill (0, 0, 0, "", $hash, $flags);
517} 680}
518 681
519sub face_find { 682sub face_find {
520 my ($self, $facenum, $face) = @_; 683 my ($self, $facenum, $face, $cb) = @_;
521 684
522 my $hash = "$face->{chksum},$face->{name}"; 685 my $hash = "$face->{chksum},$face->{name}";
523 686
524 my $id = $self->{facemap}->get ($hash); 687 my $id = CFPlus::DB::get_tile_id_sync $hash;
525 688
526 unless ($id) {
527 # create new id for face
528 # I love transactions
529 for (1..100) {
530 my $txn = $CFPlus::DB_ENV->txn_begin;
531 my $status = $self->{facemap}->db_get (id => $id);
532 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
533 $id = ($id || 64) + 1;
534 if ($self->{facemap}->put (id => $id) == 0
535 && $self->{facemap}->put ($hash => $id) == 0) {
536 $txn->txn_commit;
537
538 goto gotid;
539 }
540 }
541 $txn->txn_abort;
542 }
543
544 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
545 }
546
547gotid:
548 $face->{id} = $id; 689 $face->{id} = $id;
549 $self->{map}->set_face ($facenum => $id);
550 $self->{faceid}[$facenum] = $id;#d# 690 $self->{faceid}[$facenum] = $id;
551 691
552 my $face = $self->{tilecache}->get ($id); 692 $self->{map}->set_tileid ($facenum => $id);
553 693
554 if ($face) { 694 CFPlus::DB::get tilecache => $id, $cb;
555 #$self->face_prefetch;
556 $face
557 } else {
558 my $tex = $self->{noface};
559 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
560 undef
561 };
562} 695}
563 696
564sub face_update { 697sub face_update {
565 my ($self, $facenum, $face, $changed) = @_; 698 my ($self, $facenum, $face, $changed) = @_;
566 699
567 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 700 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
701 if $changed;
568 702
569 $self->set_texture ($face->{id} => delete $face->{image}); 703 $self->set_texture ($face->{id} => delete $face->{image});
704}
705
706sub smooth_update {
707 my ($self, $facenum, $face) = @_;
708
709 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
570} 710}
571 711
572sub set_texture { 712sub set_texture {
573 my ($self, $id, $data) = @_; 713 my ($self, $id, $data) = @_;
574 714
575 $self->{texture}[$id] ||= do { 715 $self->{texture}[$id] = my $tex =
576 my $tex =
577 new_from_image CFPlus::Texture 716 new_from_image CFPlus::Texture
578 $data, minify => 1, mipmap => 1; 717 $data, minify => 1, mipmap => 1;
579 718
580 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 719 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
581 $self->{map_widget}->update; 720 $self->{map_widget}->update;
582
583 $tex
584 };
585} 721}
586 722
587sub sound_play { 723sub sound_play {
588 my ($self, $x, $y, $soundnum, $type) = @_; 724 my ($self, $x, $y, $soundnum, $type) = @_;
589 725
… …
599 $LAST_QUERY = $prompt; 735 $LAST_QUERY = $prompt;
600 736
601 $self->{query}-> ($self, $flags, $prompt); 737 $self->{query}-> ($self, $flags, $prompt);
602} 738}
603 739
604sub drawinfo { 740sub sanitise_xml($) {
605 my ($self, $color, $text) = @_; 741 local $_ = shift;
606 742
607 my @color = ( 743 # we now weed out all tags we do not support
744 s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%&lt;%g;
745 # now all entities
746 s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&amp;/g;
747
748 # handle some elements
749 s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
750 s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
751
752 $_
753}
754
755our %NAME_TO_COLOR = (
756 black => 0,
757 white => 1,
758 darkblue => 2,
759 red => 3,
760 orange => 4,
761 lightblue => 5,
762 darkorange => 6,
763 green => 7,
764 darkgreen => 8,
765 grey => 9,
766 brown => 10,
767 yellow => 11,
768 tan => 12,
769);
770
771our @CF_COLOR = (
608 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00], 772 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
609 [1.00, 1.00, 1.00], 773 [1.00, 1.00, 1.00],
610 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55] 774 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
611 [1.00, 0.00, 0.00], 775 [1.00, 0.00, 0.00],
612 [1.00, 0.54, 0.00], 776 [1.00, 0.54, 0.00],
613 [0.11, 0.56, 1.00], 777 [0.11, 0.56, 1.00],
614 [0.93, 0.46, 0.00], 778 [0.93, 0.46, 0.00],
615 [0.18, 0.54, 0.34], 779 [0.18, 0.54, 0.34],
616 [0.56, 0.73, 0.56], 780 [0.56, 0.73, 0.56],
617 [0.80, 0.80, 0.80], 781 [0.80, 0.80, 0.80],
618 [0.75, 0.61, 0.20], 782 [0.75, 0.61, 0.20],
619 [0.99, 0.77, 0.26], 783 [0.99, 0.77, 0.26],
620 [0.74, 0.65, 0.41], 784 [0.74, 0.65, 0.41],
621 ); 785);
622 786
787sub msg {
788 my ($self, $color, $type, $text, @extra) = @_;
789
790 $text = sanitise_xml $text;
791
792 if (my $cb = $self->{cb_msg}{$type}) {
793 $_->($self, $color, $type, $text, @extra) for values %$cb;
794 } elsif ($type =~ /^(?:chargen-race-title|chargen-race-description)$/) {
795 $type =~ s/-/_/g;
796 $self->{$type} = $text;
797 } else {
623 $self->logprint ("info: ", $text); 798 $self->logprint ("msg: ", $text);
799 return if $color < 0; # negative color == ignore if not understood
624 800
625 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 801 my $fg = $CF_COLOR[$color % @CF_COLOR];
626 802
627 # try to create single paragraphs of multiple lines sent by the server 803 ## try to create single paragraphs of multiple lines sent by the server
804 # no longer neecssary with TRT servers
628 $text =~ s/(?<=\S)\n(?=\w)/ /g; 805 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
629 806
630 $text = CFPlus::asxml $text; 807 ::message ({ fg => $fg, markup => $_ })
631 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 808 for split /\n/, $text;
632 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
633 809
634 $self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
635 for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
636 $self->{logview}->scroll_to_bottom;
637
638 $self->{statusbox}->add ($text, 810 $self->{statusbox}->add ($text,
639 group => $text, 811 group => $text,
640 fg => $color[$color], 812 fg => $fg,
641 timeout => $color >= 2 ? 60 : 10, 813 timeout => $color >= 2 ? 180 : 10,
642 tooltip_font => $::FONT_FIXED, 814 tooltip_font => $::FONT_FIXED,
643 ); 815 );
644} 816 }
645
646sub drawextinfo {
647 my ($self, $color, $type, $subtype, $message) = @_;
648
649 $self->drawinfo ($color, $message);
650} 817}
651 818
652sub spell_add { 819sub spell_add {
653 my ($self, $spell) = @_; 820 my ($self, $spell) = @_;
654 821
655 # try to create single paragraphs out of the multiple lines sent by the server 822 # try to create single paragraphs out of the multiple lines sent by the server
656 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g; 823 $spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
657 $spell->{message} =~ s/\n+$//; 824 $spell->{message} =~ s/\n+$//;
658 $spell->{message} ||= "Server did not provide a description for this spell."; 825 $spell->{message} ||= "Server did not provide a description for this spell.";
659 826
660 $::SPELL_PAGE->add_spell ($spell); 827 $::SPELL_LIST->add_spell ($spell);
661 828
662 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message}); 829 $self->{map_widget}->add_command ("invoke $spell->{name}", CFPlus::asxml $spell->{message});
663 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message}); 830 $self->{map_widget}->add_command ("cast $spell->{name}", CFPlus::asxml $spell->{message});
664} 831}
665 832
666sub spell_delete { 833sub spell_delete {
667 my ($self, $spell) = @_; 834 my ($self, $spell) = @_;
668 835
669 $::SPELL_PAGE->remove_spell ($spell); 836 $::SPELL_LIST->remove_spell ($spell);
837}
838
839sub setup {
840 my ($self, $setup) = @_;
841
842 $self->{map_widget}->set_tilesize ($self->{tilesize});
843 $::MAP->resize ($self->{mapw}, $self->{maph});
670} 844}
671 845
672sub addme_success { 846sub addme_success {
673 my ($self) = @_; 847 my ($self) = @_;
674 848
675 my $skill_help = CFPlus::Pod::load CFPlus::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
676 my ($pom) = @_;
677
678 my %skill_help; 849 my %skill_help;
679 850
680 for my $head2 ($pom->head1->[3]->head2) { 851 for my $node (CFPlus::Pod::find skill_description => "*") {
681 $skill_help{$head2->title} = CFPlus::Pod::as_markup $head2->content; 852 my (undef, @par) = CFPlus::Pod::section_of $node;
682 } 853 $skill_help{$node->{kw}[0]} = CFPlus::Pod::as_label @par;
683
684 \%skill_help
685 }; 854 };
686 855
687 for my $skill (values %{$self->{skill_info}}) { 856 for my $skill (values %{$self->{skill_info}}) {
688 $self->{map_widget}->add_command ("ready_skill $skill", 857 $self->{map_widget}->add_command ("ready_skill $skill",
689 (CFPlus::asxml "Ready the skill '$skill'\n\n") 858 (CFPlus::asxml "Ready the skill '$skill'\n\n")
690 . $skill_help->{$skill}); 859 . $skill_help{$skill});
691 $self->{map_widget}->add_command ("use_skill $skill", 860 $self->{map_widget}->add_command ("use_skill $skill",
692 (CFPlus::asxml "Immediately use the skill '$skill'\n\n") 861 (CFPlus::asxml "Immediately use the skill '$skill'\n\n")
693 . $skill_help->{$skill}); 862 . $skill_help{$skill});
694 } 863 }
695} 864}
696 865
697sub eof { 866sub eof {
698 my ($self) = @_; 867 my ($self) = @_;
… …
885 $::SERVER_INFO->set_markup ( 1054 $::SERVER_INFO->set_markup (
886 "server <tt>$self->{host}:$self->{port}</tt>\n" 1055 "server <tt>$self->{host}:$self->{port}</tt>\n"
887 . "protocol version <tt>$self->{version}</tt>\n" 1056 . "protocol version <tt>$self->{version}</tt>\n"
888 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n" 1057 . "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
889 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n" 1058 . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
1059 . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
1060 . "editing support $yesno[!!$self->{editor_support}]\n"
1061 . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
1062 . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
890 . "cfplus support $yesno[$self->{cfplus_ext} > 0]" 1063 . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
891 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n" 1064 . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
892 . "map size $self->{mapw}×$self->{maph}\n" 1065 . "map size $self->{mapw}×$self->{maph}\n"
893 ); 1066 );
1067
1068 ::setup_build_button ($self->{editor_support}->{builder_ui});
894} 1069}
895 1070
896sub logged_in { 1071sub logged_in {
897 my ($self) = @_; 1072 my ($self) = @_;
898 1073
899 $self->send_ext_req (cfplus_support => "1", sub { 1074 $self->send_ext_req (cfplus_support => version => 1, sub {
900 $self->{cfplus_ext} = $_[0]; 1075 $self->{cfplus_ext} = $_[0]{version};
901 $self->update_server_info; 1076 $self->update_server_info;
1077
1078 if ($self->{cfplus_ext} >= 2) {
1079 $self->send_ext_req ("editor_support", sub {
1080 $self->{editor_support} = $_[0];
1081 $self->update_server_info;
1082
1083 0
1084 });
1085 }
1086
1087 0
902 }); 1088 });
903 1089
904 $self->update_server_info; 1090 $self->update_server_info;
905 1091
906 $self->send_command ("output-sync $::CFG->{output_sync}"); 1092 $self->send_command ("output-sync $::CFG->{output_sync}");
907 $self->send_command ("output-count $::CFG->{output_count}"); 1093 $self->send_command ("output-count $::CFG->{output_count}");
1094 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
908 $self->send_command ("pickup $::CFG->{pickup}"); 1095 $self->send_command ("pickup $::CFG->{pickup}");
1096}
1097
1098sub buildat {
1099 my ($self, $builditem, $x, $y) = @_;
1100
1101 if ($self->{cfplus_ext}) {
1102 $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103 }
909} 1104}
910 1105
911sub lookat { 1106sub lookat {
912 my ($self, $x, $y) = @_; 1107 my ($self, $x, $y) = @_;
913 1108
914 if ($self->{cfplus_ext}) { 1109 if ($self->{cfplus_ext}) {
915 $self->send_ext_req (lookat => "$x $y", sub { 1110 $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
916 my %res = split /\x00/, $_[0]; 1111 my ($msg) = @_;
917 1112
918 if (exists $res{npc_dialog}) { 1113 if (exists $msg->{npc_dialog}) {
919 # start npc chat dialog 1114 # start npc chat dialog
920 $self->{npc_dialog} = new CFPlus::NPCDialog:: 1115 $self->{npc_dialog} = new CFPlus::NPCDialog::
921 dx => $x, 1116 dx => $x,
922 dy => $y, 1117 dy => $y,
923 title => "$res{npc_dialog} (NPC)", 1118 title => "$msg->{npc_dialog} (NPC)",
924 conn => $self, 1119 conn => $self,
925 ; 1120 ;
926 } 1121 }
927 }); 1122 });
928 } 1123 }
… …
931} 1126}
932 1127
933sub destroy { 1128sub destroy {
934 my ($self) = @_; 1129 my ($self) = @_;
935 1130
936 $self->{npc_dialog}->destroy 1131 (delete $self->{npc_dialog})->destroy
937 if $self->{npc_dialog}; 1132 if $self->{npc_dialog};
938 1133
939 $self->SUPER::destroy; 1134 $self->SUPER::destroy;
940} 1135}
941 1136
942package CFPlus::NPCDialog; 1137package CFPlus::NPCDialog;
943 1138
944our @ISA = 'CFPlus::UI::FancyFrame'; 1139our @ISA = 'CFPlus::UI::Toplevel';
945 1140
946sub new { 1141sub new {
947 my $class = shift; 1142 my $class = shift;
948 1143
949 my $self = $class->SUPER::new ( 1144 my $self = $class->SUPER::new (
… …
956 kw => { hi => 0, yes => 0, no => 0 }, 1151 kw => { hi => 0, yes => 0, no => 0 },
957 has_close_button => 1, 1152 has_close_button => 1,
958 @_, 1153 @_,
959 ); 1154 );
960 1155
961 Scalar::Util::weaken (my $this = $self); 1156 CFPlus::weaken (my $this = $self);
962 1157
963 $self->connect (delete => sub { $this->destroy; 1 }); 1158 $self->connect (delete => sub { $this->destroy; 1 });
964 1159
965 # better use a pane... 1160 # better use a pane...
966 $self->add (my $hbox = new CFPlus::UI::HBox); 1161 $self->add (my $hbox = new CFPlus::UI::HBox);
… …
968 1163
969 $hbox->add (my $vbox = new CFPlus::UI::VBox); 1164 $hbox->add (my $vbox = new CFPlus::UI::VBox);
970 1165
971 $vbox->add (new CFPlus::UI::Label text => "Message Entry:"); 1166 $vbox->add (new CFPlus::UI::Label text => "Message Entry:");
972 $vbox->add ($self->{entry} = new CFPlus::UI::Entry 1167 $vbox->add ($self->{entry} = new CFPlus::UI::Entry
973 tooltip => "Enter a message you want to tell the NPC and press <b>return</b>.\n\n" 1168 tooltip => "#npc_message_entry",
974 . "Sometimes you have to tell an NPC something you cannot find out during "
975 . "a normal conversation (such as a password). In those cases you have to use "
976 . "this text entry. You can also enter responses manually instead of using the response "
977 . "buttons below.",
978 on_activate => sub { 1169 on_activate => sub {
979 my ($entry, $text) = @_; 1170 my ($entry, $text) = @_;
980 1171
981 return unless $text =~ /\S/; 1172 return unless $text =~ /\S/;
982 1173
… …
995 on_activate => sub { $this->destroy; 1 }, 1186 on_activate => sub { $this->destroy; 1 },
996 ; 1187 ;
997 1188
998 $self->update_options; 1189 $self->update_options;
999 1190
1000 $self->{token} = $self->{conn}->ext_token; 1191 $self->{id} = $self->{conn}->send_ext_req (
1001 $self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) }); 1192 npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
1002 $self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}"); 1193 sub { $this && $this->feed (@_) }
1194 );
1003 1195
1004 $self->{entry}->grab_focus; 1196 $self->{entry}->grab_focus;
1005 1197
1006 $self->{textview}->add_paragraph ({ 1198 $self->{textview}->add_paragraph ({
1007 fg => [1, 1, 0, 1], 1199 fg => [1, 1, 0, 1],
… …
1013}; 1205};
1014 1206
1015sub update_options { 1207sub update_options {
1016 my ($self) = @_; 1208 my ($self) = @_;
1017 1209
1018 Scalar::Util::weaken $self; 1210 CFPlus::weaken $self;
1019 1211
1020 $self->{options}->clear; 1212 $self->{options}->clear;
1021 $self->{options}->add ($self->{bye_button}); 1213 $self->{options}->add ($self->{bye_button});
1022 1214
1023 for my $kw (sort keys %{ $self->{kw} }) { 1215 for my $kw (sort keys %{ $self->{kw} }) {
… …
1030 ); 1222 );
1031 } 1223 }
1032} 1224}
1033 1225
1034sub feed { 1226sub feed {
1035 my ($self, $data) = @_; 1227 my ($self, $msg) = @_;
1036 1228
1037 Scalar::Util::weaken $self; 1229 CFPlus::weaken $self;
1038 1230
1039 my ($type, $msg) = split / /, $data, 2; 1231 if ($msg->{msgtype} eq "reply") {
1232 $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
1233 $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
1040 1234
1041 if ($type eq "msg") { 1235 my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1042 my ($msg, @kw) = split /\x00/, $msg;
1043
1044 utf8::decode $_ for ($msg, @kw);
1045
1046 $self->{kw}{$_} = 1 for @kw;
1047
1048 $msg = "\n" . CFPlus::UI::asxml $msg;
1049 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} }; 1236 my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1050 my @link; 1237 my @link;
1051 $msg =~ s{ 1238 $text =~ s{
1052 ($match) 1239 ($match)
1053 }{ 1240 }{
1054 my $kw = $1; 1241 my $kw = $1;
1055 1242
1056 push @link, new CFPlus::UI::Label 1243 push @link, new CFPlus::UI::Label
… …
1061 padding_y => 0, 1248 padding_y => 0,
1062 on_button_up => sub { 1249 on_button_up => sub {
1063 $self->send ($kw); 1250 $self->send ($kw);
1064 }; 1251 };
1065 1252
1066 chr 0xfffc 1253 "\x{fffc}"
1067 }giex; 1254 }giex;
1068 1255
1069 $self->{textview}->add_paragraph ({ markup => $msg, widget => \@link }); 1256 $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1070 $self->{textview}->scroll_to_bottom; 1257 $self->{textview}->scroll_to_bottom;
1071 $self->update_options; 1258 $self->update_options;
1072 } else { 1259 } else {
1073 $self->destroy; 1260 $self->destroy;
1074 } 1261 }
… …
1080 my ($self, $msg) = @_; 1267 my ($self, $msg) = @_;
1081 1268
1082 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg }); 1269 $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1083 $self->{textview}->scroll_to_bottom; 1270 $self->{textview}->scroll_to_bottom;
1084 1271
1085 utf8::encode $msg; 1272 $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
1086 $self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
1087} 1273}
1088 1274
1089sub destroy { 1275sub destroy {
1090 my ($self) = @_; 1276 my ($self) = @_;
1091 1277
1092 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1 1278 #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1093 1279
1280 if ($self->{conn}) {
1094 $self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token}; 1281 $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
1095 delete $self->{conn}{npc_dialog}; 1282 delete $self->{conn}{npc_dialog};
1096 $self->{conn}->disconnect_ext ($self->{token}); 1283 $self->{conn}->disconnect_ext ($self->{id});
1284 }
1097 1285
1098 $self->SUPER::destroy; 1286 $self->SUPER::destroy;
1099} 1287}
1100 1288
11011 12891
1290

Diff Legend

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